notnull/banned
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't message fake nicks in mass_privmsg

Browse Source
This commit is contained in:
jacob1 2015-10-30 20:06:00 -04:00
parent 7b8c504c79
commit b2147cd033
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utilities.py
View File

@ -27,7 +27,9 @@ def mass_privmsg(cli, targets, msg, notice=False, privmsg=False):
msg_targs = []
not_targs = []
for target in targets:
if is_user_notice(target):
if is_fake_nick(target):
debuglog("Would message fake nick {0}: {1!r}".format(target, msg))
elif is_user_notice(target):
not_targs.append(target)
else:
msg_targs.append(target)

38
src/wolfgame.py
View File

@ -6638,44 +6638,6 @@ def getfeatures(cli, nick, *rest):
errlog("Unsupported case mapping: {0!r}; falling back to rfc1459.".format(var.CASEMAPPING))
var.CASEMAPPING = "rfc1459"
def mass_privmsg(cli, targets, msg, notice=False, privmsg=False):
if not notice and not privmsg:
msg_targs = []
not_targs = []
for target in targets:
if is_user_notice(target):
not_targs.append(target)
else:
msg_targs.append(target)
while msg_targs:
if len(msg_targs) <= var.MAX_PRIVMSG_TARGETS:
bgs = ",".join(msg_targs)
msg_targs = None
else:
bgs = ",".join(msg_targs[:var.MAX_PRIVMSG_TARGETS])
msg_targs = msg_targs[var.MAX_PRIVMSG_TARGETS:]
cli.msg(bgs, msg)
while not_targs:
if len(not_targs) <= var.MAX_PRIVMSG_TARGETS:
bgs = ",".join(not_targs)
not_targs = None
else:
bgs = ",".join(not_targs[:var.MAX_PRIVMSG_TARGETS])
not_targs = not_targs[var.MAX_PRIVMSG_TARGETS:]
cli.notice(bgs, msg)
else:
while targets:
if len(targets) <= var.MAX_PRIVMSG_TARGETS:
bgs = ",".join(targets)
targets = None
else:
bgs = ",".join(targets[:var.MAX_PRIVMSG_TARGETS])
target = targets[var.MAX_PRIVMSG_TARGETS:]
if notice:
cli.notice(bgs, msg)
else:
cli.msg(bgs, msg)
@cmd("", chan=False, pm=True)
def relay(cli, nick, chan, rest):
"""Wolfchat and Deadchat"""