mirror of
https://github.com/jlu5/PyLink.git
synced 2024-11-01 09:19:23 +01:00
ts6: implement kill paths in outgoing KILL (#239)
This commit is contained in:
parent
81fca49738
commit
d0b7d44f1a
@ -196,6 +196,7 @@ class TS6Protocol(TS6BaseProtocol):
|
|||||||
(not self.irc.isInternalServer(numeric)):
|
(not self.irc.isInternalServer(numeric)):
|
||||||
raise LookupError('No such PyLink client/server exists.')
|
raise LookupError('No such PyLink client/server exists.')
|
||||||
|
|
||||||
|
# From TS6 docs:
|
||||||
# KILL:
|
# KILL:
|
||||||
# parameters: target user, path
|
# parameters: target user, path
|
||||||
|
|
||||||
@ -204,7 +205,21 @@ class TS6Protocol(TS6BaseProtocol):
|
|||||||
# it is recommended not to add anything to the path.
|
# it is recommended not to add anything to the path.
|
||||||
|
|
||||||
assert target in self.irc.users, "Unknown target %r for kill()!" % target
|
assert target in self.irc.users, "Unknown target %r for kill()!" % target
|
||||||
self._send(numeric, 'KILL %s :Killed (%s)' % (target, reason))
|
|
||||||
|
if numeric in self.irc.users:
|
||||||
|
# Killer was an user. Follow examples of setting the path to be "killer.host!killer.nick".
|
||||||
|
userobj = self.irc.users[numeric]
|
||||||
|
killpath = '%s!%s' % (userobj.host, userobj.nick)
|
||||||
|
elif numeric in self.irc.servers:
|
||||||
|
# Sender was a server; killpath is just its name.
|
||||||
|
killpath = self.irc.servers[numeric].name
|
||||||
|
else:
|
||||||
|
# Invalid sender?! This shouldn't happen, but make the killpath our server name anyways.
|
||||||
|
log.warning('(%s) Invalid sender %s for kill(); using our server name instead.',
|
||||||
|
self.irc.name, numeric)
|
||||||
|
killpath = self.irc.servers[self.irc.sid].name
|
||||||
|
|
||||||
|
self._send(numeric, 'KILL %s :%s (%s)' % (target, killpath, reason))
|
||||||
self.removeClient(target)
|
self.removeClient(target)
|
||||||
|
|
||||||
def topicBurst(self, numeric, target, text):
|
def topicBurst(self, numeric, target, text):
|
||||||
|
Loading…
Reference in New Issue
Block a user