GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 13:09:23 +01:00
Code Issues Projects Releases Wiki Activity

relay_clientbot: refactor 'rpm' to handle duplicate nicks & nicks containing spaces

Browse Source 
Closes #650.
This commit is contained in:
James Lu 2019-07-14 13:20:26 -07:00
parent 6ac2daebfa
commit 19d794a6f5
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/relay_clientbot.py
View File

@ -1,6 +1,7 @@
# relay_clientbot.py: Clientbot extensions for Relay # relay_clientbot.py: Clientbot extensions for Relay
import string import string
import time import time
import shlex
from pylinkirc import utils, conf, world from pylinkirc import utils, conf, world
from pylinkirc.log import log from pylinkirc.log import log
@ -225,11 +226,12 @@ utils.add_hook(cb_relay_core, 'RELAY_RAW_MODE')
@utils.add_cmd @utils.add_cmd
def rpm(irc, source, args): def rpm(irc, source, args):
"""<target> <text> """<target nick/UID> <text>
Sends PMs to users over the relay, if Clientbot PMs are enabled. Sends PMs to users over Relay, if Clientbot PMs are enabled.
If the target nick has spaces in it, you may quote the nick as "nick".
""" """
args = shlex.split(' '.join(args)) # HACK: use shlex.split so that quotes are preserved
try: try:
target = args[0] target = args[0]
text = ' '.join(args[1:]) text = ' '.join(args[1:])
@ -252,15 +254,21 @@ def rpm(irc, source, args):
'administratively disabled.') 'administratively disabled.')
return return
uid = irc.nick_to_uid(target) if target in irc.users:
if not uid: uids = [target]
else:
uids = irc.nick_to_uid(target, multi=True, filterfunc=lambda u: relay.is_relay_client(irc, u))
if not uids:
irc.error('Unknown user %s.' % target) irc.error('Unknown user %s.' % target)
return return
elif not relay.is_relay_client(irc, uid): elif len(uids) > 1:
irc.error('%s is not a relay user.' % target) targets = ['\x02%s\x02: %s @ %s' % (uid, irc.get_hostmask(uid), irc.users[uid].remote[0]) for uid in uids]
irc.error('Please select the target you want to PM: %s' % (', '.join(targets)))
return return
else: else:
assert not irc.is_internal_client(source), "rpm is not allowed from PyLink bots" assert not irc.is_internal_client(source), "rpm is not allowed from PyLink bots"
# Send the message through relay by faking a hook for its handler. # Send the message through relay by faking a hook for its handler.
relay.handle_messages(irc, source, 'RELAY_CLIENTBOT_PRIVMSG', {'target': uid, 'text': text}) relay.handle_messages(irc, source, 'RELAY_CLIENTBOT_PRIVMSG', {'target': uids[0], 'text': text})
irc.reply('Message sent.') irc.reply('Message sent.')