2024 10 11 1

app/javascript/flavours/glitch/features/notifications_v2/filter_bar.tsx

@@ -14,6 +14,7 @@ import { Icon } from 'flavours/glitch/components/icon';
 import {
   selectSettingsNotificationsQuickFilterActive,
   selectSettingsNotificationsQuickFilterAdvanced,
+  selectSettingsNotificationsQuickFilterShow,
 } from 'flavours/glitch/selectors/settings';
 import { useAppDispatch, useAppSelector } from 'flavours/glitch/store';
 
@@ -65,6 +66,11 @@ export const FilterBar: React.FC = () => {
   const advancedMode = useAppSelector(
     selectSettingsNotificationsQuickFilterAdvanced,
   );
+  const useFilterBar = useAppSelector(
+    selectSettingsNotificationsQuickFilterShow,
+  );
+
+  if (!useFilterBar) return null;
 
   if (advancedMode)
     return (

app/javascript/flavours/glitch/features/ui/index.jsx

@@ -21,6 +21,7 @@ import { Permalink } from 'flavours/glitch/components/permalink';
 import { PictureInPicture } from 'flavours/glitch/features/picture_in_picture';
 import { identityContextPropShape, withIdentity } from 'flavours/glitch/identity_context';
 import { layoutFromWindow } from 'flavours/glitch/is_mobile';
+import { selectUnreadNotificationGroupsCount } from 'flavours/glitch/selectors/notifications';
 import { WithRouterPropTypes } from 'flavours/glitch/utils/react_router';
 
 import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
@@ -90,7 +91,7 @@ const mapStateToProps = state => ({
   hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
   canUploadMore: !state.getIn(['compose', 'media_attachments']).some(x => ['audio', 'video'].includes(x.get('type'))) && state.getIn(['compose', 'media_attachments']).size < 4,
   isWide: state.getIn(['local_settings', 'stretch']),
-  unreadNotifications: state.getIn(['notifications', 'unread']),
+  unreadNotifications: selectUnreadNotificationGroupsCount(state),
   showFaviconBadge: state.getIn(['local_settings', 'notifications', 'favicon_badge']),
   hicolorPrivacyIcons: state.getIn(['local_settings', 'hicolor_privacy_icons']),
   moved: state.getIn(['accounts', me, 'moved']) && state.getIn(['accounts', state.getIn(['accounts', me, 'moved'])]),

db/migrate/20180410220657_create_bookmarks.rb → db/migrate/20180410220657_glitch_create_bookmarks.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-# This migration is a duplicate of 20180831171112 and may get ignored, see
-# config/initializers/0_duplicate_migrations.rb
+# This migration is a duplicate of 20180831171112
+
+class GlitchCreateBookmarks < ActiveRecord::Migration[5.1]
+  def up
+    return if table_exists?(:bookmarks)
 
-class CreateBookmarks < ActiveRecord::Migration[5.1]
-  def change
     create_table :bookmarks do |t|
       t.references :account, null: false
       t.references :status, null: false
@@ -19,4 +20,6 @@ def change
 
     add_index :bookmarks, [:account_id, :status_id], unique: true
   end
+
+  def down; end
 end

db/migrate/20180831171112_create_bookmarks.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-# This migration is a duplicate of 20180410220657 and may get ignored, see
-# config/initializers/0_duplicate_migrations.rb
+# This migration is a duplicate of 20180410220657
 
 class CreateBookmarks < ActiveRecord::Migration[5.2]
-  def change
+  def up
+    return if table_exists?(:bookmarks)
+
     create_table :bookmarks do |t|
       t.references :account, null: false
       t.references :status, null: false
@@ -19,4 +20,8 @@ def change
 
     add_index :bookmarks, [:account_id, :status_id], unique: true
   end
+
+  def down
+    drop_table :bookmarks
+  end
 end