From 71d2ab25c04e542b10b74e0254a3d2f1b3066d46 Mon Sep 17 00:00:00 2001
From: Pascal Precht <pascal.precht@gmail.com>
Date: Mon, 22 Nov 2021 18:15:58 +0100
Subject: [PATCH] fix: make contact related APIs working again

This adjust the changes needed to have Status Desktop
talk to new contact related APIs that were introduced in status-lib
and status-go as of https://github.com/status-im/status-lib/pull/110

Closes #4147
---
 src/app_service/service/contacts/service.nim | 36 +++-----------------
 vendor/status-lib                            |  2 +-
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/app_service/service/contacts/service.nim b/src/app_service/service/contacts/service.nim
index e394fc54c7..dfac872dcd 100644
--- a/src/app_service/service/contacts/service.nim
+++ b/src/app_service/service/contacts/service.nim
@@ -123,49 +123,23 @@ QtObject:
       # self.events.emit("contactUpdate", ContactUpdateArgs(contacts: @[profile]))
 
   proc rejectContactRequest*(self: Service, publicKey: string) =
-    let contact = self.getContact(publicKey)
-    contact.hasAddedUs = false
-
-    self.saveContact(contact)
+    status_contacts.rejectContactRequest(publicKey)
     self.events.emit("contactRemoved", Args())
-    # status_contacts.rejectContactRequest(publicKey)
 
   proc changeContactNickname*(self: Service, accountKeyUID: string, publicKey: string, nicknameToSet: string) =
-    # status_contacts.setNickName(publicKey, nicknameToSet, accountKeyUID)
-    var contact = self.getOrCreateContact(publicKey)
-    # let nickname =
-    #   if (nicknameToSet == ""):
-    #     contact.localNickname
-    #   elif (nicknameToSet == DELETE_CONTACT):
-    #     ""
-    #   else:
-    #     nicknameToSet
-
-    # contact.localNickname = nickname
-    self.saveContact(contact)
+    status_contacts.setContactLocalNickname(publicKey, nicknameToSet)
     self.events.emit("contactAdded", Args())
-    # sendContactUpdate(contact.id, accountKeyUID)
 
   proc unblockContact*(self: Service, publicKey: string) =
-    # status_contacts.unblockContact(publicKey)
-    var contact = self.getContact(publicKey)
-    contact.blocked = false
-    self.saveContact(contact)
+    status_contacts.unblockContact(publicKey)
     self.events.emit("contactUnblocked", old_status_contacts.ContactIdArgs(id: publicKey))
 
   proc blockContact*(self: Service, publicKey: string) =
-    var contact = self.getContact(publicKey)
-    contact.blocked = true
-    self.saveContact(contact)
+    status_contacts.blockContact(publicKey)
     self.events.emit("contactBlocked", old_status_contacts.ContactIdArgs(id: publicKey))
 
   proc removeContact*(self: Service, publicKey: string) =
-    #   status_contacts.removeContact(publicKey)
-    var contact = self.getContact(publicKey)
-    contact.added = false
-    contact.hasAddedUs = false
-
-    self.saveContact(contact)
+    status_contacts.removeContact(publicKey)
     self.events.emit("contactRemoved", Args())
   #   let channelId = status_utils.getTimelineChatId(publicKey)
   #   if status_chat.hasChannel(channelId):
diff --git a/vendor/status-lib b/vendor/status-lib
index 6c7deb85a0..4ff2b6857c 160000
--- a/vendor/status-lib
+++ b/vendor/status-lib
@@ -1 +1 @@
-Subproject commit 6c7deb85a0f0e600a3875adac751bfc4625e7346
+Subproject commit 4ff2b6857c6af35da2337d729dc2ddf54c2e2c9c