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

Do not add non-messages to the timeline

This commit is contained in:
Josh Perez 2022-04-07 17:13:58 -04:00 committed by GitHub
parent 19bb3bc994
commit 9ffcd44e6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ts/models/conversations.ts
View File

@ -90,10 +90,11 @@ import {
} from '../util/whatTypeOfConversation';
import { SignalService as Proto } from '../protobuf';
import {
getMessagePropStatus,
hasErrors,
isIncoming,
isStory,
isTapToView,
getMessagePropStatus,
} from '../state/selectors/message';
import {
conversationJobQueue,
@ -1373,7 +1374,9 @@ export class ConversationModel extends window.Backbone
// Clear typing indicator for a given contact if we receive a message from them
this.clearContactTypingTimer(typingToken);
this.addSingleMessage(message);
if (!isStory(message.attributes)) {
this.addSingleMessage(message);
}
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
this.debouncedUpdateLastMessage!();

19
ts/models/messages.ts
View File

@ -227,14 +227,6 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
notifyRedux(): void {
const { messageChanged } = window.reduxActions.conversations;
if (messageChanged) {
const conversationId = this.get('conversationId');
// Note: The clone is important for triggering a re-run of selectors
messageChanged(this.id, conversationId, { ...this.attributes });
}
const { storyChanged } = window.reduxActions.stories;
if (isStory(this.attributes)) {
@ -250,6 +242,17 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
storyChanged(storyData);
// We don't want messageChanged to run
return;
}
const { messageChanged } = window.reduxActions.conversations;
if (messageChanged) {
const conversationId = this.get('conversationId');
// Note: The clone is important for triggering a re-run of selectors
messageChanged(this.id, conversationId, { ...this.attributes });
}
}