Revert "Add regex filter back to firehose (glitch-soc#2266)"

This reverts commit ed15893.
Idyllshire · Jul 15, 2023 · 609e950 · 609e950
1 parent 26f8a2b
commit 609e950
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 21 deletions.
diff --git a/app/javascript/flavours/glitch/features/firehose/index.jsx b/app/javascript/flavours/glitch/features/firehose/index.jsx
@@ -10,8 +10,7 @@ import { addColumn } from 'flavours/glitch/actions/columns';
 import { changeSetting } from 'flavours/glitch/actions/settings';
 import { connectPublicStream, connectCommunityStream } from 'flavours/glitch/actions/streaming';
 import { expandPublicTimeline, expandCommunityTimeline } from 'flavours/glitch/actions/timelines';
-import { DismissableBanner } from 'flavours/glitch/components/dismissable_banner';
-import SettingText from 'flavours/glitch/components/setting_text';
+import DismissableBanner from 'flavours/glitch/components/dismissable_banner';
 import initialState, { domain } from 'flavours/glitch/initial_state';
 import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
 
@@ -22,7 +21,6 @@ import StatusListContainer from '../ui/containers/status_list_container';
 
 const messages = defineMessages({
   title: { id: 'column.firehose', defaultMessage: 'Live feeds' },
-  filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' },
 });
 
 // TODO: use a proper React context later on
@@ -35,7 +33,6 @@ const useIdentity = () => ({
 });
 
 const ColumnSettings = () => {
-  const intl = useIntl();
   const dispatch = useAppDispatch();
   const settings = useAppSelector((state) => state.getIn(['settings', 'firehose']));
   const onChange = useCallback(
@@ -58,13 +55,6 @@ const ColumnSettings = () => {
           onChange={onChange}
           label={<FormattedMessage id='firehose.column_settings.allow_local_only' defaultMessage='Show local-only posts in "All"' />}
         />
-        <span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span>
-        <SettingText
-          settings={settings}
-          settingPath={['regex', 'body']}
-          onChange={onChange}
-          label={intl.formatMessage(messages.filter_regex)}
-        />
       </div>
     </div>
   );
@@ -80,23 +70,22 @@ const Firehose = ({ feedType, multiColumn }) => {
   const hasUnread = useAppSelector((state) => state.getIn(['timelines', `${feedType}${onlyMedia ? ':media' : ''}`, 'unread'], 0) > 0);
 
   const allowLocalOnly = useAppSelector((state) => state.getIn(['settings', 'firehose', 'allowLocalOnly']));
-  const regex = useAppSelector((state) => state.getIn(['settings', 'firehose', 'regex', 'body']));
 
   const handlePin = useCallback(
     () => {
       switch(feedType) {
       case 'community':
-        dispatch(addColumn('COMMUNITY', { other: { onlyMedia }, regex: { body: regex } }));
+        dispatch(addColumn('COMMUNITY', { other: { onlyMedia } }));
         break;
       case 'public':
-        dispatch(addColumn('PUBLIC', { other: { onlyMedia, allowLocalOnly }, regex: { body: regex }  }));
+        dispatch(addColumn('PUBLIC', { other: { onlyMedia, allowLocalOnly } }));
         break;
       case 'public:remote':
-        dispatch(addColumn('REMOTE', { other: { onlyMedia, onlyRemote: true }, regex: { body: regex }  }));
+        dispatch(addColumn('REMOTE', { other: { onlyMedia, onlyRemote: true } }));
         break;
       }
     },
-    [dispatch, onlyMedia, feedType, allowLocalOnly, regex],
+    [dispatch, onlyMedia, feedType, allowLocalOnly],
   );
 
   const handleLoadMore = useCallback(
@@ -210,7 +199,6 @@ const Firehose = ({ feedType, multiColumn }) => {
           scrollKey='firehose'
           emptyMessage={emptyMessage}
           bindToDocument={!multiColumn}
-          regex={regex}
         />
       </div>
 

diff --git a/app/javascript/flavours/glitch/reducers/settings.js b/app/javascript/flavours/glitch/reducers/settings.js
@@ -87,10 +87,6 @@ const initialState = ImmutableMap({
   firehose: ImmutableMap({
     onlyMedia: false,
     allowLocalOnly: true,
-
-    regex: ImmutableMap({
-      body: '',
-    }),
   }),
 
   community: ImmutableMap({