diff options
| author |  jesopo | 2018-10-03 16:44:00 +0100 |
|---|---|---|
| committer | jesopo | 2018-10-03 16:44:00 +0100 |
| commit | 98207be7b1498d4ae8cc51f4d2ac33ac65146b87 (patch) | |
| tree | e9a3053205aceadb24937291f267806c826deae4 /src | |
| parent | Use docstring key, not value, as a key. (diff) | |
| signature | ||
'mode_prefixes' -> prefix_modes and prefix_symbols
Diffstat (limited to 'src')
| -rw-r--r-- | src/IRCChannel.py | 9 | ||||
| -rw-r--r-- | src/IRCServer.py | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/IRCChannel.py b/src/IRCChannel.py index ac79b0a4..9770f892 100644 --- a/src/IRCChannel.py +++ b/src/IRCChannel.py @@ -36,8 +36,7 @@ class Channel(IRCObject.Object): def remove_user(self, user): self.users.remove(user) for mode in list(self.modes.keys()): - if mode in self.server.mode_prefixes.values( - ) and user in self.modes[mode]: + if mode in self.server.prefix_modes and user in self.modes[mode]: self.modes[mode].discard(user) if not len(self.modes[mode]): del self.modes[mode] @@ -48,7 +47,7 @@ class Channel(IRCObject.Object): if not mode in self.modes: self.modes[mode] = set([]) if arg: - if mode in self.server.mode_prefixes.values(): + if mode in self.server.prefix_modes: user = self.server.get_user(arg) if user: self.modes[mode].add(user) @@ -58,7 +57,7 @@ class Channel(IRCObject.Object): if not arg: del self.modes[mode] else: - if mode in self.server.mode_prefixes.values(): + if mode in self.server.prefix_modes: user = self.server.get_user(arg) if user: self.modes[mode].discard(user) @@ -123,7 +122,7 @@ class Channel(IRCObject.Object): self.server.send_part(self.name, reason) def mode_or_above(self, user, mode): - mode_orders = list(self.server.mode_prefixes.values()) + mode_orders = list(self.server.prefix_modes) mode_index = mode_orders.index(mode) for mode in mode_orders[:mode_index+1]: if user in self.modes.get(mode, []): diff --git a/src/IRCServer.py b/src/IRCServer.py index cdac78ab..4ca764eb 100644 --- a/src/IRCServer.py +++ b/src/IRCServer.py @@ -40,8 +40,10 @@ class Server(IRCObject.Object): self.channels = {} self.own_modes = {} - self.mode_prefixes = collections.OrderedDict( - {"@": "o", "+": "v"}) + self.prefix_symbols = collections.OrderedDict( + (("@", "o"), ("+", "v"))) + self.prefix_modes = collections.OrderedDict( + (("o", "@"), ("v", "+"))) self.channel_modes = [] self.channel_types = ["#"] self.case_mapping = "rfc1459" @@ -260,8 +262,8 @@ class Server(IRCObject.Object): if len(encoded) > 450: encoded = encoded[:450] self.buffered_lines.append(encoded + b"\r\n") - self.bot.log.debug(">%s | %s", [str(self), encoded.decode("utf8")]) + def _send(self): if not len(self.write_buffer): self.write_buffer = self.buffered_lines.pop(0) |