Fix reblogged statuses being erroneously shown as filtered (#18744)

diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 4ca3928242694d94ef9d315bd76dce46ccd02714..238a0d73493f28cec8a7e602498ed165603fc7b3 100644 (file)
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -338,7 +338,7 @@ class Status extends ImmutablePureComponent {
       );
     }
 
-    const matchedFilters = status.get('filtered') || status.getIn(['reblog', 'filtered']);
+    const matchedFilters = status.get('matched_filters');
     if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
       const minHandlers = this.props.muted ? {} : {
         moveUp: this.handleHotkeyMoveUp,

diff --git a/app/javascript/mastodon/selectors/index.js b/app/javascript/mastodon/selectors/index.js
index 6aeb8b7bdde2b763c8d316fe0be36b23562b38c8..bf1db4bb4d6552eb1633a5acd25efbdf48e43659 100644 (file)
--- a/app/javascript/mastodon/selectors/index.js
+++ b/app/javascript/mastodon/selectors/index.js
@@ -106,7 +106,7 @@ export const makeGetStatus = () => {
       return statusBase.withMutations(map => {
         map.set('reblog', statusReblog);
         map.set('account', accountBase);
-        map.set('filtered', filtered);
+        map.set('matched_filters', filtered);
       });
     },
   );