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

Fix for bug #1019392.

Browse Source
This commit is contained in:
Jeremy Fincher 2004-08-31 16:35:42 +00:00
parent bb4d3cda49
commit ed71df8655
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/Alias.py
View File

@ -143,7 +143,10 @@ def makeNewAlias(name, alias):
return False return False
everythingReplace(tokens) everythingReplace(tokens)
Owner = irc.getCallback('Owner') Owner = irc.getCallback('Owner')
Owner.disambiguate(irc, tokens) d = Owner.disambiguate(irc, tokens)
if d:
Owner.ambiguousError(irc, msg, d)
else:
self.Proxy(irc.irc, msg, tokens) self.Proxy(irc.irc, msg, tokens)
doc ='<an alias, %s>\n\nAlias for %r' % \ doc ='<an alias, %s>\n\nAlias for %r' % \
(utils.nItems('argument', biggestDollar), alias) (utils.nItems('argument', biggestDollar), alias)

9
src/Owner.py
View File

@ -320,9 +320,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
self.disambiguate(irc, elt, ambiguousCommands) self.disambiguate(irc, elt, ambiguousCommands)
return ambiguousCommands return ambiguousCommands
def processTokens(self, irc, msg, tokens): def ambiguousError(self, irc, msg, ambiguousCommands):
ambiguousCommands = self.disambiguate(irc, tokens)
if ambiguousCommands:
if len(ambiguousCommands) == 1: # Common case. if len(ambiguousCommands) == 1: # Common case.
(command, names) = ambiguousCommands.popitem() (command, names) = ambiguousCommands.popitem()
names.sort() names.sort()
@ -341,6 +339,11 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
s = '%s; please specify from which plugins to ' \ s = '%s; please specify from which plugins to ' \
'call these commands.' % '; '.join(L) 'call these commands.' % '; '.join(L)
irc.queueMsg(callbacks.error(msg, s)) irc.queueMsg(callbacks.error(msg, s))
def processTokens(self, irc, msg, tokens):
ambiguousCommands = self.disambiguate(irc, tokens)
if ambiguousCommands:
self.ambiguousError(irc, msg, ambiguousCommands)
else: else:
callbacks.IrcObjectProxy(irc, msg, tokens) callbacks.IrcObjectProxy(irc, msg, tokens)