From 254797dcfd6de515430786b406fe8a8d5dc013a5 Mon Sep 17 00:00:00 2001 From: James Lu Date: Thu, 23 Jul 2015 18:05:13 -0700 Subject: [PATCH 1/3] relay: remove servprotect from umode whitelist for now.. --- plugins/relay.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/relay.py b/plugins/relay.py index 9932a17..be36ff8 100644 --- a/plugins/relay.py +++ b/plugins/relay.py @@ -454,8 +454,7 @@ whitelisted_cmodes = {'admin', 'allowinvite', 'autoop', 'ban', 'banexception', 'regmoderated', 'secret', 'sslonly', 'stripcolor', 'topiclock', 'voice'} whitelisted_umodes = {'bot', 'hidechans', 'hideoper', 'invisible', 'oper', - 'regdeaf', 'u_stripcolor', 'servprotect', 'u_noctcp', - 'wallops'} + 'regdeaf', 'u_stripcolor', 'u_noctcp', 'wallops'} def relayModes(irc, remoteirc, sender, channel, modes=None): remotechan = findRemoteChan(irc, remoteirc, channel) log.debug('(%s) Relay mode: remotechan for %s on %s is %s', irc.name, channel, irc.name, remotechan) From 868b4503e602692b3cf26518819fcde75da7f5d6 Mon Sep 17 00:00:00 2001 From: James Lu Date: Thu, 23 Jul 2015 19:09:19 -0700 Subject: [PATCH 2/3] protocols: Fix #81 - that was easy! Split data by only one space at a time, not as many spaces as possible. Thanks to @nathan0. --- protocols/inspircd.py | 2 +- protocols/ts6.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/protocols/inspircd.py b/protocols/inspircd.py index 207eb61..46543cc 100644 --- a/protocols/inspircd.py +++ b/protocols/inspircd.py @@ -476,7 +476,7 @@ def handle_events(irc, data): # Each server message looks something like this: # :70M FJOIN #chat 1423790411 +AFPfjnt 6:5 7:5 9:5 :v,1SRAAESWE # : ... :final multi word argument - args = data.split() + args = data.split(" ") if not args: # No data?? return diff --git a/protocols/ts6.py b/protocols/ts6.py index edfd60e..0b986d5 100644 --- a/protocols/ts6.py +++ b/protocols/ts6.py @@ -414,7 +414,7 @@ def handle_events(irc, data): # TS6 messages: # :42X COMMAND arg1 arg2 :final long arg # :42XAAAAAA PRIVMSG #somewhere :hello! - args = data.split() + args = data.split(" ") if not args: # No data?? return From a5d71ffb5633a359819921a7fd9ff56d0f1b8a08 Mon Sep 17 00:00:00 2001 From: James Lu Date: Fri, 24 Jul 2015 10:56:23 -0700 Subject: [PATCH 3/3] README: mark TS6 support as experimental Currently, #71 makes this near unusable because of mode flooding whenever anything happens on a slightly large network. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 55599ff..f41ef08 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Dependencies currently include: #### Supported IRCds * InspIRCd 2.0.x - module: `inspircd` -* charybdis (3.5.x / git master) - module: `ts6` +* charybdis (3.5.x / git master) - module: `ts6` (**experimental**) ### Installation