Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-26 02:20:41 +01:00
Code Issues Projects Releases Wiki Activity

Added proper prefixName handling to callbacks.reply.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-09-09 15:33:18 +00:00
parent 41d18f415e
commit 767f5bb0a3
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/callbacks.py
View File

@ -140,26 +140,23 @@ def canonicalName(command):
command = command[:-1] command = command[:-1]
return command.translate(string.ascii, special).lower() + reAppend return command.translate(string.ascii, special).lower() + reAppend
def reply(msg, s, prefixName=True, private=None, def reply(msg, s, prefixName=None, private=None,
notice=None, to=None, action=None, error=False): notice=None, to=None, action=None, error=False):
# Ok, let's make the target: # Ok, let's make the target:
target = ircutils.replyTo(msg) target = ircutils.replyTo(msg)
def getConfig(wrapper):
if ircutils.isChannel(target):
return wrapper.get(target)()
else:
return wrapper()
if ircutils.isChannel(target): if ircutils.isChannel(target):
channel = target channel = target
else: else:
channel = None channel = None
if notice is None: if notice is None:
notice = getConfig(conf.supybot.reply.withNotice) notice = conf.get(conf.supybot.reply.withNotice, channel)
if private is None: if private is None:
private = getConfig(conf.supybot.reply.inPrivate) private = conf.get(conf.supybot.reply.inPrivate, channel)
if prefixName is None:
prefixName = conf.get(conf.supybot.reply.withNickPrefix, channel)
if error: if error:
notice = getConfig(conf.supybot.reply.errorWithNotice) or notice notice =conf.get(conf.supybot.reply.errorWithNotice, channel) or notice
private = getConfig(conf.supybot.reply.errorInPrivate) or private private=conf.get(conf.supybot.reply.errorInPrivate, channel) or private
s = 'Error: ' + s s = 'Error: ' + s
if private: if private:
prefixName = False prefixName = False
@ -188,7 +185,9 @@ def reply(msg, s, prefixName=True, private=None,
if action: if action:
msgmaker = ircmsgs.action msgmaker = ircmsgs.action
# Finally, we'll return the actual message. # Finally, we'll return the actual message.
return msgmaker(target, s) ret = msgmaker(target, s)
ret.inReplyTo = msg
return ret
def error(msg, s, **kwargs): def error(msg, s, **kwargs):
"""Makes an error reply to msg with the appropriate error payload.""" """Makes an error reply to msg with the appropriate error payload."""
@ -405,7 +404,7 @@ class RichReplyMethods(object):
return plugins.standardSubstitute(self, self.msg, s) return plugins.standardSubstitute(self, self.msg, s)
def _getConfig(self, wrapper): def _getConfig(self, wrapper):
return wrapper.get(self.msg.args[0])() return conf.get(wrapper, self.msg.args[0])
def replySuccess(self, s='', **kwargs): def replySuccess(self, s='', **kwargs):
v = self._getConfig(conf.supybot.replies.success) v = self._getConfig(conf.supybot.replies.success)