From 3bb9d888dcc423f9228bae9a789575641ec0a337 Mon Sep 17 00:00:00 2001
From: Beaudan <beau@loki.network>
Date: Fri, 14 Jun 2019 17:30:43 +1000
Subject: [PATCH] Initialise conversation with ourselves as friends and don't
 allow it to be changed to anything else

---
 js/models/conversations.js       | 2 ++
 libtextsecure/account_manager.js | 1 +
 2 files changed, 3 insertions(+)

diff --git a/js/models/conversations.js b/js/models/conversations.js
index 6ff015d25..1afc25e10 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -642,6 +642,8 @@
     async setFriendRequestStatus(newStatus) {
       // Ensure that the new status is a valid FriendStatusEnum value
       if (!(newStatus in Object.values(FriendRequestStatusEnum))) return;
+      const me = textsecure.storage.user.getNumber();
+      if (me === this.id && newStatus !== FriendRequestStatusEnum.friends) return;
       if (this.get('friendRequestStatus') !== newStatus) {
         this.set({ friendRequestStatus: newStatus });
         await window.Signal.Data.updateConversation(this.id, this.attributes, {
diff --git a/libtextsecure/account_manager.js b/libtextsecure/account_manager.js
index e09aaf05d..80143a443 100644
--- a/libtextsecure/account_manager.js
+++ b/libtextsecure/account_manager.js
@@ -537,6 +537,7 @@
       // Update the conversation if we have it
       const newProfile = storage.getLocalProfile();
       await conversation.setProfile(newProfile);
+      await conversation.setFriendRequestStatus(window.friends.friendRequestStatusEnum.friends);
 
       this.dispatchEvent(new Event('registration'));
     },