mirror of
https://github.com/SpiceBot/SpiceBot.git
synced 2026-11-13 06:59:53 -05:00
track users in both user and channel classes
This commit is contained in:
parent
fffed15806
commit
541cb46e13
@ -4,12 +4,14 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
|
|||||||
This is the SpiceBot Channels system.
|
This is the SpiceBot Channels system.
|
||||||
"""
|
"""
|
||||||
import sopel
|
import sopel
|
||||||
|
from sopel.tools import Identifier
|
||||||
from sopel.config.types import StaticSection, ValidatedAttribute, ListAttribute
|
from sopel.config.types import StaticSection, ValidatedAttribute, ListAttribute
|
||||||
|
|
||||||
import re
|
import re
|
||||||
import threading
|
import threading
|
||||||
|
|
||||||
from .Config import config as botconfig
|
from .Config import config as botconfig
|
||||||
|
from .Database import db as botdb
|
||||||
|
|
||||||
|
|
||||||
class SpiceBot_Channels_MainSection(StaticSection):
|
class SpiceBot_Channels_MainSection(StaticSection):
|
||||||
@ -95,5 +97,80 @@ class BotChannels():
|
|||||||
else:
|
else:
|
||||||
bot.part(channel)
|
bot.part(channel)
|
||||||
|
|
||||||
|
def whois(self, nick):
|
||||||
|
nick = Identifier(nick)
|
||||||
|
nick_id = botdb.db.get_nick_id(nick, create=True)
|
||||||
|
return nick_id
|
||||||
|
|
||||||
|
def add_to_channel(self, channel, nick, nick_id=None):
|
||||||
|
if not nick_id:
|
||||||
|
nick_id = self.whois(nick)
|
||||||
|
if nick_id not in self.dict['list'][channel.lower()]['users']:
|
||||||
|
self.dict['list'][channel.lower()]['users'].append(nick_id)
|
||||||
|
|
||||||
|
def remove_from_channel(self, channel, nick, nick_id=None):
|
||||||
|
if not nick_id:
|
||||||
|
nick_id = self.whois(nick)
|
||||||
|
if nick_id in self.dict['list'][channel.lower()]['users']:
|
||||||
|
self.dict['list'][channel.lower()]['users'].remove(nick_id)
|
||||||
|
|
||||||
|
def remove_all_from_channel(self, channel):
|
||||||
|
self.dict['list'][channel.lower()]['users'] = []
|
||||||
|
|
||||||
|
def join(self, bot, trigger):
|
||||||
|
# bot block
|
||||||
|
if trigger.nick == bot.nick:
|
||||||
|
for user in bot.channels[trigger.sender].privileges.keys():
|
||||||
|
self.add_to_channel(self, trigger.sender, user)
|
||||||
|
return
|
||||||
|
# Identify
|
||||||
|
nick_id = self.whois(trigger.nick)
|
||||||
|
# Verify nick is in the channel list
|
||||||
|
self.add_to_channel(self, trigger.sender, trigger.nick, nick_id)
|
||||||
|
|
||||||
|
def quit(self, bot, trigger):
|
||||||
|
# bot block
|
||||||
|
if trigger.nick == bot.nick:
|
||||||
|
self.remove_all_from_channel(trigger.sender)
|
||||||
|
return
|
||||||
|
# Identify
|
||||||
|
nick_id = self.whois(trigger.nick)
|
||||||
|
# Verify nick is not in the channel list
|
||||||
|
self.remove_from_channel(self, trigger.sender, trigger.nick, nick_id)
|
||||||
|
|
||||||
|
def part(self, bot, trigger):
|
||||||
|
# bot block
|
||||||
|
if trigger.nick == bot.nick:
|
||||||
|
self.remove_all_from_channel(trigger.sender)
|
||||||
|
return
|
||||||
|
# Identify
|
||||||
|
nick_id = self.whois(trigger.nick)
|
||||||
|
# Verify nick is not in the channel list
|
||||||
|
self.remove_from_channel(self, trigger.sender, trigger.nick, nick_id)
|
||||||
|
|
||||||
|
def kick(self, bot, trigger):
|
||||||
|
targetnick = Identifier(str(trigger.args[1]))
|
||||||
|
# bot block
|
||||||
|
if targetnick == bot.nick:
|
||||||
|
self.remove_all_from_channel(trigger.sender)
|
||||||
|
return
|
||||||
|
# Identify
|
||||||
|
nick_id = self.whois(targetnick)
|
||||||
|
# Verify nick is not in the channel list
|
||||||
|
self.remove_from_channel(self, trigger.sender, targetnick, nick_id)
|
||||||
|
|
||||||
|
def nick(self, bot, trigger):
|
||||||
|
newnick = Identifier(trigger)
|
||||||
|
# bot block
|
||||||
|
if trigger.nick == bot.nick or newnick == bot.nick:
|
||||||
|
return
|
||||||
|
# alias the nick
|
||||||
|
if not botdb.check_nick_id(newnick):
|
||||||
|
botdb.alias_nick(trigger.nick, newnick)
|
||||||
|
# Identify
|
||||||
|
nick_id = self.whois(newnick)
|
||||||
|
# Verify nick is in the channel list
|
||||||
|
self.add_to_channel(self, trigger.sender, trigger.nick, nick_id)
|
||||||
|
|
||||||
|
|
||||||
channels = BotChannels()
|
channels = BotChannels()
|
||||||
|
|||||||
@ -95,3 +95,33 @@ def trigger_channel_list_recurring(bot, trigger):
|
|||||||
if "*" in SpiceBot.channels.dict['list'].keys():
|
if "*" in SpiceBot.channels.dict['list'].keys():
|
||||||
del SpiceBot.channels.dict['list']["*"]
|
del SpiceBot.channels.dict['list']["*"]
|
||||||
SpiceBot.channels.bot_part_empty(bot)
|
SpiceBot.channels.bot_part_empty(bot)
|
||||||
|
|
||||||
|
|
||||||
|
@sopel.module.event('JOIN')
|
||||||
|
@sopel.module.rule('.*')
|
||||||
|
def channels_users_join(bot, trigger):
|
||||||
|
SpiceBot.channels.join(bot, trigger)
|
||||||
|
|
||||||
|
|
||||||
|
@sopel.module.event('QUIT')
|
||||||
|
@sopel.module.rule('.*')
|
||||||
|
def channels_users_quit(bot, trigger):
|
||||||
|
SpiceBot.channels.quit(bot, trigger)
|
||||||
|
|
||||||
|
|
||||||
|
@sopel.module.event('PART')
|
||||||
|
@sopel.module.rule('.*')
|
||||||
|
def channels_users_part(bot, trigger):
|
||||||
|
SpiceBot.channels.part(bot, trigger)
|
||||||
|
|
||||||
|
|
||||||
|
@sopel.module.event('KICK')
|
||||||
|
@sopel.module.rule('.*')
|
||||||
|
def channels_users_kick(bot, trigger):
|
||||||
|
SpiceBot.channels.kick(bot, trigger)
|
||||||
|
|
||||||
|
|
||||||
|
@sopel.module.event('NICK')
|
||||||
|
@sopel.module.rule('.*')
|
||||||
|
def channels_users_nick(bot, trigger):
|
||||||
|
SpiceBot.channels.nick(bot, trigger)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user