Mercurial Repositories > eric / file comparison
comparison: eric6/Network/IRC/IrcWidget.py
eric6/Network/IRC/IrcWidget.py
- changeset 8222
- 5994b80b8760
- parent 8218
- 7c09585bd960
- child 8268
- 6b8128e0c9d1
equal
deleted
inserted
replaced
| 8221:0572a215bd2f | 8222:5994b80b8760 |
|---|---|
| 601 break | 601 break |
| 602 else: | 602 else: |
| 603 # step 2: try to process the message ourselves | 603 # step 2: try to process the message ourselves |
| 604 for patternRe, patternFunc in self.__patterns: | 604 for patternRe, patternFunc in self.__patterns: |
| 605 match = patternRe.match(line) | 605 match = patternRe.match(line) |
| 606 if match is not None: | 606 if match is not None and patternFunc(match): |
| 607 if patternFunc(match): | 607 break |
| 608 break | |
| 609 else: | 608 else: |
| 610 # Oops, the message wasn't handled | 609 # Oops, the message wasn't handled |
| 611 self.networkWidget.addErrorMessage( | 610 self.networkWidget.addErrorMessage( |
| 612 self.tr("Message Error"), | 611 self.tr("Message Error"), |
| 613 self.tr( | 612 self.tr( |
| 680 self.__registering = False | 679 self.__registering = False |
| 681 if ":" in match.group(3): | 680 if ":" in match.group(3): |
| 682 # :foo MODE foo :+i | 681 # :foo MODE foo :+i |
| 683 name, modes = match.group(3).split(" :") | 682 name, modes = match.group(3).split(" :") |
| 684 sourceNick = match.group(1) | 683 sourceNick = match.group(1) |
| 685 if not self.isChannelName(name): | 684 if ( |
| 686 if name == self.__nickName: | 685 not self.isChannelName(name) and |
| 687 if sourceNick == self.__nickName: | 686 name == self.__nickName |
| 688 msg = self.tr( | 687 ): |
| 689 "You have set your personal modes to" | 688 if sourceNick == self.__nickName: |
| 690 " <b>[{0}]</b>.").format(modes) | 689 msg = self.tr( |
| 691 else: | 690 "You have set your personal modes to" |
| 692 msg = self.tr( | 691 " <b>[{0}]</b>.").format(modes) |
| 693 "{0} has changed your personal modes to" | 692 else: |
| 694 " <b>[{1}]</b>.").format(sourceNick, modes) | 693 msg = self.tr( |
| 695 self.networkWidget.addServerMessage( | 694 "{0} has changed your personal modes to" |
| 696 self.tr("Mode"), msg, filterMsg=False) | 695 " <b>[{1}]</b>.").format(sourceNick, modes) |
| 697 return True | 696 self.networkWidget.addServerMessage( |
| 697 self.tr("Mode"), msg, filterMsg=False) | |
| 698 return True | |
| 698 elif name == "PART": | 699 elif name == "PART": |
| 699 nick = match.group(1).split("!", 1)[0] | 700 nick = match.group(1).split("!", 1)[0] |
| 700 if nick == self.__nickName: | 701 if nick == self.__nickName: |
| 701 channel = match.group(3).split(None, 1)[0] | 702 channel = match.group(3).split(None, 1)[0] |
| 702 self.networkWidget.addMessage( | 703 self.networkWidget.addMessage( |
