From: Shane Synan <digitalcircuit36939@gmail.com>
Date: Mon, 29 Feb 2016 00:03:37 +0000 (-0600)
Subject: Don't update IrcUser modes with channel modes
X-Git-Tag: travis-deploy-test~496^2~2
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=294e7ee7e918cf4d85ddf4eca1f5bcedabf561eb

Don't update IrcUser modes with channel modes

Remove IrcUser mode updates in IrcChannel.  IrcUsers are shared
between channels, while channel user modes are not.

Showing user modes in the Quassel tooltips need fixed client-side to
check the current channel.
---

diff --git a/src/common/ircchannel.cpp b/src/common/ircchannel.cpp
index 6673a799..de7b8309 100644
--- a/src/common/ircchannel.cpp
+++ b/src/common/ircchannel.cpp
@@ -198,9 +198,6 @@ void IrcChannel::joinIrcUsers(const QList<IrcUser *> &users, const QStringList &
         // If you wonder why there is no counterpart to ircUserJoined:
         // the joins are propagated by the ircuser. The signal ircUserJoined is only for convenience
 
-        // Also update the IRC user's record of modes; this allows easier tracking
-        ircuser->addUserModes(modes[i]);
-
         newNicks << ircuser->nick();
         newModes << modes[i];
         newUsers << ircuser;
@@ -291,8 +288,6 @@ void IrcChannel::addUserMode(IrcUser *ircuser, const QString &mode)
 
     if (!_userModes[ircuser].contains(mode)) {
         _userModes[ircuser] += mode;
-        // Also update the IRC user's record of modes; this allows easier tracking
-        ircuser->addUserModes(mode);
         QString nick = ircuser->nick();
         SYNC_OTHER(addUserMode, ARG(nick), ARG(mode))
         emit ircUserModeAdded(ircuser, mode);
@@ -314,8 +309,6 @@ void IrcChannel::removeUserMode(IrcUser *ircuser, const QString &mode)
 
     if (_userModes[ircuser].contains(mode)) {
         _userModes[ircuser].remove(mode);
-        // Also update the IRC user's record of modes; this allows easier tracking
-        ircuser->removeUserModes(mode);
         QString nick = ircuser->nick();
         SYNC_OTHER(removeUserMode, ARG(nick), ARG(mode));
         emit ircUserModeRemoved(ircuser, mode);