Allow the user to control whether messages from blocked users are filtered from open groups.

_locales/en/messages.json

@@ -198,6 +198,8 @@
   "noteToSelf": "Note to Self",
   "hideMenuBarTitle": "Hide Menu Bar",
   "hideMenuBarDescription": "Toggle system menu bar visibility",
+  "filterBlockedFromOpenGroupsTitle": "Filter Open Groups",
+  "filterBlockedFromOpenGroupsDescription": "Filter messages from blocked users from open groups",
   "startConversation": "Start New Conversation",
   "invalidNumberError": "Invalid Session ID or ONS Name",
   "failedResolveOns": "Failed to resolve ONS name",

ts/components/search/SearchResults.tsx

@@ -5,6 +5,7 @@ import {
   MemoConversationListItemWithDetails,
 } from '../leftpane/conversation-list-item/ConversationListItem';
 import { MessageResultProps, MessageSearchResult } from './MessageSearchResults';
+import { BlockedNumberController } from '../../util';
 
 export type SearchResultsProps = {
   contactsAndGroups: Array<ConversationListItemProps>;
@@ -42,7 +43,11 @@ export const SearchResults = (props: SearchResultsProps) => {
   const { contactsAndGroups, messages, searchTerm } = props;
 
   const haveContactsAndGroup = Boolean(contactsAndGroups?.length);
-  const haveMessages = Boolean(messages?.length);
+  const filteredMessages = messages.filter(message =>
+      !window.getSettingValue('filter-open-groups') ||
+      !BlockedNumberController.isBlocked(message.source)
+  )
+  const haveMessages = Boolean(filteredMessages?.length);
   const noResults = !haveContactsAndGroup && !haveMessages;
 
   return (
@@ -55,7 +60,7 @@ export const SearchResults = (props: SearchResultsProps) => {
             <MemoConversationListItemWithDetails
               {...contactOrGroup}
               mentionedUs={false}
-              isBlocked={false}
+              isBlocked={BlockedNumberController.isBlocked(contactOrGroup.id)}
               key={`search-result-convo-${contactOrGroup.id}`}
             />
           ))}
@@ -65,9 +70,9 @@ export const SearchResults = (props: SearchResultsProps) => {
       {haveMessages && (
         <>
           <StyledSeparatorSection>
-            {`${window.i18n('messagesHeader')}: ${messages.length}`}
+            {`${window.i18n('messagesHeader')}: ${filteredMessages.length}`}
           </StyledSeparatorSection>
-          {messages.map(message => (
+          {filteredMessages.map(message => (
             <MessageSearchResult key={`search-result-message-${message.id}`} {...message} />
           ))}
         </>

ts/components/settings/section/CategoryAppearance.tsx

@@ -57,6 +57,11 @@ export const SettingsCategoryAppearance = (props: { hasPassword: boolean | null
         ? true
         : window.getSettingValue(SettingsKey.settingsMenuBar);
 
+    const isFilterOpenGroupsActive =
+      window.getSettingValue(SettingsKey.settingsFilterOpenGroups) === undefined
+        ? true
+        : window.getSettingValue(SettingsKey.settingsFilterOpenGroups);
+
     const isSpellCheckActive =
       window.getSettingValue(SettingsKey.settingsSpellCheck) === undefined
         ? true
@@ -79,6 +84,15 @@ export const SettingsCategoryAppearance = (props: { hasPassword: boolean | null
           />
         )}
         <SessionToggleWithDescription
+          onClickToggle={() => {
+            window.toggleFilterOpenGroups();
+            forceUpdate();
+          }}
+          title={window.i18n('filterBlockedFromOpenGroupsTitle')}
+          description={window.i18n('filterBlockedFromOpenGroupsDescription')}
+          active={isFilterOpenGroupsActive}
+        />
+         <SessionToggleWithDescription
           onClickToggle={() => {
             window.toggleSpellCheck();
             forceUpdate();

ts/data/settings-key.ts

@@ -8,6 +8,8 @@ const settingsLinkPreview = 'link-preview-setting';
 const settingsStartInTray = 'start-in-tray-setting';
 const settingsOpengroupPruning = 'prune-setting';
 
+const settingsFilterOpenGroups = 'filter-open-groups';
+
 export const SettingsKey = {
   settingsReadReceipt,
   settingsTypingIndicator,
@@ -17,4 +19,5 @@ export const SettingsKey = {
   settingsLinkPreview,
   settingsStartInTray,
   settingsOpengroupPruning,
+  settingsFilterOpenGroups
 };

ts/mains/main_renderer.tsx

@@ -133,6 +133,11 @@ Storage.onready(async () => {
       window.setMenuBarVisibility(!value);
     },
 
+    getFilterOpenGroups: () => Storage.get('filter-open-groups', true),
+    setFilterOpenGroups: async (value: boolean) => {
+      await Storage.put('filter-open-groups', value);
+    },
+
     getSpellCheck: () => Storage.get('spell-check', true),
     setSpellCheck: async (value: boolean) => {
       await Storage.put('spell-check', value);
@@ -291,6 +296,12 @@ async function start() {
     window.Events.setHideMenuBar(!current);
   };
 
+  window.toggleFilterOpenGroups = () => {
+    const currentValue = window.getSettingValue('filter-open-groups');
+    const newValue = currentValue !== undefined ? !currentValue : false;
+    window.Events.setFilterOpenGroups(newValue);
+  };
+
   window.toggleSpellCheck = () => {
     const currentValue = window.getSettingValue('spell-check');
     // if undefined, it means 'default' so true. but we have to toggle it, so false

ts/session/apis/open_group_api/opengroupV2/ApiUtil.ts

@@ -6,7 +6,6 @@ import {
   updateDefaultRooms,
   updateDefaultRoomsInProgress,
 } from '../../../../state/ducks/defaultRooms';
-import { BlockedNumberController } from '../../../../util';
 import { getCompleteUrlFromRoom } from '../utils/OpenGroupUtils';
 import { parseOpenGroupV2 } from './JoinOpenGroupV2';
 import { getAllRoomInfos } from './OpenGroupAPIV2';
@@ -96,11 +95,7 @@ export const parseMessages = async (
     .filter(m => signatureValidEncodedData.includes(m.opengroupv2Message.base64EncodedData))
     .map(m => m.opengroupv2Message);
 
-  return _.compact(
-    parsedMessages.map(m =>
-      m && m.sender && !BlockedNumberController.isBlocked(m.sender) ? m : null
-    )
-  ).sort((a, b) => (a.serverId || 0) - (b.serverId || 0));
+  return _.compact(parsedMessages).sort((a, b) => (a.serverId || 0) - (b.serverId || 0));
 };
 
 // tslint:disable: no-http-string

ts/state/selectors/conversations.ts

@@ -154,7 +154,11 @@ export const getSortedMessagesOfSelectedConversation = createSelector(
     }
 
     const isPublic = convo.isPublic() || false;
-    const sortedMessage = sortMessages(messages, isPublic);
+    const sortedMessage = sortMessages(messages.filter(msg =>
+	!window.getSettingValue('filter-open-groups') ||
+	!BlockedNumberController.isBlocked(msg.propsForMessage.sender)
+      ), isPublic
+    )
 
     return updateFirstMessageOfSeries(sortedMessage);
   }

ts/types/LocalizerKeys.ts

@@ -50,6 +50,7 @@ export type LocalizerKeys =
   | 'fileSizeWarning'
   | 'openGroupURL'
   | 'hideMenuBarDescription'
+  | 'filterBlockedFromOpenGroupsDescription'
   | 'pickClosedGroupMember'
   | 'ByUsingThisService...'
   | 'startConversation'
@@ -246,6 +247,7 @@ export type LocalizerKeys =
   | 'setPassword'
   | 'editMenuDeleteContact'
   | 'hideMenuBarTitle'
+  | 'filterBlockedFromOpenGroupsTitle'
   | 'imageCaptionIconAlt'
   | 'sendRecoveryPhraseTitle'
   | 'multipleJoinedTheGroup'

ts/util/accountManager.ts

@@ -168,6 +168,9 @@ async function createAccount(identityKeyPair: any) {
   await Storage.put(SettingsKey.settingsOpengroupPruning, true);
   await window.setOpengroupPruning(true);
 
+  // Enable open group filtering by default.
+  await Storage.put(SettingsKey.settingsFilterOpenGroups, true);
+
   await setLocalPubKey(pubKeyString);
 }
 

ts/window.d.ts

@@ -51,6 +51,7 @@ declare global {
     toggleCallMediaPermissionsTo: (enabled: boolean) => Promise<void>;
     getCallMediaPermissions: () => boolean;
     toggleMenuBar: () => void;
+    toggleFilterOpenGroups: () => void;
     toggleSpellCheck: any;
     setTheme: (newTheme: string) => any;
     isDev?: () => boolean;