jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Attach storyContext to group story replies

This commit is contained in:
Josh Perez 2022-04-22 14:45:45 -04:00 committed by GitHub
parent 4602cef6da
commit 9973c661d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ts/jobs/helpers/sendNormalMessage.ts
View File

@ -205,6 +205,7 @@ export async function sendNormalMessage(
profileKey,
quote,
sticker,
storyContext,
timestamp: messageTimestamp,
mentions,
},

20
ts/jobs/helpers/sendReaction.ts
View File

@ -22,7 +22,7 @@ import { getSendOptions } from '../../util/getSendOptions';
import { SignalService as Proto } from '../../protobuf';
import { handleMessageSend } from '../../util/handleMessageSend';
import { ourProfileKeyService } from '../../services/ourProfileKey';
import { canReact } from '../../state/selectors/message';
import { canReact, isStory } from '../../state/selectors/message';
import { findAndFormatContact } from '../../util/findAndFormatContact';
import { UUID } from '../../types/UUID';
import { handleMultipleSendErrors } from './handleMultipleSendErrors';
@ -204,12 +204,6 @@ export async function sendReaction(
return;
}
let storyMessage: MessageModel | undefined;
const storyId = message.get('storyId');
if (storyId) {
storyMessage = await getMessageById(storyId);
}
log.info('sending direct reaction message');
promise = window.textsecure.messaging.sendMessageToIdentifier({
identifier: recipientIdentifiersWithoutMe[0],
@ -226,10 +220,10 @@ export async function sendReaction(
groupId: undefined,
profileKey,
options: sendOptions,
storyContext: storyMessage
storyContext: isStory(message.attributes)
? {
authorUuid: storyMessage.get('sourceUuid'),
timestamp: storyMessage.get('sent_at'),
authorUuid: message.get('sourceUuid'),
timestamp: message.get('sent_at'),
}
: undefined,
});
@ -261,6 +255,12 @@ export async function sendReaction(
timestamp: pendingReaction.timestamp,
expireTimer,
profileKey,
storyContext: isStory(message.attributes)
? {
authorUuid: message.get('sourceUuid'),
timestamp: message.get('sent_at'),
}
: undefined,
},
messageId,
sendOptions,