tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Redesign direct messages column (#9022)

Browse Source
This commit is contained in:
Eugen Rochko
2018-10-20 02:23:58 +02:00
committed by GitHub
parent 029943d59b
commit eb1b9903a6
6 changed files with 152 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/direct_timeline/containers/conversation_container.js
View File

@ -4,13 +4,11 @@ import { markConversationRead } from '../../../actions/conversations';
const mapStateToProps = (state, { conversationId }) => {
const conversation = state.getIn(['conversations', 'items']).find(x => x.get('id') === conversationId);
const lastStatus = state.getIn(['statuses', conversation.get('last_status')], null);
return {
accounts: conversation.get('accounts').map(accountId => state.getIn(['accounts', accountId], null)),
unread: conversation.get('unread'),
lastStatus,
lastAccount: lastStatus === null ? null : state.getIn(['accounts', lastStatus.get('account')], null),
lastStatusId: conversation.get('last_status', null),
};
};