diff --git a/plugins/ChannelDB.py b/plugins/ChannelDB.py index 74fd9726d..17925b79f 100644 --- a/plugins/ChannelDB.py +++ b/plugins/ChannelDB.py @@ -400,7 +400,7 @@ class ChannelDB(plugins.ChannelDBHandler, hostmask = irc.state.nickToHostmask(name) name = ircdb.users.getUserId(hostmask) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() else: table = 'nick_seen' criterion = 'normalized=%s' @@ -439,7 +439,7 @@ class ChannelDB(plugins.ChannelDBHandler, hostmask = irc.state.nickToHostmask(name) id = ircdb.users.getUserId(hostmask) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return else: id = ircdb.users.getUserId(name) @@ -544,7 +544,7 @@ class ChannelDB(plugins.ChannelDBHandler, hostmask = irc.state.nickToHostmask(user) id = ircdb.users.getUserId(hostmask) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return db = self.getDb(channel) cursor = db.cursor() diff --git a/plugins/Herald.py b/plugins/Herald.py index ac9fa1ecb..ea3ef2979 100644 --- a/plugins/Herald.py +++ b/plugins/Herald.py @@ -170,7 +170,7 @@ class Herald(callbacks.Privmsg, configurable.Mixin): try: id = self._getId(userNickHostmask) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return self.db.setHerald(id, channel, herald) irc.replySuccess() @@ -188,7 +188,7 @@ class Herald(callbacks.Privmsg, configurable.Mixin): try: id = self._getId(userNickHostmask) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return self.db.delHerald(id, channel) irc.replySuccess() diff --git a/plugins/Note.py b/plugins/Note.py index 3f0808dff..32baadd8b 100644 --- a/plugins/Note.py +++ b/plugins/Note.py @@ -134,7 +134,7 @@ class Note(callbacks.Privmsg): hostmask = irc.state.nickToHostmask(name) toId = ircdb.users.getUserId(hostmask) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return try: fromId = ircdb.users.getUserId(msg.prefix) diff --git a/plugins/Topic.py b/plugins/Topic.py index 1372dc774..381baff31 100644 --- a/plugins/Topic.py +++ b/plugins/Topic.py @@ -248,7 +248,7 @@ class Topic(callbacks.Privmsg, configurable.Mixin): try: senderName = ircdb.users.getUser(msg.prefix).name except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return if name and name != senderName and \ not ircdb.checkCapabilities(msg.prefix, ('op', 'admin')): diff --git a/src/Admin.py b/src/Admin.py index 361156cdc..407598fe8 100755 --- a/src/Admin.py +++ b/src/Admin.py @@ -244,7 +244,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg): ircdb.users.setUser(id, user) irc.replySuccess() except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() else: s = 'You can\'t add capabilities you don\'t have.' irc.error(s) @@ -262,7 +262,7 @@ class Admin(privmsgs.CapabilityCheckingPrivmsg): id = ircdb.users.getUserId(name) user = ircdb.users.getUser(id) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return try: user.removeCapability(capability) diff --git a/src/Channel.py b/src/Channel.py index e7addb137..990c82639 100755 --- a/src/Channel.py +++ b/src/Channel.py @@ -411,7 +411,7 @@ class Channel(callbacks.Privmsg): ircdb.users.setUser(id, user) irc.replySuccess() except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() addcapability = privmsgs.checkChannelCapability(addcapability,'op') def removecapability(self, irc, msg, args, channel): @@ -431,7 +431,7 @@ class Channel(callbacks.Privmsg): ircdb.users.setUser(id, user) irc.replySuccess() except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() removecapability = privmsgs.checkChannelCapability(removecapability, 'op') def setdefaultcapability(self, irc, msg, args, channel): diff --git a/src/User.py b/src/User.py index ea88d9eef..f38fa464f 100755 --- a/src/User.py +++ b/src/User.py @@ -187,7 +187,7 @@ class User(callbacks.Privmsg): id = ircdb.users.getUserId(name) user = ircdb.users.getUser(id) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return try: otherId = ircdb.users.getUserId(hostmask) @@ -218,7 +218,7 @@ class User(callbacks.Privmsg): id = ircdb.users.getUserId(name) user = ircdb.users.getUser(id) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return if user.checkHostmask(msg.prefix) or user.checkPassword(password): try: @@ -251,7 +251,7 @@ class User(callbacks.Privmsg): id = ircdb.users.getUserId(name) user = ircdb.users.getUser(id) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return if user.checkPassword(oldpassword): user.setPassword(newpassword, hashed=hashed) @@ -271,13 +271,13 @@ class User(callbacks.Privmsg): try: hostmask = irc.state.nickToHostmask(hostmask) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return try: user = ircdb.users.getUser(hostmask) irc.reply(user.name) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() def hostmasks(self, irc, msg, args): """[] @@ -299,7 +299,7 @@ class User(callbacks.Privmsg): user = ircdb.users.getUser(name) irc.reply(repr(user.hostmasks)) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() else: irc.reply(repr(user.hostmasks)) except KeyError: @@ -319,7 +319,7 @@ class User(callbacks.Privmsg): user = ircdb.users.getUser(name) irc.reply('[%s]' % ', '.join(user.capabilities)) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() def identify(self, irc, msg, args): """ @@ -334,7 +334,7 @@ class User(callbacks.Privmsg): id = ircdb.users.getUserId(name) user = ircdb.users.getUser(id) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return if user.checkPassword(password): try: @@ -356,7 +356,7 @@ class User(callbacks.Privmsg): id = ircdb.users.getUserId(msg.prefix) user = ircdb.users.getUser(id) except KeyError: - irc.error(conf.replyNoUser) + irc.errorNoUser() return user.unsetAuth() ircdb.users.setUser(id, user)