deathbybandaid/SpiceBot-migrated
1
0
Fork 0
mirror of https://github.com/SpiceBot/SpiceBot.git synced 2026-11-13 06:59:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't stay in empty channels

Browse Source
This commit is contained in:
deathbybandaid 2019-05-16 16:20:09 -04:00
parent 4311d69520
commit c6fb848998
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sopel_modules/SpiceBot_Channels/Channels.py
View File

@ -65,8 +65,6 @@ def trigger_channel_list_initial(bot, trigger):
# Unkickable # Unkickable
bot.write(('SAMODE', bot.nick, '+q')) bot.write(('SAMODE', bot.nick, '+q'))
bot_part_empty(bot)
bot.write(['LIST']) bot.write(['LIST'])
bot.memory['SpiceBot_Channels']['ProcessLock'] = True bot.memory['SpiceBot_Channels']['ProcessLock'] = True
@ -84,7 +82,6 @@ def trigger_channel_list_initial(bot, trigger):
channel_list_current(bot) channel_list_current(bot)
foundchannelcount = len(bot.memory['SpiceBot_Channels']['channels'].keys()) foundchannelcount = len(bot.memory['SpiceBot_Channels']['channels'].keys())
bot_logging(bot, 'SpiceBot_Channels', "Channel listing finished! " + str(foundchannelcount) + " channel(s) found.") bot_logging(bot, 'SpiceBot_Channels', "Channel listing finished! " + str(foundchannelcount) + " channel(s) found.")
botevents.trigger(bot, botevents.BOT_CHANNELS, "SpiceBot_Channels")
join_all_channels(bot) join_all_channels(bot)
chanadmin_all_channels(bot) chanadmin_all_channels(bot)
@ -92,12 +89,16 @@ def trigger_channel_list_initial(bot, trigger):
if "*" in bot.memory['SpiceBot_Channels']['channels']: if "*" in bot.memory['SpiceBot_Channels']['channels']:
del bot.memory['SpiceBot_Channels']['channels']["*"] del bot.memory['SpiceBot_Channels']['channels']["*"]
bot_part_empty(bot) botevents.trigger(bot, botevents.BOT_CHANNELS, "SpiceBot_Channels")
@sopel.module.event(botevents.BOT_CHANNELS)
@sopel.module.rule('.*')
def trigger_channel_list_recurring(bot, trigger):
while True: while True:
try: try:
time.sleep(1800) time.sleep(1800)
bot_part_empty(bot)
oldlist = list(bot.memory['SpiceBot_Channels']['channels'].keys()) oldlist = list(bot.memory['SpiceBot_Channels']['channels'].keys())
bot.write(['LIST']) bot.write(['LIST'])
bot.memory['SpiceBot_Channels']['ProcessLock'] = True bot.memory['SpiceBot_Channels']['ProcessLock'] = True
@ -117,17 +118,21 @@ def trigger_channel_list_initial(bot, trigger):
if "*" in bot.memory['SpiceBot_Channels']['channels']: if "*" in bot.memory['SpiceBot_Channels']['channels']:
del bot.memory['SpiceBot_Channels']['channels']["*"] del bot.memory['SpiceBot_Channels']['channels']["*"]
bot_part_empty(bot)
except KeyError: except KeyError:
return return
def bot_part_empty(bot): @sopel.module.event(botevents.BOT_CHANNELS)
@sopel.module.rule('.*')
def bot_part_empty(bot, trigger):
"""Don't stay in empty channels"""
ignorepartlist = [] ignorepartlist = []
if bot.config.SpiceBot_Logs.logging_channel: if bot.config.SpiceBot_Logs.logging_channel:
ignorepartlist.append(bot.config.SpiceBot_Logs.logging_channel) ignorepartlist.append(bot.config.SpiceBot_Logs.logging_channel)
for channel in bot.channels.keys(): while True:
if len(bot.channels[channel].privileges.keys()) == 1 and channel not in ignorepartlist: for channel in bot.channels.keys():
bot.part(channel, "Leaving Empty Channel") if len(bot.channels[channel].privileges.keys()) == 1 and channel not in ignorepartlist:
if channel.lower() in bot.memory['SpiceBot_Channels']['channels']: bot.part(channel, "Leaving Empty Channel")
del bot.memory['SpiceBot_Channels']['channels'][channel.lower()] if channel.lower() in bot.memory['SpiceBot_Channels']['channels']:
del bot.memory['SpiceBot_Channels']['channels'][channel.lower()]

5
sopel_modules/SpiceBot_Channels/Channels_Command.py
View File

@ -11,7 +11,6 @@ from sopel_modules.SpiceBot_SBTools import (
sopel_triggerargs, inlist, channel_privs, sopel_triggerargs, inlist, channel_privs,
join_all_channels, channel_list_current, join_all_channels, channel_list_current,
) )
from .Channels import bot_part_empty
@botevents.check_ready([botevents.BOT_LOADED]) @botevents.check_ready([botevents.BOT_LOADED])
@ -55,7 +54,7 @@ def nickname_comand_channels(bot, trigger):
if not trigger.admin: if not trigger.admin:
bot.osd("You do not have permission to update the channel listing.") bot.osd("You do not have permission to update the channel listing.")
return return
bot_part_empty(bot)
bot.write(['LIST']) bot.write(['LIST'])
bot.osd(["[SpiceBot_Channels]", "I am now updating the channel listing for this server."]) bot.osd(["[SpiceBot_Channels]", "I am now updating the channel listing for this server."])
bot.memory['SpiceBot_Channels']['ProcessLock'] = True bot.memory['SpiceBot_Channels']['ProcessLock'] = True
@ -64,7 +63,7 @@ def nickname_comand_channels(bot, trigger):
join_all_channels(bot) join_all_channels(bot)
foundchannelcount = len(bot.memory['SpiceBot_Channels']['channels'].keys()) foundchannelcount = len(bot.memory['SpiceBot_Channels']['channels'].keys())
bot.osd("[SpiceBot_Channels]", "Channel listing finished!", str(foundchannelcount) + " channel(s) found.") bot.osd("[SpiceBot_Channels]", "Channel listing finished!", str(foundchannelcount) + " channel(s) found.")
bot_part_empty(bot)
return return
elif commandused == 'topic': elif commandused == 'topic':