Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 20:59:27 +01:00
Code Issues Projects Releases Wiki Activity

Make replies() behave consistently with reply() regarding the 'to' parameter.

Browse Source 
Side-effect: Fixes channel-specificity of supybot.reply.onetoone for the Reply.replies command.
Closes GH-1266.
This commit is contained in:
Valentin Lorentz 2016-10-01 13:37:03 +02:00
parent fe52ba8fe8
commit c6e29031d1
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/Reply/test.py
View File

@ -48,6 +48,13 @@ class ReplyTestCase(ChannelPluginTestCase):
self.assertEqual(m.command, 'NOTICE') self.assertEqual(m.command, 'NOTICE')
self.assertEqual(m.args[0], self.nick) self.assertEqual(m.args[0], self.nick)
def testReplies(self):
self.assertResponse('replies a b c', 'a, b, and c')
self.assertNotError('config channel supybot.reply.oneToOne False')
self.assertResponse('replies a b c', 'a')
self.assertResponse(' ', 'b')
self.assertResponse(' ', 'c')
class ReplyNonChannelTestCase(PluginTestCase): class ReplyNonChannelTestCase(PluginTestCase):
plugins = ('Reply',) plugins = ('Reply',)
def testAction(self): def testAction(self):

31
src/callbacks.py
View File

@ -453,8 +453,20 @@ class RichReplyMethods(object):
s = self.__makeReply(v, s) s = self.__makeReply(v, s)
return self.reply(s, **kwargs) return self.reply(s, **kwargs)
def _getTarget(self, to=None):
"""Compute the target according to self.to, the provided to,
and self.private, and return it. Mainly used by reply methods."""
# FIXME: Don't set self.to.
# I still set it to be sure I don't introduce a regression,
# but it does not make sense for .reply() and .replies() to
# change the state of this Irc object.
if to is not None:
self.to = self.to or to
target = self.private and self.to or self.msg.args[0]
return target
def replies(self, L, prefixer=None, joiner=None, def replies(self, L, prefixer=None, joiner=None,
onlyPrefixFirst=False, to=None, onlyPrefixFirst=False,
oneToOne=None, **kwargs): oneToOne=None, **kwargs):
if prefixer is None: if prefixer is None:
prefixer = '' prefixer = ''
@ -464,13 +476,14 @@ class RichReplyMethods(object):
prefixer = prefixer.__add__ prefixer = prefixer.__add__
if isinstance(joiner, minisix.string_types): if isinstance(joiner, minisix.string_types):
joiner = joiner.join joiner = joiner.join
to = self._getTarget(kwargs.get('to'))
if oneToOne is None: # Can be True, False, or None if oneToOne is None: # Can be True, False, or None
if ircutils.isChannel(to): if ircutils.isChannel(to):
oneToOne = conf.get(conf.supybot.reply.oneToOne, to) oneToOne = conf.get(conf.supybot.reply.oneToOne, to)
else: else:
oneToOne = conf.supybot.reply.oneToOne() oneToOne = conf.supybot.reply.oneToOne()
if oneToOne: if oneToOne:
return self.reply(prefixer(joiner(L)), to=to, **kwargs) return self.reply(prefixer(joiner(L)), **kwargs)
else: else:
msg = None msg = None
first = True first = True
@ -478,11 +491,11 @@ class RichReplyMethods(object):
if onlyPrefixFirst: if onlyPrefixFirst:
if first: if first:
first = False first = False
msg = self.reply(prefixer(s), to=to, **kwargs) msg = self.reply(prefixer(s), **kwargs)
else: else:
msg = self.reply(s, to=to, **kwargs) msg = self.reply(s, **kwargs)
else: else:
msg = self.reply(prefixer(s), to=to, **kwargs) msg = self.reply(prefixer(s), **kwargs)
return msg return msg
def noReply(self): def noReply(self):
@ -868,11 +881,9 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
self.notice = self.notice or notice self.notice = self.notice or notice
if private is not None: if private is not None:
self.private = self.private or private self.private = self.private or private
if to is not None: target = self._getTarget(to)
self.to = self.to or to
# action=True implies noLengthCheck=True and prefixNick=False # action=True implies noLengthCheck=True and prefixNick=False
self.noLengthCheck=noLengthCheck or self.noLengthCheck or self.action self.noLengthCheck=noLengthCheck or self.noLengthCheck or self.action
target = self.private and self.to or self.msg.args[0]
if not isinstance(s, minisix.string_types): # avoid trying to str() unicode if not isinstance(s, minisix.string_types): # avoid trying to str() unicode
s = str(s) # Allow non-string esses. s = str(s) # Allow non-string esses.
if self.finalEvaled: if self.finalEvaled:
@ -1006,7 +1017,9 @@ class NestedCommandsIrcProxy(ReplyIrcProxy):
if not self.finalEvaled and oneToOne is None: if not self.finalEvaled and oneToOne is None:
oneToOne = True oneToOne = True
return super(NestedCommandsIrcProxy, self).replies(L, return super(NestedCommandsIrcProxy, self).replies(L,
prefixer, joiner, onlyPrefixFirst, to, oneToOne, **kwargs) prefixer=prefixer, joiner=joiner,
onlyPrefixFirst=onlyPrefixFirst, to=to,
oneToOne=oneToOne, **kwargs)
def error(self, s='', Raise=False, **kwargs): def error(self, s='', Raise=False, **kwargs):
self.repliedTo = True self.repliedTo = True