GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-26 04:32:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
James Lu 2015-07-24 11:09:53 -07:00
commit 007a1d9389
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -18,7 +18,7 @@ Dependencies currently include:
#### Supported IRCds #### Supported IRCds
* InspIRCd 2.0.x - module: `inspircd` * InspIRCd 2.0.x - module: `inspircd`
* charybdis (3.5.x / git master) - module: `ts6` * charybdis (3.5.x / git master) - module: `ts6` (**experimental**)
### Installation ### Installation

3
plugins/relay.py
View File

@ -460,8 +460,7 @@ whitelisted_cmodes = {'admin', 'allowinvite', 'autoop', 'ban', 'banexception',
'regmoderated', 'secret', 'sslonly', 'regmoderated', 'secret', 'sslonly',
'stripcolor', 'topiclock', 'voice'} 'stripcolor', 'topiclock', 'voice'}
whitelisted_umodes = {'bot', 'hidechans', 'hideoper', 'invisible', 'oper', whitelisted_umodes = {'bot', 'hidechans', 'hideoper', 'invisible', 'oper',
'regdeaf', 'u_stripcolor', 'servprotect', 'u_noctcp', 'regdeaf', 'u_stripcolor', 'u_noctcp', 'wallops'}
'wallops'}
def relayModes(irc, remoteirc, sender, channel, modes=None): def relayModes(irc, remoteirc, sender, channel, modes=None):
remotechan = findRemoteChan(irc, remoteirc, channel) remotechan = findRemoteChan(irc, remoteirc, channel)
log.debug('(%s) Relay mode: remotechan for %s on %s is %s', irc.name, channel, irc.name, remotechan) log.debug('(%s) Relay mode: remotechan for %s on %s is %s', irc.name, channel, irc.name, remotechan)

2
protocols/inspircd.py
View File

@ -476,7 +476,7 @@ def handle_events(irc, data):
# Each server message looks something like this: # Each server message looks something like this:
# :70M FJOIN #chat 1423790411 +AFPfjnt 6:5 7:5 9:5 :v,1SRAAESWE # :70M FJOIN #chat 1423790411 +AFPfjnt 6:5 7:5 9:5 :v,1SRAAESWE
# :<sid> <command> <argument1> <argument2> ... :final multi word argument # :<sid> <command> <argument1> <argument2> ... :final multi word argument
args = data.split() args = data.split(" ")
if not args: if not args:
# No data?? # No data??
return return

2
protocols/ts6.py
View File

@ -414,7 +414,7 @@ def handle_events(irc, data):
# TS6 messages: # TS6 messages:
# :42X COMMAND arg1 arg2 :final long arg # :42X COMMAND arg1 arg2 :final long arg
# :42XAAAAAA PRIVMSG #somewhere :hello! # :42XAAAAAA PRIVMSG #somewhere :hello!
args = data.split() args = data.split(" ")
if not args: if not args:
# No data?? # No data??
return return