PsychoticNinja/Limnoria
1
0
Fork 0
mirror of https://github.com/progval/Limnoria.git synced 2025-05-06 11:33:39 -05:00
Code Issues Projects Releases Wiki Activity

Added some guards for self.started to make sure certain commands aren't run before the plugin is started.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-09-23 18:59:22 +00:00
parent fcab1a30cf
commit 06e2e05b78
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/Relay.py
View File

@ -182,6 +182,9 @@ class Relay(callbacks.Privmsg):
abbreviation <network abbreviation> is used when relaying messages from abbreviation <network abbreviation> is used when relaying messages from
that network to other networks. that network to other networks.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
abbreviation, server = privmsgs.getArgs(args, needed=2) abbreviation, server = privmsgs.getArgs(args, needed=2)
if isinstance(irc, irclib.Irc): if isinstance(irc, irclib.Irc):
realIrc = irc realIrc = irc
@ -209,6 +212,9 @@ class Relay(callbacks.Privmsg):
Disconnects and ceases to relay to and from the network represented by Disconnects and ceases to relay to and from the network represented by
the network abbreviation <network>. the network abbreviation <network>.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
network = privmsgs.getArgs(args) network = privmsgs.getArgs(args)
otherIrc = self.ircs[network] otherIrc = self.ircs[network]
otherIrc.die() otherIrc.die()
@ -227,6 +233,9 @@ class Relay(callbacks.Privmsg):
relay between those channels unless he's told to relayjoin both relay between those channels unless he's told to relayjoin both
channels. channels.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
channel = privmsgs.getArgs(args) channel = privmsgs.getArgs(args)
self.channels.add(ircutils.toLower(channel)) self.channels.add(ircutils.toLower(channel))
for otherIrc in self.ircs.itervalues(): for otherIrc in self.ircs.itervalues():
@ -242,6 +251,9 @@ class Relay(callbacks.Privmsg):
will part from the channel on all networks in which it is on the will part from the channel on all networks in which it is on the
channel. channel.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
channel = privmsgs.getArgs(args) channel = privmsgs.getArgs(args)
self.channels.remove(ircutils.toLower(channel)) self.channels.remove(ircutils.toLower(channel))
for otherIrc in self.ircs.itervalues(): for otherIrc in self.ircs.itervalues():
@ -256,6 +268,9 @@ class Relay(callbacks.Privmsg):
Says <text> on <channel> (using the current channel if unspecified) Says <text> on <channel> (using the current channel if unspecified)
on <network>. on <network>.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
if not args: if not args:
raise callbacks.ArgumentError, 'relaysay' raise callbacks.ArgumentError, 'relaysay'
network = args.pop(0) network = args.pop(0)
@ -277,6 +292,9 @@ class Relay(callbacks.Privmsg):
the channel itself. Returns the nicks of the people in the channel on the channel itself. Returns the nicks of the people in the channel on
the various networks the bot is connected to. the various networks the bot is connected to.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
if isinstance(irc, irclib.Irc): if isinstance(irc, irclib.Irc):
realIrc = irc realIrc = irc
else: else:
@ -298,6 +316,9 @@ class Relay(callbacks.Privmsg):
Returns the WHOIS response <network> gives for <nick>. Returns the WHOIS response <network> gives for <nick>.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
nickAtNetwork = privmsgs.getArgs(args) nickAtNetwork = privmsgs.getArgs(args)
if isinstance(irc, irclib.Irc): if isinstance(irc, irclib.Irc):
realIrc = irc realIrc = irc
@ -329,6 +350,9 @@ class Relay(callbacks.Privmsg):
0 turns coloring of nicks/angle brackets off entirely. 1 colors the 0 turns coloring of nicks/angle brackets off entirely. 1 colors the
nicks, but not the angle brackets. 2 colors both. nicks, but not the angle brackets. 2 colors both.
""" """
if not self.started:
irc.error(msg, 'You must use the startrelay command first.')
return
try: try:
color = int(privmsgs.getArgs(args)) color = int(privmsgs.getArgs(args))
if color != 0 and color != 1 and color != 2: if color != 0 and color != 1 and color != 2: