bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Sort conversations by last status date rather than id

Browse source
This commit is contained in:
oakes 2023-03-01 16:01:39 -05:00
parent a8b0dc93f2
commit 332be25784
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/soapbox/reducers/conversations.ts
View file

@ -9,7 +9,7 @@ import {
CONVERSATIONS_UPDATE, CONVERSATIONS_UPDATE,
CONVERSATIONS_READ, CONVERSATIONS_READ,
} from '../actions/conversations'; } from '../actions/conversations';
import { compareId } from '../utils/comparators'; import { compareDate } from '../utils/comparators';
import type { AnyAction } from 'redux'; import type { AnyAction } from 'redux';
import type { APIEntity } from 'soapbox/types/entities'; import type { APIEntity } from 'soapbox/types/entities';
@ -19,7 +19,7 @@ const ConversationRecord = ImmutableRecord({
unread: false, unread: false,
accounts: ImmutableList<string>(), accounts: ImmutableList<string>(),
last_status: null as string | null, last_status: null as string | null,
last_status_created_at: null as string | null,
}); });
const ReducerRecord = ImmutableRecord({ const ReducerRecord = ImmutableRecord({
@ -37,6 +37,7 @@ const conversationToMap = (item: APIEntity) => ConversationRecord({
unread: item.unread, unread: item.unread,
accounts: ImmutableList(item.accounts.map((a: APIEntity) => a.id)), accounts: ImmutableList(item.accounts.map((a: APIEntity) => a.id)),
last_status: item.last_status ? item.last_status.id : null, last_status: item.last_status ? item.last_status.id : null,
last_status_created_at: item.last_status ? item.last_status.created_at : null,
}); });
const updateConversation = (state: State, item: APIEntity) => state.update('items', list => { const updateConversation = (state: State, item: APIEntity) => state.update('items', list => {
@ -71,12 +72,12 @@ const expandNormalizedConversations = (state: State, conversations: APIEntity[],
list = list.concat(items); list = list.concat(items);
return list.sortBy(x => x.get('last_status'), (a, b) => { return list.sortBy(x => x.get('last_status_created_at'), (a, b) => {
if (a === null || b === null) { if (a === null || b === null) {
return -1; return -1;
} }
return compareId(a, b) * -1; return compareDate(a, b);
}); });
}); });
} }