about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/reducers/contexts.js
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-04-19 16:42:27 +0200
committerThibaut Girka <thib@sitedethib.com>2018-04-19 16:42:27 +0200
commitf84b4d90cba24b3cd57cb07cfc4b3a4dca25015f (patch)
tree6a42d11c0f10e7c3d24b75949c5adf7bcda579af /app/javascript/flavours/glitch/reducers/contexts.js
parentd55ab8e3e83d4a19005784f9cdbc1fa920cd2f96 (diff)
[Glitch] Do not filter the status collection after muting and blocking
Port fd87e5a53bcaafb886a675c76e9256015e9db897 to glitch-soc
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/contexts.js')
-rw-r--r--app/javascript/flavours/glitch/reducers/contexts.js13
1 files changed, 13 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/contexts.js b/app/javascript/flavours/glitch/reducers/contexts.js
index 53e93a589..59dabc2b9 100644
--- a/app/javascript/flavours/glitch/reducers/contexts.js
+++ b/app/javascript/flavours/glitch/reducers/contexts.js
@@ -1,3 +1,7 @@
+import {
+  ACCOUNT_BLOCK_SUCCESS,
+  ACCOUNT_MUTE_SUCCESS,
+} from 'flavours/glitch/actions/accounts';
 import { CONTEXT_FETCH_SUCCESS } from 'flavours/glitch/actions/statuses';
 import { TIMELINE_DELETE, TIMELINE_CONTEXT_UPDATE } from 'flavours/glitch/actions/timelines';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
@@ -31,6 +35,12 @@ const deleteFromContexts = (state, id) => {
   return state;
 };
 
+const filterContexts = (state, relationship) => {
+  return state.map(
+    statuses => statuses.filter(
+      status => status.get('account') !== relationship.id));
+};
+
 const updateContext = (state, status, references) => {
   return state.update('descendants', map => {
     references.forEach(parentId => {
@@ -49,6 +59,9 @@ const updateContext = (state, status, references) => {
 
 export default function contexts(state = initialState, action) {
   switch(action.type) {
+  case ACCOUNT_BLOCK_SUCCESS:
+  case ACCOUNT_MUTE_SUCCESS:
+    return filterContexts(state, action.relationship);
   case CONTEXT_FETCH_SUCCESS:
     return normalizeContext(state, action.id, action.ancestors, action.descendants);
   case TIMELINE_DELETE: