mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-01-23 18:44:04 +01:00
Grr.
This commit is contained in:
parent
b6fbfef5e6
commit
2b87b4d949
@ -126,8 +126,6 @@ def reply(msg, s, prefixName=True, private=False,
|
|||||||
notice=False, to=None, action=False):
|
notice=False, to=None, action=False):
|
||||||
# This is so we don't prefix a channel name.
|
# This is so we don't prefix a channel name.
|
||||||
|
|
||||||
if prefixName and not ircutils.isChannel(to):
|
|
||||||
s = '%s: %s' % (to, s)
|
|
||||||
# Ok, let's make the target:
|
# Ok, let's make the target:
|
||||||
target = ircutils.replyTo(msg)
|
target = ircutils.replyTo(msg)
|
||||||
if private:
|
if private:
|
||||||
@ -141,6 +139,9 @@ def reply(msg, s, prefixName=True, private=False,
|
|||||||
s = ircutils.safeArgument(s)
|
s = ircutils.safeArgument(s)
|
||||||
if not s:
|
if not s:
|
||||||
s = 'Error: I tried to send you an empty message.'
|
s = 'Error: I tried to send you an empty message.'
|
||||||
|
# Let's may sure we don't do, "#channel: foo.".
|
||||||
|
if prefixName and not ircutils.isChannel(to):
|
||||||
|
s = '%s: %s' % (to, s)
|
||||||
# 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
Block a user