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

Stories: Proper notifications and handling of out-of-order messages

Browse source
This commit is contained in:
Scott Nonnenberg 2023-01-11 14:54:06 -08:00 • committed by GitHub
parent 81fc9ff94d
commit 50a0110192
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 425 additions and 274 deletions
Download patch file Download diff file Expand all files Collapse all files

56
ts/messageModifiers/Reactions.ts
View file

@ -15,7 +15,7 @@ import * as log from '../logging/log';
import { getContactId, getContact } from '../messages/helpers';
import { isDirectConversation, isMe } from '../util/whatTypeOfConversation';
import { isOutgoing, isStory } from '../state/selectors/message';
import { getMessageIdForLogging } from '../util/idForLogging';
import { strictAssert } from '../util/assert';
export class ReactionModel extends Model<ReactionAttributesType> {}
@ -83,10 +83,7 @@ export class Reactions extends Collection<ReactionModel> {
});
}
async onReaction(
reaction: ReactionModel,
generatedMessage: MessageModel
): Promise<void> {
async onReaction(reaction: ReactionModel): Promise<void> {
try {
// The conversation the target message was in; we have to find it in the database
// to to figure that out.
@ -102,6 +99,11 @@ export class Reactions extends Collection<ReactionModel> {
);
}
const generatedMessage = reaction.get('storyReactionMessage');
strictAssert(
generatedMessage,
'Story reactions must provide storyReactionMessage'
);
const fromConversation = window.ConversationController.get(
generatedMessage.get('conversationId')
);
@ -115,6 +117,8 @@ export class Reactions extends Collection<ReactionModel> {
if (!targetMessageCheck) {
log.info(
'No message for reaction',
reaction.get('timestamp'),
'targeting',
reaction.get('targetAuthorUuid'),
reaction.get('targetTimestamp')
);
@ -173,46 +177,14 @@ export class Reactions extends Collection<ReactionModel> {
// Use the generated message in ts/background.ts to create a message
// if the reaction is targeted at a story.
if (isStory(targetMessage)) {
generatedMessage.set({
expireTimer: targetConversation.get('expireTimer'),
storyId: targetMessage.id,
storyReaction: {
emoji: reaction.get('emoji'),
targetAuthorUuid: reaction.get('targetAuthorUuid'),
targetTimestamp: reaction.get('targetTimestamp'),
},
if (!isStory(targetMessage)) {
await message.handleReaction(reaction);
} else {
await generatedMessage.handleReaction(reaction, {
storyMessage: targetMessage,
});
// Note: generatedMessage comes with an id, so we have to force this save
await Promise.all([
window.Signal.Data.saveMessage(generatedMessage.attributes, {
ourUuid: window.textsecure.storage.user
.getCheckedUuid()
.toString(),
forceSave: true,
}),
generatedMessage.hydrateStoryContext(message),
]);
log.info('Reactions.onReaction adding reaction to story', {
reactionMessageId: getMessageIdForLogging(
generatedMessage.attributes
),
storyId: getMessageIdForLogging(targetMessage),
targetTimestamp: reaction.get('targetTimestamp'),
timestamp: reaction.get('timestamp'),
});
const messageToAdd = window.MessageController.register(
generatedMessage.id,
generatedMessage
);
void targetConversation.addSingleMessage(messageToAdd);
}
await message.handleReaction(reaction);
this.remove(reaction);
});
} catch (error) {