diff options
| author | 2018-09-11 10:15:16 +0100 | |
|---|---|---|
| committer | 2018-09-11 10:15:16 +0100 | |
| commit | 80ec110640d9e8477e0cba05b90b6982cb1a15ca (patch) | |
| tree | 3a585511d07ecd9d5bfa6c1a02af5c756b141b79 /IRCServer.py | |
| parent | Fix copypaste fail in Utils that meant we had no RFC1459_LOWER (diff) | |
| signature | ||
Utils.irc_lower and Utils.irc_equals take an IRCServer parameter
Diffstat (limited to 'IRCServer.py')
| -rw-r--r-- | IRCServer.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/IRCServer.py b/IRCServer.py index 7b46c5a4..1c622e94 100644 --- a/IRCServer.py +++ b/IRCServer.py @@ -131,9 +131,9 @@ class Server(object): def set_own_nickname(self, nickname): self.nickname = nickname - self.nickname_lower = Utils.irc_lower(nickname) + self.nickname_lower = Utils.irc_lower(self, nickname) def is_own_nickname(self, nickname): - return Utils.irc_equals(nickname, self.nickname) + return Utils.irc_equals(self, nickname, self.nickname) def add_own_mode(self, mode, arg=None): self.own_modes[mode] = arg @@ -146,7 +146,7 @@ class Server(object): self.add_own_mode(mode, arg) def has_user(self, nickname): - return Utils.irc_lower(nickname) in self.users + return Utils.irc_lower(self, nickname) in self.users def get_user(self, nickname): if not self.has_user(nickname): user_id = self.get_user_id(nickname) @@ -155,7 +155,7 @@ class Server(object): user=new_user, server=self) self.users[new_user.nickname_lower] = new_user self.new_users.add(new_user) - return self.users[Utils.irc_lower(nickname)] + return self.users[Utils.irc_lower(self, nickname)] def get_user_id(self, nickname): self.bot.database.users.add(self.id, nickname) return self.bot.database.users.get_id(self.id, nickname) @@ -165,12 +165,12 @@ class Server(object): channel.remove_user(user) def change_user_nickname(self, old_nickname, new_nickname): - user = self.users.pop(Utils.irc_lower(old_nickname)) + user = self.users.pop(Utils.irc_lower(self, old_nickname)) user._id = self.get_user_id(new_nickname) - self.users[Utils.irc_lower(new_nickname)] = user + self.users[Utils.irc_lower(self, new_nickname)] = user def has_channel(self, channel_name): return channel_name[0] in self.channel_types and Utils.irc_lower( - channel_name) in self.channels + self, channel_name) in self.channels def get_channel(self, channel_name): if not self.has_channel(channel_name): channel_id = self.get_channel_id(channel_name) @@ -179,7 +179,7 @@ class Server(object): self.events.on("new").on("channel").call( channel=new_channel, server=self) self.channels[new_channel.name] = new_channel - return self.channels[Utils.irc_lower(channel_name)] + return self.channels[Utils.irc_lower(self, channel_name)] def get_channel_id(self, channel_name): self.bot.database.channels.add(self.id, channel_name) return self.bot.database.channels.get_id(self.id, channel_name) |
