Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated to respect channel-value-ish-ness of reply.showSimpleSyntax.

This commit is contained in:
Jeremy Fincher 2004-12-16 14:16:56 +00:00
parent e7b8d8bcbc
commit 664c468130
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/callbacks.py
View File

@ -368,11 +368,11 @@ def findCallbackForCommand(irc, name):
L.append(callback) L.append(callback)
return L return L
def formatArgumentError(method, name=None, channel=None): def formatArgumentError(method, name=None):
if name is None: if name is None:
name = method.__name__ name = method.__name__
if hasattr(method, '__doc__') and method.__doc__: if hasattr(method, '__doc__') and method.__doc__:
if conf.get(conf.supybot.reply.showSimpleSyntax, channel): if conf.get(conf.supybot.reply.showSimpleSyntax, dynamic.channel):
return getSyntax(method, name=name) return getSyntax(method, name=name)
else: else:
return getHelp(method, name=name) return getHelp(method, name=name)
@ -1080,6 +1080,11 @@ class Privmsg(irclib.IrcCallback):
setattr(self.__class__, canonicalname, dispatcher) setattr(self.__class__, canonicalname, dispatcher)
def __call__(self, irc, msg): def __call__(self, irc, msg):
# This is for later dynamic scoping.
if msg.args and irc.isChannel(msg.args[0]):
channel = msg.args[0]
else:
channel = None
if msg.command == 'PRIVMSG': if msg.command == 'PRIVMSG':
if self.noIgnore or not ircdb.checkIgnored(msg.prefix,msg.args[0]): if self.noIgnore or not ircdb.checkIgnored(msg.prefix,msg.args[0]):
self.__parent.__call__(irc, msg) self.__parent.__call__(irc, msg)

1
src/conf.py
View File

@ -389,7 +389,6 @@ registerGlobalValue(supybot, 'alwaysJoinOnInvite',
a channel if the user inviting it has the 'admin' capability (or if it's a channel if the user inviting it has the 'admin' capability (or if it's
explicitly told to join the channel using the Admin.join command)""")) explicitly told to join the channel using the Admin.join command)"""))
# XXX: ChannelValue-ishness is not respected for this yet.
registerChannelValue(supybot.reply, 'showSimpleSyntax', registerChannelValue(supybot.reply, 'showSimpleSyntax',
registry.Boolean(False, """Supybot normally replies with the full help registry.Boolean(False, """Supybot normally replies with the full help
whenever a user misuses a command. If this value is set to True, the bot whenever a user misuses a command. If this value is set to True, the bot