Mercurial Repositories > eric / file diff

--- a/eric6/Network/IRC/IrcWidget.py	Sun Apr 11 16:53:48 2021 +0200
+++ b/eric6/Network/IRC/IrcWidget.py	Sun Apr 11 18:45:10 2021 +0200
@@ -603,9 +603,8 @@
                             # step 2: try to process the message ourselves
                             for patternRe, patternFunc in self.__patterns:
                                 match = patternRe.match(line)
-                                if match is not None:
-                                    if patternFunc(match):
-                                        break
+                                if match is not None and patternFunc(match):
+                                    break
                             else:
                                 # Oops, the message wasn't handled
                                 self.networkWidget.addErrorMessage(
@@ -682,19 +681,21 @@
                 # :foo MODE foo :+i
                 name, modes = match.group(3).split(" :")
                 sourceNick = match.group(1)
-                if not self.isChannelName(name):
-                    if name == self.__nickName:
-                        if sourceNick == self.__nickName:
-                            msg = self.tr(
-                                "You have set your personal modes to"
-                                " <b>[{0}]</b>.").format(modes)
-                        else:
-                            msg = self.tr(
-                                "{0} has changed your personal modes to"
-                                " <b>[{1}]</b>.").format(sourceNick, modes)
-                        self.networkWidget.addServerMessage(
-                            self.tr("Mode"), msg, filterMsg=False)
-                        return True
+                if (
+                    not self.isChannelName(name) and
+                    name == self.__nickName
+                ):
+                    if sourceNick == self.__nickName:
+                        msg = self.tr(
+                            "You have set your personal modes to"
+                            " <b>[{0}]</b>.").format(modes)
+                    else:
+                        msg = self.tr(
+                            "{0} has changed your personal modes to"
+                            " <b>[{1}]</b>.").format(sourceNick, modes)
+                    self.networkWidget.addServerMessage(
+                        self.tr("Mode"), msg, filterMsg=False)
+                    return True
         elif name == "PART":
             nick = match.group(1).split("!", 1)[0]
             if nick == self.__nickName: