Let's make relaying the hostmasks on join optional.

This commit is contained in:
Jeremy Fincher 2004-08-05 04:01:52 +00:00
parent 250df8538c
commit fdc8cdb15c

View File

@ -79,6 +79,10 @@ conf.registerChannelValue(conf.supybot.plugins.Relay, 'color',
conf.registerChannelValue(conf.supybot.plugins.Relay, 'topicSync', conf.registerChannelValue(conf.supybot.plugins.Relay, 'topicSync',
registry.Boolean(True, """Determines whether the bot will synchronize registry.Boolean(True, """Determines whether the bot will synchronize
topics between networks in the channels it relays.""")) topics between networks in the channels it relays."""))
conf.registerChannelValue(conf.supybot.plugins.Relay, 'hostmasks',
registry.Boolean(False, """Determines whether the bot will relay the
hostmask of the person joining or parting the channel when he or she joins
or parts."""))
conf.registerGlobalValue(conf.supybot.plugins.Relay, 'channels', conf.registerGlobalValue(conf.supybot.plugins.Relay, 'channels',
conf.SpaceSeparatedSetOfChannels([], """Determines which channels the bot conf.SpaceSeparatedSetOfChannels([], """Determines which channels the bot
will relay in.""")) will relay in."""))
@ -496,7 +500,11 @@ class Relay(callbacks.Privmsg):
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
network = self._getIrcName(irc) network = self._getIrcName(irc)
s = '%s (%s) has joined on %s' % (msg.nick, msg.prefix, network) if not self.registryValue('hostmasks', channel):
hostmask = ' '
else:
hostmask = ' (%s) ' % msg.prefix
s = '%s%shas joined on %s' % (msg.nick, hostmask, network)
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)
@ -506,7 +514,11 @@ class Relay(callbacks.Privmsg):
if channel not in self.registryValue('channels'): if channel not in self.registryValue('channels'):
return return
network = self._getIrcName(irc) network = self._getIrcName(irc)
s = '%s (%s) has left on %s' % (msg.nick, msg.prefix, network) if not self.registryValue('hostmasks', channel):
hostmask = ' '
else:
hostmask = ' (%s) ' % msg.prefix
s = '%s%s has left on %s' % (msg.nick, hostmask, network)
m = ircmsgs.privmsg(channel, s) m = ircmsgs.privmsg(channel, s)
self._sendToOthers(irc, m) self._sendToOthers(irc, m)