From 44b3484cb2fa37d92040810db7305dd5b84592e1 Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Sun, 10 Jan 2021 02:16:30 -0500 Subject: [PATCH] Updated chat_conversations, search actions redux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated: - chat_conversations unread_count to return 0 - search to return false if no user --- app/javascript/gabsocial/actions/chat_conversations.js | 6 +++--- app/javascript/gabsocial/actions/search.js | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/javascript/gabsocial/actions/chat_conversations.js b/app/javascript/gabsocial/actions/chat_conversations.js index ecba6d5e..d7e92659 100644 --- a/app/javascript/gabsocial/actions/chat_conversations.js +++ b/app/javascript/gabsocial/actions/chat_conversations.js @@ -395,12 +395,12 @@ export const fetchChatConversationRequestedCount = () => (dispatch, getState) => export const fetchChatConversationUnreadCount = () => (dispatch, getState) => { if (!me) return - api(getState).get('/api/v1/chat_conversations/approved_conversations/unread_count').then(response => { + // api(getState).get('/api/v1/chat_conversations/approved_conversations/unread_count').then(response => { dispatch({ type: CHAT_CONVERSATION_APPROVED_UNREAD_COUNT_FETCH_SUCCESS, - count: response.data, + count: 0, }) - }) + // }) } /** diff --git a/app/javascript/gabsocial/actions/search.js b/app/javascript/gabsocial/actions/search.js index 37d48f77..2a978c4c 100644 --- a/app/javascript/gabsocial/actions/search.js +++ b/app/javascript/gabsocial/actions/search.js @@ -6,6 +6,7 @@ import { importFetchedStatuses, } from './importer'; import { importLinkCards } from './links' +import { me } from '../initial_state' import { SEARCH_FILTERS } from '../constants' export const SEARCH_CHANGE = 'SEARCH_CHANGE'; @@ -37,6 +38,8 @@ export const clearSearch = () => ({ * */ export const submitSearch = () => (dispatch, getState) => { + if (!me) return + const value = getState().getIn(['search', 'value']) const onlyVerified = getState().getIn(['search', 'filter', 'onlyVerified'])