mirror of https://github.com/Mikaela/Limnoria.git
Handled reply.withNoticeWhenPrivate appropriately.
This commit is contained in:
parent
65c739d706
commit
7ef00a2c6a
|
@ -161,11 +161,6 @@ def reply(msg, s, prefixName=True, private=None,
|
||||||
target = msg.nick
|
target = msg.nick
|
||||||
else:
|
else:
|
||||||
target = to
|
target = to
|
||||||
# XXX: User value for reply.withNoticeWhenPrivate.
|
|
||||||
if conf.supybot.reply.withNoticeWhenPrivate(): # global, no getConfig.
|
|
||||||
if not ircutils.isChannel(target):
|
|
||||||
# to=channel, private=True (see RSS for an example)
|
|
||||||
notice = True
|
|
||||||
if to is None:
|
if to is None:
|
||||||
to = msg.nick
|
to = msg.nick
|
||||||
# Ok, now let's make the payload:
|
# Ok, now let's make the payload:
|
||||||
|
@ -176,6 +171,9 @@ def reply(msg, s, prefixName=True, private=None,
|
||||||
# Let's may sure we don't do, "#channel: foo.".
|
# Let's may sure we don't do, "#channel: foo.".
|
||||||
if not ircutils.isChannel(to):
|
if not ircutils.isChannel(to):
|
||||||
s = '%s: %s' % (to, s)
|
s = '%s: %s' % (to, s)
|
||||||
|
if not ircutils.isChannel(target):
|
||||||
|
if conf.supybot.reply.withNoticeWhenPrivate():
|
||||||
|
notice = True
|
||||||
# And now, let's decide whether it's a PRIVMSG or a NOTICE.
|
# And now, let's decide whether it's a PRIVMSG or a NOTICE.
|
||||||
msgmaker = ircmsgs.privmsg
|
msgmaker = ircmsgs.privmsg
|
||||||
if notice:
|
if notice:
|
||||||
|
|
Loading…
Reference in New Issue