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

Update timers whenever we mark messages read

Browse source
This commit is contained in:
Scott Nonnenberg 2021-07-19 13:45:18 -07:00 • committed by GitHub
parent cd35a29638
commit 7761d83055
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 70 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ts/sql/Client.ts
View file

@ -1068,25 +1068,27 @@ async function hasUserInitiatedMessages(conversationId: string) {
async function saveMessage(
data: MessageType,
{ forceSave, Message }: { forceSave?: boolean; Message: typeof MessageModel }
options?: { forceSave?: boolean }
) {
const id = await channels.saveMessage(_cleanMessageData(data), {
forceSave,
});
Message.updateTimers();
const id = await channels.saveMessage(_cleanMessageData(data), options);
window.Whisper.ExpiringMessagesListener.update();
window.Whisper.TapToViewMessagesListener.update();
return id;
}
async function saveMessages(
arrayOfMessages: Array<MessageType>,
{ forceSave, Message }: { forceSave?: boolean; Message: typeof MessageModel }
options?: { forceSave?: boolean }
) {
await channels.saveMessages(
arrayOfMessages.map(message => _cleanMessageData(message)),
{ forceSave }
options
);
Message.updateTimers();
window.Whisper.ExpiringMessagesListener.update();
window.Whisper.TapToViewMessagesListener.update();
}
async function removeMessage(

24
ts/sql/Interface.ts
View file

@ -293,6 +293,14 @@ export type DataInterface = {
options?: { limit?: number }
) => Promise<Array<ConversationType>>;
saveMessage: (
data: MessageType,
options?: { forceSave?: boolean }
) => Promise<string>;
saveMessages: (
arrayOfMessages: Array<MessageType>,
options?: { forceSave?: boolean }
) => Promise<void>;
getMessageCount: (conversationId?: string) => Promise<number>;
hasUserInitiatedMessages: (conversationId: string) => Promise<boolean>;
getAllMessageIds: () => Promise<Array<string>>;
@ -487,14 +495,6 @@ export type ServerInterface = DataInterface & {
conversationId: string,
options?: { limit?: number }
) => Promise<Array<SearchResultMessageType>>;
saveMessage: (
data: MessageType,
options: { forceSave?: boolean }
) => Promise<string>;
saveMessages: (
arrayOfMessages: Array<MessageType>,
options: { forceSave?: boolean }
) => Promise<void>;
updateConversation: (data: ConversationType) => Promise<void>;
// For testing only
@ -599,14 +599,6 @@ export type ClientInterface = DataInterface & {
ids: Array<string>,
options: { Message: typeof MessageModel }
) => Promise<void>;
saveMessage: (
data: MessageType,
options: { forceSave?: boolean; Message: typeof MessageModel }
) => Promise<string>;
saveMessages: (
arrayOfMessages: Array<MessageType>,
options: { forceSave?: boolean; Message: typeof MessageModel }
) => Promise<void>;
searchMessages: (
query: string,
options?: { limit?: number }

9
ts/sql/Server.ts
View file

@ -3496,11 +3496,11 @@ async function hasUserInitiatedMessages(
function saveMessageSync(
data: MessageType,
options: { forceSave?: boolean; alreadyInTransaction?: boolean } = {}
options?: { forceSave?: boolean; alreadyInTransaction?: boolean }
): string {
const db = getInstance();
const { forceSave, alreadyInTransaction } = options;
const { forceSave, alreadyInTransaction } = options || {};
if (!alreadyInTransaction) {
return db.transaction(() => {
@ -3657,16 +3657,17 @@ function saveMessageSync(
async function saveMessage(
data: MessageType,
options: { forceSave?: boolean; alreadyInTransaction?: boolean }
options?: { forceSave?: boolean; alreadyInTransaction?: boolean }
): Promise<string> {
return saveMessageSync(data, options);
}
async function saveMessages(
arrayOfMessages: Array<MessageType>,
{ forceSave }: { forceSave?: boolean } = {}
options?: { forceSave?: boolean }
): Promise<void> {
const db = getInstance();
const { forceSave } = options || {};
db.transaction(() => {
for (const message of arrayOfMessages) {