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

nefarious: implement KILL, fix bugs in outgoing kick & incoming join

Browse Source
This commit is contained in:
James Lu 2016-04-16 16:46:30 -07:00
parent e18c7025db
commit a13211e0db
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
protocols/nefarious.py
View File

@ -263,9 +263,6 @@ class P10Protocol(Protocol):
if not reason: if not reason:
reason = 'No reason given' reason = 'No reason given'
# Mangle kick targets for IRCds that require it.
target = self._getOutgoingNick(target)
self._send(numeric, 'K %s %s :%s' % (channel, target, reason)) self._send(numeric, 'K %s %s :%s' % (channel, target, reason))
# We can pretend the target left by its own will; all we really care about # We can pretend the target left by its own will; all we really care about
@ -273,6 +270,17 @@ class P10Protocol(Protocol):
# handle_part() does that just fine. # handle_part() does that just fine.
self.handle_part(target, 'KICK', [channel]) self.handle_part(target, 'KICK', [channel])
def kill(self, numeric, target, reason):
"""Sends a kill from a PyLink client/server."""
# <- ABAAA D AyAAA :nefarious.midnight.vpn!GL (test)
if (not self.irc.isInternalClient(numeric)) and \
(not self.irc.isInternalServer(numeric)):
raise LookupError('No such PyLink client/server exists.')
self._send(numeric, 'D %s :Killed (%s)' % (target, reason))
self.removeClient(target)
def message(self, numeric, target, text): def message(self, numeric, target, text):
"""Sends a PRIVMSG from a PyLink client.""" """Sends a PRIVMSG from a PyLink client."""
if not self.irc.isInternalClient(numeric): if not self.irc.isInternalClient(numeric):
@ -651,7 +659,13 @@ class P10Protocol(Protocol):
"""Handles incoming JOINs and channel creations.""" """Handles incoming JOINs and channel creations."""
# <- ABAAA C #test3 1460744371 # <- ABAAA C #test3 1460744371
# <- ABAAB J #test3 1460744371 # <- ABAAB J #test3 1460744371
ts = int(args[1]) # <- ABAAB J #test3
try:
# TS is optional
ts = int(args[1])
except IndexError:
ts = None
if args[0] == '0' and command == 'JOIN': if args[0] == '0' and command == 'JOIN':
# /join 0; part the user from all channels # /join 0; part the user from all channels
oldchans = self.irc.users[numeric].channels.copy() oldchans = self.irc.users[numeric].channels.copy()
@ -663,10 +677,11 @@ class P10Protocol(Protocol):
return {'channels': oldchans, 'text': 'Left all channels.', 'parse_as': 'PART'} return {'channels': oldchans, 'text': 'Left all channels.', 'parse_as': 'PART'}
else: else:
channel = utils.toLower(self.irc, args[0]) channel = utils.toLower(self.irc, args[0])
self.updateTS(channel, ts) if ts: # Only update TS if one was sent.
self.updateTS(channel, ts)
return {'channel': channel, 'users': [source], 'modes': return {'channel': channel, 'users': [source], 'modes':
self.irc.channels[channel].modes, 'ts': ts} self.irc.channels[channel].modes, 'ts': ts or int(time.time())}
handle_create = handle_join handle_create = handle_join
@ -747,9 +762,17 @@ class P10Protocol(Protocol):
return {'channel': channel, 'target': kicked, 'text': args[2]} return {'channel': channel, 'target': kicked, 'text': args[2]}
def handle_quit(self, numeric, command, args): def handle_quit(self, numeric, command, args):
"""Handles incoming QUIT commands.""" """Handles incoming QUITs."""
# <- ABAAB Q :Killed (GL_ (bangbang)) # <- ABAAB Q :Killed (GL_ (bangbang))
self.removeClient(numeric) self.removeClient(numeric)
return {'text': args[0]} return {'text': args[0]}
def handle_kill(self, numeric, command, args):
"""Handles incoming KILLs."""
# <- ABAAA D AyAAA :nefarious.midnight.vpn!GL (test)
killed = args[0]
if killed in self.irc.users:
self.removeClient(killed)
return {'target': killed, 'text': args[1], 'userdata': self.irc.users.get(killed)}
Class = P10Protocol Class = P10Protocol