mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Remove refs to MessageModel in conversations.ts

Browse source
This commit is contained in:
Fedor Indutny 2024-07-25 16:29:49 -07:00 • committed by GitHub
parent 2550af9c91
commit cc6ff0b554
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 312 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ts/util/modifyTargetMessage.ts
View file

@ -102,7 +102,7 @@ export async function modifyTargetMessage(
}
if (type === 'outgoing' || (type === 'story' && ourAci === sourceServiceId)) {
const receipts = await MessageReceipts.forMessage(message);
const receipts = await MessageReceipts.forMessage(message.attributes);
const sendActions = receipts.map(({ receiptSync }) => {
let sendActionType: SendActionType;
const receiptType = receiptSync.type;
@ -164,10 +164,10 @@ export async function modifyTargetMessage(
if (type === 'incoming') {
// In a followup (see DESKTOP-2100), we want to make `ReadSyncs#forMessage` return
// an array, not an object. This array wrapping makes that future a bit easier.
const maybeSingleReadSync = await ReadSyncs.forMessage(message);
const maybeSingleReadSync = await ReadSyncs.forMessage(message.attributes);
const readSyncs = maybeSingleReadSync ? [maybeSingleReadSync] : [];
const viewSyncs = await ViewSyncs.forMessage(message);
const viewSyncs = await ViewSyncs.forMessage(message.attributes);
const isGroupStoryReply =
isGroup(conversation.attributes) && message.get('storyId');
@ -233,13 +233,13 @@ export async function modifyTargetMessage(
drop(
message
.getConversation()
?.onReadMessage(message, markReadAt, newestSentAt)
?.onReadMessage(message.attributes, markReadAt, newestSentAt)
);
}
// Check for out-of-order view once open syncs
if (isTapToView(message.attributes)) {
const viewOnceOpenSync = ViewOnceOpenSyncs.forMessage(message);
const viewOnceOpenSync = ViewOnceOpenSyncs.forMessage(message.attributes);
if (viewOnceOpenSync) {
await message.markViewOnceMessageViewed({ fromSync: true });
changed = true;
@ -248,7 +248,7 @@ export async function modifyTargetMessage(
}
if (isStory(message.attributes)) {
const viewSyncs = await ViewSyncs.forMessage(message);
const viewSyncs = await ViewSyncs.forMessage(message.attributes);
if (viewSyncs.length !== 0) {
message.set({
@ -277,7 +277,7 @@ export async function modifyTargetMessage(
}
// Does message message have any pending, previously-received associated reactions?
const reactions = Reactions.findReactionsForMessage(message);
const reactions = Reactions.findReactionsForMessage(message.attributes);
log.info(
`${logId}: Found ${reactions.length} early reaction(s) for ${message.attributes.type} message`