Remove refs to MessageModel in conversations.ts
This commit is contained in:
parent
2550af9c91
commit
cc6ff0b554
17 changed files with 312 additions and 357 deletions
|
@ -2,7 +2,7 @@
|
|||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import type { AciString } from '../types/ServiceId';
|
||||
import type { MessageModel } from '../models/messages';
|
||||
import type { ReadonlyMessageAttributesType } from '../model-types.d';
|
||||
import { DataReader } from '../sql/Client';
|
||||
import * as Errors from '../types/errors';
|
||||
import * as log from '../logging/log';
|
||||
|
@ -23,18 +23,18 @@ function remove(sync: ViewOnceOpenSyncAttributesType): void {
|
|||
}
|
||||
|
||||
export function forMessage(
|
||||
message: MessageModel
|
||||
message: ReadonlyMessageAttributesType
|
||||
): ViewOnceOpenSyncAttributesType | null {
|
||||
const logId = `ViewOnceOpenSyncs.forMessage(${getMessageIdForLogging(
|
||||
message.attributes
|
||||
message
|
||||
)})`;
|
||||
|
||||
const viewOnceSyncValues = Array.from(viewOnceSyncs.values());
|
||||
|
||||
const syncBySourceServiceId = viewOnceSyncValues.find(item => {
|
||||
return (
|
||||
item.sourceAci === message.get('sourceServiceId') &&
|
||||
item.timestamp === message.get('sent_at')
|
||||
item.sourceAci === message.sourceServiceId &&
|
||||
item.timestamp === message.sent_at
|
||||
);
|
||||
});
|
||||
|
||||
|
@ -45,10 +45,7 @@ export function forMessage(
|
|||
}
|
||||
|
||||
const syncBySource = viewOnceSyncValues.find(item => {
|
||||
return (
|
||||
item.source === message.get('source') &&
|
||||
item.timestamp === message.get('sent_at')
|
||||
);
|
||||
return item.source === message.source && item.timestamp === message.sent_at;
|
||||
});
|
||||
if (syncBySource) {
|
||||
log.info(`${logId}: Found early view once open sync for message`);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue