bss/dr.botzo
1
0
Fork 0
Code Issues 3 Pull Requests Releases 2 Wiki Activity

check for channel with is_channel in a couple places where it's relevant

Browse Source
This commit is contained in:
Brian S. Stephan 2010-07-25 07:58:52 -05:00
parent f170743837
commit 934e8e3fe8
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dr.botzo.py
View File

@ -15,6 +15,7 @@ import irclib
def sub_join_channel(connection, event, nick, userhost, replypath, what, admin_unlocked): def sub_join_channel(connection, event, nick, userhost, replypath, what, admin_unlocked):
if what.split(' ')[0] == 'join' and admin_unlocked: if what.split(' ')[0] == 'join' and admin_unlocked:
channel = what.split(' ')[1] channel = what.split(' ')[1]
if irclib.is_channel(channel):
connection.join(channel) connection.join(channel)
connection.privmsg(replypath, 'joined ' + channel + '.') connection.privmsg(replypath, 'joined ' + channel + '.')
@ -27,6 +28,7 @@ def sub_join_channel(connection, event, nick, userhost, replypath, what, admin_u
def sub_part_channel(connection, event, nick, userhost, replypath, what, admin_unlocked): def sub_part_channel(connection, event, nick, userhost, replypath, what, admin_unlocked):
if what.split(' ')[0] == 'part' and admin_unlocked: if what.split(' ')[0] == 'part' and admin_unlocked:
channel = what.split(' ')[1] channel = what.split(' ')[1]
if irclib.is_channel(channel):
connection.part(channel, ' '.join(what.split(' ')[2:])) connection.part(channel, ' '.join(what.split(' ')[2:]))
connection.privmsg(replypath, 'parted ' + channel + '.') connection.privmsg(replypath, 'parted ' + channel + '.')
@ -55,6 +57,7 @@ def sub_autojoin_manipulate(connection, event, nick, userhost, replypath, what,
try: try:
# get existing list # get existing list
channel = what.split(' ')[2] channel = what.split(' ')[2]
if irclib.is_channel(channel):
channelset = set(config.get('channels', 'autojoin').split(',')) channelset = set(config.get('channels', 'autojoin').split(','))
channelset.add(channel) channelset.add(channel)
config.set('channels', 'autojoin', ','.join(channelset)) config.set('channels', 'autojoin', ','.join(channelset))
@ -64,6 +67,7 @@ def sub_autojoin_manipulate(connection, event, nick, userhost, replypath, what,
try: try:
# get existing list # get existing list
channel = what.split(' ')[2] channel = what.split(' ')[2]
if irclib.is_channel(channel):
channelset = set(config.get('channels', 'autojoin').split(',')) channelset = set(config.get('channels', 'autojoin').split(','))
channelset.discard(channel) channelset.discard(channel)
config.set('channels', 'autojoin', ','.join(channelset)) config.set('channels', 'autojoin', ','.join(channelset))