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

Sync story read status from primary

Browse source
This commit is contained in:
Josh Perez 2022-04-20 20:29:37 -04:00 • committed by GitHub
parent da45f26d37
commit 4896ce32c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ts/messageModifiers/MessageReceipts.ts
View file

@ -9,7 +9,7 @@ import { Collection, Model } from 'backbone';
import type { ConversationModel } from '../models/conversations';
import type { MessageModel } from '../models/messages';
import type { MessageAttributesType } from '../model-types.d';
import { isOutgoing } from '../state/selectors/message';
import { isOutgoing, isStory } from '../state/selectors/message';
import { isDirectConversation } from '../util/whatTypeOfConversation';
import { getOwn } from '../util/getOwn';
import { missingCaseError } from '../util/missingCaseError';
@ -66,7 +66,8 @@ async function getTargetMessage(
return null;
}
const message = messages.find(
item => isOutgoing(item) && sourceId === item.conversationId
item =>
(isOutgoing(item) || isStory(item)) && sourceId === item.conversationId
);
if (message) {
return window.MessageController.register(message.id, message);
@ -78,7 +79,8 @@ async function getTargetMessage(
ids.push(sourceId);
const target = messages.find(
item => isOutgoing(item) && ids.includes(item.conversationId)
item =>
(isOutgoing(item) || isStory(item)) && ids.includes(item.conversationId)
);
if (!target) {
return null;

7
ts/messageModifiers/ViewSyncs.ts
View file

@ -8,7 +8,7 @@ import { Collection, Model } from 'backbone';
import type { MessageModel } from '../models/messages';
import { ReadStatus } from '../messages/MessageReadStatus';
import { markViewed } from '../services/MessageUpdater';
import { isIncoming } from '../state/selectors/message';
import { isIncoming, isStory } from '../state/selectors/message';
import { notificationService } from '../services/notifications';
import * as log from '../logging/log';
@ -67,7 +67,10 @@ export class ViewSyncs extends Collection {
uuid: item.sourceUuid,
});
return isIncoming(item) && senderId === sync.get('senderId');
return (
(isIncoming(item) || isStory(item)) &&
senderId === sync.get('senderId')
);
});
if (!found) {