oxen-io
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adding trigger logic for conversation filtering of requests.

This commit is contained in:
warrickct 2021-11-24 15:37:22 +11:00
parent f91e2c4edd
commit c3e58f725e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ts/state/selectors/conversations.ts
View File

@ -36,6 +36,7 @@ import { MessageAttachmentSelectorProps } from '../../components/conversation/me
import { MessageContentSelectorProps } from '../../components/conversation/message/MessageContent';
import { MessageContentWithStatusSelectorProps } from '../../components/conversation/message/MessageContentWithStatus';
import { GenericReadableMessageSelectorProps } from '../../components/conversation/message/GenericReadableMessage';
import { getIsMessageRequestsEnabled } from './userConfig';
export const getConversations = (state: StateType): ConversationsStateType => state.conversations;
@ -425,6 +426,7 @@ export const getConversationComparator = createSelector(getIntl, _getConversatio
export const _getLeftPaneLists = (
lookup: ConversationLookupType,
comparator: (left: ReduxConversationType, right: ReduxConversationType) => number,
isMessageRequestEnabled?: boolean,
selectedConversation?: string
): {
conversations: Array<ReduxConversationType>;
@ -456,13 +458,8 @@ export const _getLeftPaneLists = (
};
}
let messageRequestsEnabled = false;
if (window?.inboxStore?.getState()) {
messageRequestsEnabled =
window.inboxStore?.getState().userConfig.messageRequests === true &&
window.lokiFeatureFlags?.useMessageRequests === true;
}
const excludeUnapproved =
isMessageRequestEnabled && window.lokiFeatureFlags?.useMessageRequests;
// Add Open Group to list as soon as the name has been set
if (conversation.isPublic && (!conversation.name || conversation.name === 'Unknown group')) {
@ -479,7 +476,7 @@ export const _getLeftPaneLists = (
directConversations.push(conversation);
}
if (messageRequestsEnabled && !conversation.isApproved && !conversation.isBlocked) {
if (excludeUnapproved && !conversation.isApproved && !conversation.isBlocked) {
// dont increase unread counter, don't push to convo list.
continue;
}
@ -571,6 +568,7 @@ export const getConversationRequests = createSelector(
export const getLeftPaneLists = createSelector(
getConversationLookup,
getConversationComparator,
getIsMessageRequestsEnabled,
getSelectedConversationKey,
_getLeftPaneLists
);