Also use sent_at whenever we query database with received_at

signalapp · Jan 20, 2021 · 9f81b41 · 9f81b41
1 parent f32a0b5
commit 9f81b41
Show file tree

Hide file tree

Showing 8 changed files with 181 additions and 134 deletions.
diff --git a/js/modules/backup.js b/js/modules/backup.js
@@ -673,6 +673,7 @@ async function exportConversation(conversation, options = {}) {
 
   // We're looping from the most recent to the oldest
   let lastReceivedAt = Number.MAX_VALUE;
+  let lastSentAt = Number.MAX_VALUE;
 
   while (!complete) {
     // eslint-disable-next-line no-await-in-loop
@@ -681,6 +682,7 @@ async function exportConversation(conversation, options = {}) {
       {
         limit: CHUNK_SIZE,
         receivedAt: lastReceivedAt,
+        sentAt: lastSentAt,
         MessageCollection: Whisper.MessageCollection,
       }
     );
@@ -771,6 +773,7 @@ async function exportConversation(conversation, options = {}) {
     const last = messages.length > 0 ? messages[messages.length - 1] : null;
     if (last) {
       lastReceivedAt = last.received_at;
+      lastSentAt = last.sent_at;
     }
 
     if (messages.length < CHUNK_SIZE) {

diff --git a/test/backup_test.js b/test/backup_test.js
@@ -457,6 +457,7 @@ describe('Backup', () => {
           body: 'Totally!',
           source: OUR_NUMBER,
           received_at: 1524185933350,
+          sent_at: 1524185933350,
           timestamp: 1524185933350,
           errors: [],
           attachments: [

diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
@@ -1314,6 +1314,7 @@ export class ConversationModel extends window.Backbone.Model<
           MessageCollection: window.Whisper.MessageCollection,
           limit: 100,
           receivedAt: first ? first.get('received_at') : undefined,
+          sentAt: first ? first.get('sent_at') : undefined,
           messageId: first ? first.id : undefined,
         }
       );

diff --git a/ts/sql/Client.ts b/ts/sql/Client.ts
@@ -983,11 +983,13 @@ async function getOlderMessagesByConversation(
   {
     limit = 100,
     receivedAt = Number.MAX_VALUE,
+    sentAt = Number.MAX_VALUE,
     messageId,
     MessageCollection,
   }: {
     limit?: number;
     receivedAt?: number;
+    sentAt?: number;
     messageId?: string;
     MessageCollection: typeof MessageModelCollectionType;
   }
@@ -997,6 +999,7 @@ async function getOlderMessagesByConversation(
     {
       limit,
       receivedAt,
+      sentAt,
       messageId,
     }
   );
@@ -1008,10 +1011,12 @@ async function getNewerMessagesByConversation(
   {
     limit = 100,
     receivedAt = 0,
+    sentAt = 0,
     MessageCollection,
   }: {
     limit?: number;
     receivedAt?: number;
+    sentAt?: number;
     MessageCollection: typeof MessageModelCollectionType;
   }
 ) {
@@ -1020,6 +1025,7 @@ async function getNewerMessagesByConversation(
     {
       limit,
       receivedAt,
+      sentAt,
     }
   );
 

diff --git a/ts/sql/Interface.ts b/ts/sql/Interface.ts
@@ -217,12 +217,13 @@ export type ServerInterface = DataInterface & {
     options?: {
       limit?: number;
       receivedAt?: number;
+      sentAt?: number;
       messageId?: string;
     }
   ) => Promise<Array<MessageTypeUnhydrated>>;
   getNewerMessagesByConversation: (
     conversationId: string,
-    options?: { limit?: number; receivedAt?: number }
+    options?: { limit?: number; receivedAt?: number; sentAt?: number }
   ) => Promise<Array<MessageTypeUnhydrated>>;
   getLastConversationActivity: (
     conversationId: string
@@ -309,6 +310,7 @@ export type ClientInterface = DataInterface & {
       limit?: number;
       messageId?: string;
       receivedAt?: number;
+      sentAt?: number;
       MessageCollection: typeof MessageModelCollectionType;
     }
   ) => Promise<MessageModelCollectionType>;
@@ -317,6 +319,7 @@ export type ClientInterface = DataInterface & {
     options: {
       limit?: number;
       receivedAt?: number;
+      sentAt?: number;
       MessageCollection: typeof MessageModelCollectionType;
     }
   ) => Promise<MessageModelCollectionType>;