autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not push DMs into the home feed (#8940)

Browse Source 
* Do not push DMs into the home feed

* Show DMs column after sending a DM, if DMs column is not already shown
This commit is contained in:
Eugen Rochko
2018-10-11 01:31:03 +02:00
committed by GitHub
parent 790d3bc637
commit 87fdd139b8
11 changed files with 52 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/mastodon/reducers/conversations.js
View File

@ -1,5 +1,7 @@
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
import {
CONVERSATIONS_MOUNT,
CONVERSATIONS_UNMOUNT,
CONVERSATIONS_FETCH_REQUEST,
CONVERSATIONS_FETCH_SUCCESS,
CONVERSATIONS_FETCH_FAIL,
@ -11,6 +13,7 @@ const initialState = ImmutableMap({
items: ImmutableList(),
isLoading: false,
hasMore: true,
mounted: false,
});
const conversationToMap = item => ImmutableMap({
@ -73,6 +76,10 @@ export default function conversations(state = initialState, action) {
return expandNormalizedConversations(state, action.conversations, action.next);
case CONVERSATIONS_UPDATE:
return updateConversation(state, action.conversation);
case CONVERSATIONS_MOUNT:
return state.update('mounted', count => count + 1);
case CONVERSATIONS_UNMOUNT:
return state.update('mounted', count => count - 1);
default:
return state;
}