CiaranG
/
Supybot-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LinkRelay: many fixes

master
Valentin Lorentz 2011-05-13 18:25:40 +02:00
parent 523c19e650
commit 03c7e1e1d3
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
LinkRelay/config.py
View File

@ -75,10 +75,10 @@ conf.registerChannelValue(LinkRelay, 'includeNetwork',
class ValidNonPrivmsgsHandling(registry.OnlySomeStrings):
validStrings = ('privmsg', 'notice', 'nothing')
conf.registerChannelValue(LinkRelay, 'nonPrivmsgs',
registry.Boolean('privmsg', _("""Determines whether the bot will use
PRIVMSGs (privmsg), NOTICEs (notice), for non-PRIVMSG Relay messages
(i.e., joins, parts, nicks, quits, modes, etc.), or whether it won't relay
such messages (nothing)""")))
ValidNonPrivmsgsHandling('privmsg', _("""Determines whether the
bot will use PRIVMSGs (privmsg), NOTICEs (notice), for non-PRIVMSG Relay
messages (i.e., joins, parts, nicks, quits, modes, etc.), or whether it
won't relay such messages (nothing)""")))
conf.registerGlobalValue(LinkRelay, 'relays',
registry.String('', _("""You shouldn't edit this configuration variable
@ -90,7 +90,6 @@ conf.registerGlobalValue(LinkRelay, 'substitutes',
conf.registerGroup(LinkRelay, 'colors')
for name, color in {'info': '02',
'msg': '14',
'truncated': '14',
'mode': '14',
'join': '14',

16
LinkRelay/plugin.py
View File

@ -129,10 +129,9 @@ class LinkRelay(callbacks.Plugin):
s = '* %s %s' % (nick, text)
else:
if colored:
s = '\x03%s<%s%s\x0314>\x03 %s' % \
(self.registryValue('colors.msg'), color, nick, text)
s = '%s<%s%s\x0314>\x03 %s' % (color, nick, text)
else:
s = '<%s%s> %s' % (color, nick, text)
s = '<%s> %s' % (nick, text)
return s
@ -155,13 +154,14 @@ class LinkRelay(callbacks.Plugin):
relay.sourceNetwork,
relay.targetChannel,
relay.targetNetwork,
hasIRC)))
hasIRC))
def doPrivmsg(self, irc, msg):
self.addIRC(irc)
channel = msg.args[0]
s = msg.args[1]
s = self.formatPrivMsg(msg.nick, s)
s = self.formatPrivMsg(msg.nick, s,
self.registryValue('color', channel))
if channel not in irc.state.channels: # in private
# cuts off the end of commands, so that passwords
# won't be revealed in relayed PM's
@ -181,7 +181,8 @@ class LinkRelay(callbacks.Plugin):
if msg.command == 'PRIVMSG':
if not msg.relayedMsg:
if msg.args[0] in irc.state.channels:
s = self.formatPrivMsg(irc.nick, msg.args[1])
s = self.formatPrivMsg(irc.nick, msg.args[1],
self.registryValue('color', msg.args[0]))
self.sendToOthers(irc, msg.args[0], s, isPrivmsg=True)
return msg
@ -274,8 +275,7 @@ class LinkRelay(callbacks.Plugin):
elif self.registryValue('nonPrivmsgs', channel) == 'notice':
msg = ircmsgs.notice(relay.targetChannel, s)
else:
# nothing
pass
return
msg.tag('relayedMsg')
relay.targetIRC.sendMsg(msg)