Page MenuHomePhabricator
Differential D14336

[keyserver] Refactor latest message determination logic
ClosedPublic
Actions

Authored by ashoat on Feb 11 2025, 12:13 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 19, 9:22 AM
Unknown Object (File)
Sat, Apr 19, 6:45 AM
Unknown Object (File)
Fri, Apr 18, 9:16 PM
Unknown Object (File)
Fri, Apr 18, 10:32 AM
Unknown Object (File)
Wed, Apr 9, 12:13 PM
Unknown Object (File)
Feb 27 2025, 5:50 AM
Unknown Object (File)
Feb 27 2025, 12:40 AM
Unknown Object (File)
Feb 24 2025, 3:19 AM
View All 30 Files
Subscribers
None

Details

Reviewers
tomek
angelika
Commits
rCOMM049cd0929deb: [keyserver] Refactor latest message determination logic
Summary

This diff is a no-op; just refactoring things to prepare for later diffs.

  1. Use the new messages returned from fetchMessageNotifyType instead of threadsToMessageIndices and messageInfos. In a later diff, this has the benefit of including messageNotifyType
  2. Get rid of flattenLatestMessagesPerUser by simplifying logic
  3. Simplify types

Depends on D14335

Test Plan

Tested in combination with later diffs, to confirm that it's possible for some message types to not set a thread to unread

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
keyserver/
src/
creators/
99 lines
lib/
push/
2 lines

Diff 46984

View Options

keyserver/src/creators/message-creator.js

