GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-25 20:22:45 +01:00
Code Issues Projects Releases Wiki Activity

inspircd: remove clients from state when killing own clients

Browse Source 
Closes #115.
This commit is contained in:
James Lu 2015-10-08 20:12:52 -07:00
parent b8fe622cc8
commit 8bde21f1e6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protocols/inspircd.py
View File

@ -190,21 +190,25 @@ class InspIRCdProtocol(TS6BaseProtocol):
raise LookupError('No such PyLink PseudoServer exists.') raise LookupError('No such PyLink PseudoServer exists.')
self._sendModes(numeric, target, modes, ts=ts) self._sendModes(numeric, target, modes, ts=ts)
def _sendKill(self, numeric, target, reason):
self._send(numeric, 'KILL %s :%s' % (target, reason))
# We only need to call removeClient here if the target is one of our
# clients, since any remote servers will send a QUIT from
# their target if the command succeeds.
if utils.isInternalClient(self.irc, target):
self.removeClient(target)
def killServer(self, numeric, target, reason): def killServer(self, numeric, target, reason):
"""Sends a kill from a PyLink server.""" """Sends a kill from a PyLink server."""
if not utils.isInternalServer(self.irc, numeric): if not utils.isInternalServer(self.irc, numeric):
raise LookupError('No such PyLink PseudoServer exists.') raise LookupError('No such PyLink PseudoServer exists.')
self._send(numeric, 'KILL %s :%s' % (target, reason)) self._sendKill(numeric, target, reason)
# We don't need to call removeClient here, since the remote server
# will send a QUIT from the target if the command succeeds.
def killClient(self, numeric, target, reason): def killClient(self, numeric, target, reason):
"""Sends a kill from a PyLink client.""" """Sends a kill from a PyLink client."""
if not utils.isInternalClient(self.irc, numeric): if not utils.isInternalClient(self.irc, numeric):
raise LookupError('No such PyLink PseudoClient exists.') raise LookupError('No such PyLink PseudoClient exists.')
self._send(numeric, 'KILL %s :%s' % (target, reason)) self._sendKill(numeric, target, reason)
# We don't need to call removeClient here, since the remote server
# will send a QUIT from the target if the command succeeds.
def topicServer(self, numeric, target, text): def topicServer(self, numeric, target, text):
"""Sends a topic change from a PyLink server. This is usually used on burst.""" """Sends a topic change from a PyLink server. This is usually used on burst."""