diff options
author | David Yip <yipdw@member.fsf.org> | 2018-04-14 03:50:31 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-04-14 03:50:31 -0500 |
commit | d66192f21c22dd79735a6c3ea6e2ed115b42e0d0 (patch) | |
tree | fec9f7eab346901c571c57023aa6231b0f855421 /app/javascript/flavours/glitch/reducers/accounts_counters.js | |
parent | 78aca92689cd896f4be34daeb1852f75abc57472 (diff) | |
parent | 95a892accdb6a081447117f49c66431dc7e032fb (diff) |
Merge remote-tracking branch 'glitchsoc/master' into gs-master
Conflicts: db/schema.rb
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/accounts_counters.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/accounts_counters.js | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/reducers/accounts_counters.js b/app/javascript/flavours/glitch/reducers/accounts_counters.js index 0fd985a08..7abcb5dec 100644 --- a/app/javascript/flavours/glitch/reducers/accounts_counters.js +++ b/app/javascript/flavours/glitch/reducers/accounts_counters.js @@ -23,6 +23,8 @@ import { UNREBLOG_SUCCESS, FAVOURITE_SUCCESS, UNFAVOURITE_SUCCESS, + BOOKMARK_SUCCESS, + UNBOOKMARK_SUCCESS, REBLOGS_FETCH_SUCCESS, FAVOURITES_FETCH_SUCCESS, } from 'flavours/glitch/actions/interactions'; @@ -46,6 +48,10 @@ import { FAVOURITED_STATUSES_EXPAND_SUCCESS, } from 'flavours/glitch/actions/favourites'; import { + BOOKMARKED_STATUSES_FETCH_SUCCESS, + BOOKMARKED_STATUSES_EXPAND_SUCCESS, +} from 'flavours/glitch/actions/bookmarks'; +import { LIST_ACCOUNTS_FETCH_SUCCESS, LIST_EDITOR_SUGGESTIONS_READY, } from 'flavours/glitch/actions/lists'; @@ -122,11 +128,15 @@ export default function accountsCounters(state = initialState, action) { case CONTEXT_FETCH_SUCCESS: case FAVOURITED_STATUSES_FETCH_SUCCESS: case FAVOURITED_STATUSES_EXPAND_SUCCESS: + case BOOKMARKED_STATUSES_FETCH_SUCCESS: + case BOOKMARKED_STATUSES_EXPAND_SUCCESS: return normalizeAccountsFromStatuses(state, action.statuses); case REBLOG_SUCCESS: case FAVOURITE_SUCCESS: case UNREBLOG_SUCCESS: case UNFAVOURITE_SUCCESS: + case BOOKMARK_SUCCESS: + case UNBOOKMARK_SUCCESS: return normalizeAccountFromStatus(state, action.response); case TIMELINE_UPDATE: case STATUS_FETCH_SUCCESS: |