Show All 19 Linesimport {
getMostRecentNonLocalMessageID, getMostRecentNonLocalMessageID,
messageKey, messageKey,
robotextForMessageInfo, robotextForMessageInfo,
sortMessageInfoList, sortMessageInfoList,
} from '../shared/message-utils.js'; } from '../shared/message-utils.js';
import { messageSpecs } from '../shared/messages/message-specs.js'; import { messageSpecs } from '../shared/messages/message-specs.js';
import { import {
getSidebarItems, getSidebarItems,
getAllInitialSidebarItems,
type SidebarItem, type SidebarItem,
} from '../shared/sidebar-item-utils.js'; } from '../shared/sidebar-item-utils.js';
import { threadInChatList, threadIsPending } from '../shared/thread-utils.js'; import { threadInChatList, threadIsPending } from '../shared/thread-utils.js';
import { messageTypes } from '../types/message-types-enum.js'; import { messageTypes } from '../types/message-types-enum.js';
import { import {
type ComposableMessageInfo, type ComposableMessageInfo,
isComposableMessageType, isComposableMessageType,
type LocalMessageInfo, type LocalMessageInfo,
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Linesfunction useCreateChatThreadItem(): ThreadInfo => ChatThreadItem {
const getLastUpdatedTimes = useGetLastUpdatedTimes(); const getLastUpdatedTimes = useGetLastUpdatedTimes();
return React.useCallback( return React.useCallback(
threadInfo => { threadInfo => {
const mostRecentNonLocalMessage = getMostRecentNonLocalMessageID( const mostRecentNonLocalMessage = getMostRecentNonLocalMessageID(
threadInfo.id, threadInfo.id,
messageStore, messageStore,
); );
const { lastUpdatedAtLeastTime: lastUpdatedTime } = getLastUpdatedTimes( const { lastUpdatedAtLeastTime } = getLastUpdatedTimes(
threadInfo, threadInfo,
messageStore, messageStore,
messageInfos, messageInfos,
); );
const sidebars = sidebarInfos[threadInfo.id] ?? []; const sidebars = sidebarInfos[threadInfo.id] ?? [];
const allSidebarItems = sidebars.map(sidebarInfo => ({ const lastUpdatedAtLeastTimeIncludingSidebars =
type: 'sidebar', sidebars.length > 0
...sidebarInfo, ? Math.max(lastUpdatedAtLeastTime, sidebars[0].lastUpdatedAtLeastTime)
})); : lastUpdatedAtLeastTime;
const lastUpdatedTimeIncludingSidebars =
allSidebarItems.length > 0
? Math.max(lastUpdatedTime, allSidebarItems[0].lastUpdatedTime)
: lastUpdatedTime;
const sidebarItems = getSidebarItems(allSidebarItems); const allInitialSidebarItems = getAllInitialSidebarItems(sidebars);
const sidebarItems = getSidebarItems(allInitialSidebarItems);
return { return {
type: 'chatThreadItem', type: 'chatThreadItem',
threadInfo, threadInfo,
mostRecentNonLocalMessage, mostRecentNonLocalMessage,
lastUpdatedTime, lastUpdatedTime: lastUpdatedAtLeastTime,
lastUpdatedTimeIncludingSidebars, lastUpdatedTimeIncludingSidebars:
lastUpdatedAtLeastTimeIncludingSidebars,
sidebars: sidebarItems, sidebars: sidebarItems,
}; };
}, },
[messageInfos, messageStore, sidebarInfos, getLastUpdatedTimes], [messageInfos, messageStore, sidebarInfos, getLastUpdatedTimes],
); );
} }
function useFlattenedChatListData(): $ReadOnlyArray<ChatThreadItem> { function useFlattenedChatListData(): $ReadOnlyArray<ChatThreadItem> {
▲ Show 20 Lines • Show All 488 Lines • Show Last 20 Lines
View Options

lib/push/utils.js

Show All 19 Linesimport {
getMostRecentNonLocalMessageID, getMostRecentNonLocalMessageID,
messageKey, messageKey,
robotextForMessageInfo, robotextForMessageInfo,
sortMessageInfoList, sortMessageInfoList,
} from '../shared/message-utils.js'; } from '../shared/message-utils.js';
import { messageSpecs } from '../shared/messages/message-specs.js'; import { messageSpecs } from '../shared/messages/message-specs.js';
import { import {
getSidebarItems, getSidebarItems,
getAllInitialSidebarItems,
type SidebarItem, type SidebarItem,
} from '../shared/sidebar-item-utils.js'; } from '../shared/sidebar-item-utils.js';
import { threadInChatList, threadIsPending } from '../shared/thread-utils.js'; import { threadInChatList, threadIsPending } from '../shared/thread-utils.js';
import { messageTypes } from '../types/message-types-enum.js'; import { messageTypes } from '../types/message-types-enum.js';
import { import {
type ComposableMessageInfo, type ComposableMessageInfo,
isComposableMessageType, isComposableMessageType,
type LocalMessageInfo, type LocalMessageInfo,
▲ Show 20 Lines • Show All 51 Lines • ▼ Show 20 Linesfunction useCreateChatThreadItem(): ThreadInfo => ChatThreadItem {
const getLastUpdatedTimes = useGetLastUpdatedTimes(); const getLastUpdatedTimes = useGetLastUpdatedTimes();
return React.useCallback( return React.useCallback(
threadInfo => { threadInfo => {
const mostRecentNonLocalMessage = getMostRecentNonLocalMessageID( const mostRecentNonLocalMessage = getMostRecentNonLocalMessageID(
threadInfo.id, threadInfo.id,
messageStore, messageStore,
); );
const { lastUpdatedAtLeastTime: lastUpdatedTime } = getLastUpdatedTimes( const { lastUpdatedAtLeastTime } = getLastUpdatedTimes(
threadInfo, threadInfo,
messageStore, messageStore,
messageInfos, messageInfos,
); );
const sidebars = sidebarInfos[threadInfo.id] ?? []; const sidebars = sidebarInfos[threadInfo.id] ?? [];
const allSidebarItems = sidebars.map(sidebarInfo => ({ const lastUpdatedAtLeastTimeIncludingSidebars =
type: 'sidebar', sidebars.length > 0
...sidebarInfo, ? Math.max(lastUpdatedAtLeastTime, sidebars[0].lastUpdatedAtLeastTime)
})); : lastUpdatedAtLeastTime;
const lastUpdatedTimeIncludingSidebars =
allSidebarItems.length > 0
? Math.max(lastUpdatedTime, allSidebarItems[0].lastUpdatedTime)
: lastUpdatedTime;
const sidebarItems = getSidebarItems(allSidebarItems); const allInitialSidebarItems = getAllInitialSidebarItems(sidebars);
const sidebarItems = getSidebarItems(allInitialSidebarItems);
return { return {
type: 'chatThreadItem', type: 'chatThreadItem',
threadInfo, threadInfo,
mostRecentNonLocalMessage, mostRecentNonLocalMessage,
lastUpdatedTime, lastUpdatedTime: lastUpdatedAtLeastTime,
lastUpdatedTimeIncludingSidebars, lastUpdatedTimeIncludingSidebars:
lastUpdatedAtLeastTimeIncludingSidebars,
sidebars: sidebarItems, sidebars: sidebarItems,
}; };
}, },
[messageInfos, messageStore, sidebarInfos, getLastUpdatedTimes], [messageInfos, messageStore, sidebarInfos, getLastUpdatedTimes],
); );
} }
function useFlattenedChatListData(): $ReadOnlyArray<ChatThreadItem> { function useFlattenedChatListData(): $ReadOnlyArray<ChatThreadItem> {
▲ Show 20 Lines • Show All 488 Lines • Show Last 20 Lines