diff --git a/plugins/Relay.py b/plugins/Relay.py index af9a67458..73a2b3e24 100644 --- a/plugins/Relay.py +++ b/plugins/Relay.py @@ -50,6 +50,34 @@ import ircutils import privmsgs import callbacks +example = """ + @load Relay + jemfinch: The operation succeeded. + @startrelay freenode + jemfinch: The operation succeeded. + @relayconnect oftc irc.oftc.net + jemfinch: The operation succeeded. + @relayjoin #sourcereview + jemfinch: The operation succeeded. + supybot (supybot!~supybot@65.24.59.168) has joined on oftc + howdy, folks :) + jemfinch (jemfinch!~jfincher@dhcp065-024-059-168.columbus.rr.com) has joined on oftc + @list Relay + jemfinch: relaycolor, relayconnect, relaydisconnect, relayjoin, relaynames, relaypart, relaysay, relaywhois, startrelay + @relaynames + jemfinch: oftc: supybot, jemfinch, sweede, Strike, GnuVince + @relaycolor 0 + jemfinch: The operation succeeded. + @relaycolor 1 + jemfinch: The operation succeeded. + @relaycolor 2 + jemfinch: The operation succeeded. + @relaycolor 3 + jemfinch: relaycolor <0,1,2> + @relaywhois GnuVince + jemfinch: Vincent Foley (~vince@modemcable216.89-202-24.mtl.mc.videotron.ca) has been online since 08:37 PM, August 24, 2003 (idle for 1 day, 10 hours, 21 minutes, and 3 seconds) and is on #sourcereview and @#hackcanada +""" + def configure(onStart, afterConnect, advanced): import socket from questions import expect, anything, something, yn @@ -180,7 +208,7 @@ class Relay(callbacks.Privmsg): """ network = privmsgs.getArgs(args) otherIrc = self.ircs[network] - otherIrc.driver.die() + otherIrc.die() del self.ircs[network] world.ircs.remove(otherIrc) del self.abbreviations[otherIrc] @@ -226,7 +254,7 @@ class Relay(callbacks.Privmsg): on . """ if not args: - raise callbacks.ArgumentError + raise callbacks.ArgumentError, 'relaysay' network = args.pop(0) channel = privmsgs.getChannel(msg, args) text = privmsgs.getArgs(args)