diff options
| -rw-r--r-- | metricity/exts/event_listeners/_syncer_utils.py | 111 | ||||
| -rw-r--r-- | metricity/exts/event_listeners/guild_listeners.py | 106 |
2 files changed, 111 insertions, 106 deletions
diff --git a/metricity/exts/event_listeners/_syncer_utils.py b/metricity/exts/event_listeners/_syncer_utils.py index 8e8c54f..258a165 100644 --- a/metricity/exts/event_listeners/_syncer_utils.py +++ b/metricity/exts/event_listeners/_syncer_utils.py @@ -1,8 +1,12 @@ import discord from pydis_core.utils import logging +from sqlalchemy import update from sqlalchemy.ext.asyncio import AsyncSession from metricity import models +from metricity.bot import Bot +from metricity.config import BotConfig +from metricity.database import async_session log = logging.get_logger(__name__) @@ -39,3 +43,110 @@ async def sync_message(message: discord.Message, sess: AsyncSession, *, from_thr args["thread_id"] = str(thread.id) sess.add(models.Message(**args)) + + +async def sync_channels(bot: Bot, guild: discord.Guild) -> None: + """Sync channels and categories with the database.""" + bot.channel_sync_in_progress.clear() + + log.info("Beginning category synchronisation process") + + async with async_session() as sess: + for channel in guild.channels: + if isinstance(channel, discord.CategoryChannel): + if existing_cat := await sess.get(models.Category, str(channel.id)): + existing_cat.name = channel.name + else: + sess.add(models.Category(id=str(channel.id), name=channel.name, deleted=False)) + + await sess.commit() + + log.info("Category synchronisation process complete, synchronising deleted categories") + + async with async_session() as sess: + await sess.execute( + update(models.Category) + .where(~models.Category.id.in_( + [str(channel.id) for channel in guild.channels if isinstance(channel, discord.CategoryChannel)], + )) + .values(deleted=True), + ) + await sess.commit() + + log.info("Deleted category synchronisation process complete, synchronising channels") + + async with async_session() as sess: + for channel in guild.channels: + if channel.category and channel.category.id in BotConfig.ignore_categories: + continue + + if not isinstance(channel, discord.CategoryChannel): + category_id = str(channel.category.id) if channel.category else None + # Cast to bool so is_staff is False if channel.category is None + is_staff = channel.id in BotConfig.staff_channels or bool( + channel.category and channel.category.id in BotConfig.staff_categories, + ) + if db_chan := await sess.get(models.Channel, str(channel.id)): + db_chan.name = channel.name + else: + sess.add(models.Channel( + id=str(channel.id), + name=channel.name, + category_id=category_id, + is_staff=is_staff, + deleted=False, + )) + + await sess.commit() + + log.info("Channel synchronisation process complete, synchronising deleted channels") + + async with async_session() as sess: + await sess.execute( + update(models.Channel) + .where(~models.Channel.id.in_([str(channel.id) for channel in guild.channels])) + .values(deleted=True), + ) + await sess.commit() + + log.info("Deleted channel synchronisation process complete, synchronising threads") + + async with async_session() as sess: + for thread in guild.threads: + if thread.parent and thread.parent.category: + if thread.parent.category.id in BotConfig.ignore_categories: + continue + else: + # This is a forum channel, not currently supported by Discord.py. Ignore it. + continue + + if db_thread := await sess.get(models.Thread, str(thread.id)): + db_thread.name = thread.name + db_thread.archived = thread.archived + db_thread.auto_archive_duration = thread.auto_archive_duration + db_thread.locked = thread.locked + db_thread.type = thread.type.name + else: + insert_thread(thread, sess) + await sess.commit() + + log.info("Thread synchronisation process complete, finished synchronising guild.") + bot.channel_sync_in_progress.set() + + +async def sync_thread_archive_state(guild: discord.Guild) -> None: + """Sync the archive state of all threads in the database with the state in guild.""" + active_thread_ids = [str(thread.id) for thread in guild.threads] + + async with async_session() as sess: + await sess.execute( + update(models.Thread) + .where(models.Thread.id.in_(active_thread_ids)) + .values(archived=False), + ) + await sess.execute( + update(models.Thread) + .where(~models.Thread.id.in_(active_thread_ids)) + .values(archived=True), + ) + await sess.commit() diff --git a/metricity/exts/event_listeners/guild_listeners.py b/metricity/exts/event_listeners/guild_listeners.py index 3b1053b..a60c291 100644 --- a/metricity/exts/event_listeners/guild_listeners.py +++ b/metricity/exts/event_listeners/guild_listeners.py @@ -98,112 +98,6 @@ class GuildListeners(commands.Cog): self.bot.sync_process_complete.set() - @staticmethod - async def sync_thread_archive_state(guild: discord.Guild) -> None: - """Sync the archive state of all threads in the database with the state in guild.""" - active_thread_ids = [str(thread.id) for thread in guild.threads] - - async with async_session() as sess: - await sess.execute( - update(models.Thread) - .where(models.Thread.id.in_(active_thread_ids)) - .values(archived=False), - ) - await sess.execute( - update(models.Thread) - .where(~models.Thread.id.in_(active_thread_ids)) - .values(archived=True), - ) - await sess.commit() - - async def sync_channels(self, guild: discord.Guild) -> None: - """Sync channels and categories with the database.""" - self.bot.channel_sync_in_progress.clear() - - log.info("Beginning category synchronisation process") - - async with async_session() as sess: - for channel in guild.channels: - if isinstance(channel, discord.CategoryChannel): - if existing_cat := await sess.get(models.Category, str(channel.id)): - existing_cat.name = channel.name - else: - sess.add(models.Category(id=str(channel.id), name=channel.name, deleted=False)) - - await sess.commit() - - log.info("Category synchronisation process complete, synchronising deleted categories") - - async with async_session() as sess: - await sess.execute( - update(models.Category) - .where(~models.Category.id.in_( - [str(channel.id) for channel in guild.channels if isinstance(channel, discord.CategoryChannel)], - )) - .values(deleted=True), - ) - await sess.commit() - - log.info("Deleted category synchronisation process complete, synchronising channels") - - async with async_session() as sess: - for channel in guild.channels: - if channel.category and channel.category.id in BotConfig.ignore_categories: - continue - - if not isinstance(channel, discord.CategoryChannel): - category_id = str(channel.category.id) if channel.category else None - # Cast to bool so is_staff is False if channel.category is None - is_staff = channel.id in BotConfig.staff_channels or bool( - channel.category and channel.category.id in BotConfig.staff_categories, - ) - if db_chan := await sess.get(models.Channel, str(channel.id)): - db_chan.name = channel.name - else: - sess.add(models.Channel( - id=str(channel.id), - name=channel.name, - category_id=category_id, - is_staff=is_staff, - deleted=False, - )) - - await sess.commit() - - log.info("Channel synchronisation process complete, synchronising deleted channels") - - async with async_session() as sess: - await sess.execute( - update(models.Channel) - .where(~models.Channel.id.in_([str(channel.id) for channel in guild.channels])) - .values(deleted=True), - ) - await sess.commit() - - log.info("Deleted channel synchronisation process complete, synchronising threads") - - async with async_session() as sess: - for thread in guild.threads: - if thread.parent and thread.parent.category: - if thread.parent.category.id in BotConfig.ignore_categories: - continue - else: - # This is a forum channel, not currently supported by Discord.py. Ignore it. - continue - - if db_thread := await sess.get(models.Thread, str(thread.id)): - db_thread.name = thread.name - db_thread.archived = thread.archived - db_thread.auto_archive_duration = thread.auto_archive_duration - db_thread.locked = thread.locked - db_thread.type = thread.type.name - else: - _utils.insert_thread(thread, sess) - await sess.commit() - - log.info("Thread synchronisation process complete, finished synchronising guild.") - self.bot.channel_sync_in_progress.set() - @commands.Cog.listener() async def on_guild_channel_create(self, channel: discord.abc.GuildChannel) -> None: """Sync the channels when one is created.""" |