From d1468e932e5fbee0ad61ad6eac2eafaff15052bf Mon Sep 17 00:00:00 2001 From: James Lu Date: Sat, 20 Feb 2016 12:38:20 -0800 Subject: [PATCH 1/3] readme: mention freenode relay channel --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2fe4cc9..d14b3ae 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ PyLink is an extensible, plugin-based IRC services framework written in Python. Please report any bugs you find to the [issue tracker](https://github.com/GLolol/PyLink/issues). Pull requests are open if you'd like to contribute, though new stuff generally goes to the **devel** branch. -You can also find support via our IRC channel: `#PyLink at irc.overdrivenetworks.com` ([webchat](https://webchat.overdrivenetworks.com/?channels=PyLink,dev)). Ask your questions and be patient for a response. +You can also find support via our IRC channels: `#PyLink @ irc.overdrivenetworks.com `([webchat](https://webchat.overdrivenetworks.com/?channels=PyLink,dev)) or `#PyLink @ chat.freenode.net`. Ask your questions and be patient for a response. ## Dependencies From 393466498e37632cc8779b1e62fb0c5c074f7eb9 Mon Sep 17 00:00:00 2001 From: James Lu Date: Thu, 25 Feb 2016 21:10:41 -0800 Subject: [PATCH 2/3] opercmds: fix wrong help message for KILL --- plugins/opercmds.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/opercmds.py b/plugins/opercmds.py index 3a80b54..cedaeb7 100644 --- a/plugins/opercmds.py +++ b/plugins/opercmds.py @@ -152,9 +152,9 @@ def kick(irc, source, args): @utils.add_cmd def kill(irc, source, args): - """ [] + """ [] - Admin only. Kills via , where is either the nick of a PyLink client or the SID of a PyLink server.""" + Admin only. Kills via , where is either the nick of a PyLink client or the SID of a PyLink server.""" utils.checkAuthenticated(irc, source, allowOper=False) try: sourcenick = args[0] From a7a98c9a525334b4d874fd3751f9e55e170e437c Mon Sep 17 00:00:00 2001 From: James Lu Date: Thu, 25 Feb 2016 21:11:42 -0800 Subject: [PATCH 3/3] inspircd: format kill reasons like "Killed (sourcenick (reason))" InspIRCd will show the raw kill message sent from servers as the quit message. So, make kills look actually like a kill instead of someone quitting with an arbitrary message. --- protocols/inspircd.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/protocols/inspircd.py b/protocols/inspircd.py index 97bf542..883f16b 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -184,7 +184,15 @@ class InspIRCdProtocol(TS6BaseProtocol): (not self.irc.isInternalServer(numeric)): raise LookupError('No such PyLink client/server exists.') - self._send(numeric, 'KILL %s :%s' % (target, reason)) + # InspIRCd will show the raw kill message sent from our server as the quit message. + # So, make the kill look actually like a kill instead of someone quitting with + # an arbitrary message. + if target in self.irc.servers: + sourcenick = self.irc.servers[numeric].name + else: + sourcenick = self.irc.users[numeric].nick + + self._send(numeric, 'KILL %s :Killed (%s (%s))' % (target, sourcenick, 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