diff --git a/.rubocop.yml b/.rubocop.yml index 0ca5405170..74f79611fb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -109,6 +109,7 @@ Metrics/ParameterLists: Metrics/PerceivedComplexity: Exclude: - 'app/policies/status_policy.rb' + - 'app/services/post_status_service.rb' # Reason: Prevailing style is argument file paths # https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsfilepath diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index c9def4962d..25e4410c65 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -143,6 +143,7 @@ const excludeTypesFromFilter = filter => { 'favourite', 'emoji_reaction', 'reblog', + 'status_reference', 'mention', 'poll', 'status', diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx index 0051f92ca7..e141039c96 100644 --- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx +++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx @@ -152,6 +152,17 @@ export default class ColumnSettings extends PureComponent { +
+ + +
+ + {showPushSettings && } + + +
+
+
diff --git a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx index f8d5fbaa47..7fcd63e110 100644 --- a/app/javascript/mastodon/features/notifications/components/filter_bar.jsx +++ b/app/javascript/mastodon/features/notifications/components/filter_bar.jsx @@ -10,6 +10,7 @@ const tooltips = defineMessages({ favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favourites' }, emojiReactions: { id: 'notifications.filter.emoji_reactions', defaultMessage: 'Stamps' }, boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Boosts' }, + status_references: { id: 'notifications.filter.status_references', defaultMessage: 'Status references' }, polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' }, follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' }, statuses: { id: 'notifications.filter.statuses', defaultMessage: 'Updates from people you follow' }, @@ -90,6 +91,13 @@ class FilterBar extends PureComponent { > +