From a2cba16f807a607ede2e2203f0e44a29a0bea888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
 <sebastien.blin@savoirfairelinux.com>
Date: Wed, 17 Aug 2022 12:38:35 -0400
Subject: [PATCH] conversationmodel: cleanup duplicate code

Change-Id: Icfb1669e4c810b2ef74c3787f0f086646f17fb8d
---
 src/libclient/conversationmodel.cpp | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/libclient/conversationmodel.cpp b/src/libclient/conversationmodel.cpp
index 9c7430ef5..0bfff1e8b 100644
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@@ -364,7 +364,6 @@ public Q_SLOTS:
     void slotConversationRequestReceived(const QString& accountId,
                                          const QString& conversationId,
                                          const MapStringString& metadatas);
-    void slotConversationRequestDeclined(const QString& accountId, const QString& conversationId);
     void slotConversationMemberEvent(const QString& accountId,
                                      const QString& conversationId,
                                      const QString& memberUri,
@@ -1849,7 +1848,7 @@ ConversationModelPimpl::ConversationModelPimpl(const ConversationModel& linked,
     connect(&callbacksHandler,
             &CallbacksHandler::conversationRequestDeclined,
             this,
-            &ConversationModelPimpl::slotConversationRequestDeclined);
+            &ConversationModelPimpl::slotConversationRemoved);
     connect(&callbacksHandler,
             &CallbacksHandler::conversationReady,
             this,
@@ -1993,7 +1992,7 @@ ConversationModelPimpl::~ConversationModelPimpl()
     disconnect(&callbacksHandler,
                &CallbacksHandler::conversationRequestDeclined,
                this,
-               &ConversationModelPimpl::slotConversationRequestDeclined);
+               &ConversationModelPimpl::slotConversationRemoved);
     disconnect(&callbacksHandler,
                &CallbacksHandler::conversationReady,
                this,
@@ -2531,18 +2530,6 @@ ConversationModelPimpl::slotConversationRequestReceived(const QString& accountId
     addConversationRequest(metadatas);
 }
 
-void
-ConversationModelPimpl::slotConversationRequestDeclined(const QString& accountId,
-                                                        const QString& convId)
-{
-    auto conversationIndex = indexOf(convId);
-    if (accountId != linked.owner.id || conversationIndex < 0)
-        return;
-    eraseConversation(conversationIndex);
-    Q_EMIT linked.conversationRemoved(convId);
-    Q_EMIT linked.modelChanged();
-}
-
 void
 ConversationModelPimpl::slotConversationReady(const QString& accountId,
                                               const QString& conversationId)
@@ -2617,9 +2604,8 @@ ConversationModelPimpl::slotConversationRemoved(const QString& accountId,
                                                 const QString& conversationId)
 {
     auto conversationIndex = indexOf(conversationId);
-    if (accountId != linked.owner.id || conversationIndex < 0) {
+    if (accountId != linked.owner.id || conversationIndex < 0)
         return;
-    }
     try {
         auto removeConversation = [&]() {
             // remove swarm conversation
-- 
GitLab