Merge pull request #1027 from Bilb/fix-accept-friend-request

fix bug with accept/reject buttons on friend request
5 years ago · c782cbb7bc
parent 9afee14749 473c4d817b
commit c782cbb7bc
1 changed files with 10 additions and 3 deletions
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@ -247,9 +247,12 @@
    async acceptFriendRequest() {
      const messages = await window.Signal.Data.getMessagesByConversation(
        this.id,
-        { limit: 1, MessageCollection: Whisper.MessageCollection }
+        {
+          limit: 1,
+          MessageCollection: Whisper.MessageCollection,
+          type: 'friend-request',
+        }
      );
-
      const lastMessageModel = messages.at(0);
      if (lastMessageModel) {
        lastMessageModel.acceptFriendRequest();
@ -264,7 +267,11 @@
    async declineFriendRequest() {
      const messages = await window.Signal.Data.getMessagesByConversation(
        this.id,
-        { limit: 1, MessageCollection: Whisper.MessageCollection }
+        {
+          limit: 1,
+          MessageCollection: Whisper.MessageCollection,
+          type: 'friend-request',
+        }
      );

      const lastMessageModel = messages.at(0);