mirror of
https://github.com/jlu5/SupyPlugins.git
synced 2025-05-02 16:31:11 -05:00
RelayLink: merge upstream commit ProgVal/Supybot-plugins@405a726
This commit is contained in:
parent
87da1de483
commit
12b9c209dd
@ -103,7 +103,7 @@ class RelayLink(callbacks.Plugin):
|
|||||||
relay[2],
|
relay[2],
|
||||||
relay[3],
|
relay[3],
|
||||||
re.compile('^%s$' % relay[0], re.I),
|
re.compile('^%s$' % relay[0], re.I),
|
||||||
re.compile('^%s$' % relay[1]),
|
re.compile('^%s$' % relay[1], re.I),
|
||||||
re.compile(relay[4])))
|
re.compile(relay[4])))
|
||||||
except:
|
except:
|
||||||
log.error('Failed adding relay: %r' % relay)
|
log.error('Failed adding relay: %r' % relay)
|
||||||
@ -432,7 +432,7 @@ class RelayLink(callbacks.Plugin):
|
|||||||
if 'count' not in keys: irc.reply(s, private=True)
|
if 'count' not in keys: irc.reply(s, private=True)
|
||||||
for relay in self.relays:
|
for relay in self.relays:
|
||||||
if relay.sourceChannel == channel and \
|
if relay.sourceChannel == channel and \
|
||||||
relay.sourceNetwork == irc.network:
|
relay.sourceNetwork.lower() == irc.network.lower():
|
||||||
totalChans += 1
|
totalChans += 1
|
||||||
if not world.getIrc(relay.targetNetwork):
|
if not world.getIrc(relay.targetNetwork):
|
||||||
irc.reply(_('Not connected to network %s.') %
|
irc.reply(_('Not connected to network %s.') %
|
||||||
@ -499,7 +499,7 @@ class RelayLink(callbacks.Plugin):
|
|||||||
s = ' | '.join(args)
|
s = ' | '.join(args)
|
||||||
|
|
||||||
currentConfig = self.registryValue('relays')
|
currentConfig = self.registryValue('relays')
|
||||||
if add == True:
|
if add:
|
||||||
if s in currentConfig.split(' || '):
|
if s in currentConfig.split(' || '):
|
||||||
return False
|
return False
|
||||||
if currentConfig == '':
|
if currentConfig == '':
|
||||||
|
Loading…
x
Reference in New Issue
Block a user