From 7298446b3e86140c4bbbfe7aeeb959c16c53363c Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 11 Jun 2020 11:09:49 +0200
Subject: [PATCH] [Followup PR-495] Fixes backwards compatibility issues

- Moves functionality to an internal function
- Restores original sync slots
---
 src/common/ircchannel.cpp |  2 +-
 src/common/ircuser.cpp    | 32 +++++++++++++++++++++-----------
 src/common/ircuser.h      |  7 +++++--
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp
index a7384d8b..b03f16ae 100644
--- a/src/common/ircchannel.cpp
+++ b/src/common/ircchannel.cpp
@@ -231,7 +231,7 @@ void IrcChannel::part(IrcUser* ircuser)
             _userModes.clear();
             foreach (IrcUser* user, users) {
                 disconnect(user, nullptr, this, nullptr);
-                user->partChannel(this, true);
+                user->partChannelInternal(this, true);
             }
             emit parted();
             network()->removeIrcChannel(this);
diff --git a/src/common/ircuser.cpp b/src/common/ircuser.cpp
index fbfdf960..ec1ecb1c 100644
--- a/src/common/ircuser.cpp
+++ b/src/common/ircuser.cpp
@@ -291,17 +291,9 @@ void IrcUser::joinChannel(const QString& channelname)
     joinChannel(network()->newIrcChannel(channelname));
 }
 
-void IrcUser::partChannel(IrcChannel* channel, bool skip_sync)
+void IrcUser::partChannel(IrcChannel* channel)
 {
-    if (_channels.contains(channel)) {
-        _channels.remove(channel);
-        disconnect(channel, nullptr, this, nullptr);
-        channel->part(this);
-        QString channelName = channel->name();
-        if (!skip_sync) SYNC_OTHER(partChannel, ARG(channelName))
-        if (_channels.isEmpty() && !network()->isMe(this))
-            quit(skip_sync);
-    }
+    partChannelInternal(channel, false);
 }
 
 void IrcUser::partChannel(const QString& channelname)
@@ -315,7 +307,25 @@ void IrcUser::partChannel(const QString& channelname)
     }
 }
 
-void IrcUser::quit(bool skip_sync)
+void IrcUser::partChannelInternal(IrcChannel* channel, bool skip_sync)
+{
+    if (_channels.contains(channel)) {
+        _channels.remove(channel);
+        disconnect(channel, nullptr, this, nullptr);
+        channel->part(this);
+        QString channelName = channel->name();
+        if (!skip_sync) SYNC_OTHER(partChannel, ARG(channelName))
+        if (_channels.isEmpty() && !network()->isMe(this))
+            quitInternal(skip_sync);
+    }
+}
+
+void IrcUser::quit()
+{
+    quitInternal(false);
+}
+
+void IrcUser::quitInternal(bool skip_sync)
 {
     QList<IrcChannel*> channels = _channels.values();
     _channels.clear();
diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index e71817e3..c7a02d5a 100644
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -131,6 +131,9 @@ public:
         _awayChanged = false;
     }
 
+    void partChannelInternal(IrcChannel* channel, bool skip_sync = false);
+    void quitInternal(bool skip_sync = false);
+
 public slots:
     void setUser(const QString& user);
     void setHost(const QString& host);
@@ -166,9 +169,9 @@ public slots:
      */
     void joinChannel(IrcChannel* channel, bool skip_channel_join = false);
     void joinChannel(const QString& channelname);
-    void partChannel(IrcChannel* channel, bool skip_sync = false);
+    void partChannel(IrcChannel* channel);
     void partChannel(const QString& channelname);
-    void quit(bool skip_sync = false);
+    void quit();
 
     void addUserModes(const QString& modes);
     void removeUserModes(const QString& modes);
-- 
2.20.1