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

No Backbone in data layer; server/client interfaces are now similar

Browse source
This commit is contained in:
Scott Nonnenberg 2021-12-10 14:51:54 -08:00 • committed by GitHub
parent 064bbfe97a
commit 34fd945f83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 573 additions and 1021 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ts/messages/getMessageById.ts
View file

@ -2,21 +2,21 @@
// SPDX-License-Identifier: AGPL-3.0-only
import * as log from '../logging/log';
import type { MessageAttributesType } from '../model-types.d';
import type { MessageModel } from '../models/messages';
import * as Errors from '../types/errors';
export async function getMessageById(
messageId: string
): Promise<MessageModel | undefined> {
let message = window.MessageController.getById(messageId);
const message = window.MessageController.getById(messageId);
if (message) {
return message;
}
let found: MessageAttributesType | undefined;
try {
message = await window.Signal.Data.getMessageById(messageId, {
Message: window.Whisper.Message,
});
found = await window.Signal.Data.getMessageById(messageId);
} catch (err: unknown) {
log.error(
`failed to load message with id ${messageId} ` +
@ -24,10 +24,9 @@ export async function getMessageById(
);
}
if (!message) {
if (!found) {
return undefined;
}
message = window.MessageController.register(message.id, message);
return message;
return window.MessageController.register(found.id, found);
}