cleanup unused fetch method of messages.js

js/models/conversations.js

@@ -2215,37 +2215,6 @@
       }
     },
 
-    async fetchMessages() {
-      if (!this.id) {
-        throw new Error('This conversation has no id!');
-      }
-      if (this.inProgressFetch) {
-        window.log.warn('Attempting to start a parallel fetchMessages() call');
-        return;
-      }
-
-      this.inProgressFetch = this.messageCollection.fetchConversation(
-        this.id,
-        undefined,
-        this.get('unreadCount')
-      );
-
-      await this.inProgressFetch;
-
-      try {
-        // We are now doing the work to upgrade messages before considering the load from
-        //   the database complete. Note that we do save messages back, so it is a
-        //   one-time hit. We do this so we have guarantees about message structure.
-        await this.upgradeMessages(this.messageCollection);
-      } catch (error) {
-        window.log.error(
-          'fetchMessages: failed to upgrade messages',
-          Errors.toLogFormat(error)
-        );
-      }
-
-      this.inProgressFetch = null;
-    },
 
     hasMember(number) {
       return _.contains(this.get('members'), number);

js/models/messages.js

@@ -1733,52 +1733,5 @@
         return total + (unread ? 1 : 0);
       }, 0);
     },
-
-    async fetchConversation(conversationId, limit = 100, unreadCount = 0) {
-      const startingLoadedUnread =
-        unreadCount > 0 ? this.getLoadedUnreadCount() : 0;
-
-      // We look for older messages if we've fetched once already
-      const receivedAt =
-        this.length === 0 ? Number.MAX_VALUE : this.at(0).get('received_at');
-
-      const messages = await window.Signal.Data.getMessagesByConversation(
-        conversationId,
-        {
-          limit,
-          receivedAt,
-          MessageCollection: Whisper.MessageCollection,
-        }
-      );
-
-      const models = messages
-        .filter(message => Boolean(message.id))
-        .map(message => MessageController.register(message.id, message));
-      const eliminated = messages.length - models.length;
-      if (eliminated > 0) {
-        window.log.warn(
-          `fetchConversation: Eliminated ${eliminated} messages without an id`
-        );
-      }
-
-      this.add(models.reverse());
-
-      if (unreadCount <= 0) {
-        return;
-      }
-      const loadedUnread = this.getLoadedUnreadCount();
-      if (loadedUnread >= unreadCount) {
-        return;
-      }
-      if (startingLoadedUnread === loadedUnread) {
-        // that fetch didn't get us any more unread. stop fetching more.
-        return;
-      }
-
-      window.log.info(
-        'fetchConversation: doing another fetch to get all unread'
-      );
-      await this.fetchConversation(conversationId, limit, unreadCount);
-    },
   });
 })();

js/views/conversation_view.js

@@ -365,7 +365,6 @@
         this.unload('windows closed');
       });
 
-      this.fetchMessages();
 
       this.$('.send-message').focus(this.focusBottomBar.bind(this));
       this.$('.send-message').blur(this.unfocusBottomBar.bind(this));
@@ -1021,7 +1020,6 @@
       this.view.measureScrollPosition();
       const startingHeight = this.view.scrollHeight;
 
-      await this.fetchMessages();
       // We delay this work to let scrolling/layout settle down first
       setTimeout(() => {
         this.view.measureScrollPosition();
@@ -1033,41 +1031,6 @@
         this.view.$el.scrollTop(newScrollPosition);
       }, 1);
     },
-    fetchMessages() {
-      // window.log.info('fetchMessages');
-      this.$('.bar-container').show();
-      if (this.inProgressFetch) {
-        window.log.warn('Multiple fetchMessage calls!');
-      }
-
-      // Avoiding await, since we want to capture the promise and make it available via
-      //   this.inProgressFetch
-      // eslint-disable-next-line more/no-then
-      this.inProgressFetch = this.model
-        .fetchContacts()
-        .then(() => this.model.fetchMessages())
-        .then(async () => {
-          this.$('.bar-container').hide();
-          await Promise.all(
-            this.model.messageCollection.where({ unread: 1 }).map(async m => {
-              const latest = await window.Signal.Data.getMessageById(m.id, {
-                Message: Whisper.Message,
-              });
-              m.merge(latest);
-            })
-          );
-          this.inProgressFetch = null;
-        })
-        .catch(error => {
-          window.log.error(
-            'fetchMessages error:',
-            error && error.stack ? error.stack : error
-          );
-          this.inProgressFetch = null;
-        });
-
-      return this.inProgressFetch;
-    },
 
     addMessage(message) {
       // This is debounced, so it won't hit the database too often.