Merge pull request 'v0.1.0-rc.4' (#19) from dev into main

Reviewed-on: #19

classes/holo_bot.py

@@ -4,15 +4,3 @@ from libbot.pycord.classes import PycordBot
 class HoloBot(PycordBot):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-
-    async def start(self, *args, **kwargs) -> None:
-        if self.scheduler is not None:
-            self.scheduler.start()
-
-        await super().start(*args, **kwargs)
-
-    async def close(self) -> None:
-        if self.scheduler is not None:
-            self.scheduler.shutdown()
-
-        await super().close()

classes/holo_user.py

@@ -1,9 +1,9 @@
 import logging
-from typing import Any, Union, Dict
+from typing import Any, Dict
 
 from bson import ObjectId
 from discord import User, Member
-from libbot import config_get
+from libbot.utils import config_get
 
 from errors import UserNotFoundError
 from modules.database import col_warnings, sync_col_users, sync_col_warnings, col_users
@@ -12,11 +12,11 @@ logger = logging.getLogger(__name__)
 
 
 class HoloUser:
-    def __init__(self, user: Union[User, Member, int]) -> None:
+    def __init__(self, user: User | Member | int) -> None:
         """Get an object that has a proper binding between Discord ID and database
 
         ### Args:
-            * `user` (Union[User, Member, int]): Object from which ID can be extracted
+            * `user` (User | Member | int): Object from which ID can be extracted
 
         ### Raises:
             * `UserNotFoundError`: User with such ID does not seem to exist in database
@@ -24,17 +24,15 @@ class HoloUser:
 
         self.id: int = user if not hasattr(user, "id") else user.id
 
-        jav_user: Union[Dict[str, Any], None] = sync_col_users.find_one(
-            {"user": self.id}
-        )
+        jav_user: Dict[str, Any] | None = sync_col_users.find_one({"user": self.id})
 
         if jav_user is None:
             raise UserNotFoundError(user=user, user_id=self.id)
 
         self.db_id: ObjectId = jav_user["_id"]
 
-        self.customrole: Union[int, None] = jav_user["customrole"]
-        self.customchannel: Union[int, None] = jav_user["customchannel"]
+        self.customrole: int | None = jav_user["customrole"]
+        self.customchannel: int | None = jav_user["customchannel"]
         self.warnings: int = self.warns()
 
     def warns(self) -> int:
@@ -43,9 +41,7 @@ class HoloUser:
         ### Returns:
             * `int`: Number of warnings
         """
-        warns: Union[Dict[str, Any], None] = sync_col_warnings.find_one(
-            {"user": self.id}
-        )
+        warns: Dict[str, Any] | None = sync_col_warnings.find_one({"user": self.id})
 
         return 0 if warns is None else warns["warns"]
 
@@ -55,9 +51,7 @@ class HoloUser:
         ### Args:
             * `count` (int, optional): Count of warnings to be added. Defaults to 1.
         """
-        warns: Union[Dict[str, Any], None] = await col_warnings.find_one(
-            {"user": self.id}
-        )
+        warns: Dict[str, Any] | None = await col_warnings.find_one({"user": self.id})
 
         if warns is not None:
             await col_warnings.update_one(
@@ -88,11 +82,11 @@ class HoloUser:
         logger.info("Set attribute %s of user %s to %s", key, self.id, value)
 
     @staticmethod
-    async def is_moderator(member: Union[User, Member]) -> bool:
+    async def is_moderator(member: User | Member) -> bool:
         """Check if user is moderator or council member
 
         ### Args:
-            * `member` (Union[User, Member]): Member object
+            * `member` (User | Member): Member object
 
         ### Returns:
             `bool`: `True` if member is a moderator or member of council and `False` if not
@@ -100,8 +94,8 @@ class HoloUser:
         if isinstance(member, User):
             return False
 
-        moderator_role: Union[int, None] = await config_get("moderators", "roles")
-        council_role: Union[int, None] = await config_get("council", "roles")
+        moderator_role: int | None = await config_get("moderators", "roles")
+        council_role: int | None = await config_get("council", "roles")
 
         for role in member.roles:
             if role.id in (moderator_role, council_role):
@@ -110,11 +104,11 @@ class HoloUser:
         return False
 
     @staticmethod
-    async def is_council(member: Union[User, Member]) -> bool:
+    async def is_council(member: User | Member) -> bool:
         """Check if user is a member of council
 
         ### Args:
-            * `member` (Union[User, Member]): Member object
+            * `member` (User | Member): Member object
 
         ### Returns:
             `bool`: `True` if member is a member of council and `False` if not

cogs/admin.py

@@ -1,6 +1,5 @@
 import logging
 import sys
-from typing import Union
 
 from discord import (
     ApplicationContext,
@@ -13,8 +12,7 @@ from discord import (
 )
 from discord import utils as ds_utils
 from discord.ext import commands
-from libbot import config_get
-from libbot.sync import config_get as sync_config_get
+from libbot.utils import config_get
 
 from classes.holo_bot import HoloBot
 from enums import Color
@@ -31,93 +29,10 @@ class Admin(commands.Cog):
     def __init__(self, client: HoloBot):
         self.client: HoloBot = client
 
-    # Disabled because warning functionality is temporarily not needed
-    # @slash_command(
-    #     name="warning",
-    #     description="Попередити юзера про порушення правил",
-    #     guild_ids=[config_get_sync("guild")],
-    # )
-    # @option("user", description="Користувач")
-    # @option("reason", description="Причина")
-    # async def warn_cmd(
-    #     self,
-    #     ctx: ApplicationContext,
-    #     user: User,
-    #     reason: str = "Не вказана",
-    # ):
-    #     logging.info(f"User {ctx.user.id} warned {user.id} for {reason}")
-    #     await ctx.defer()
-    #     jav_user = HoloUser(user)
-    #     if ctx.user.id in await config_get("admins"):
-    #         logging.info(
-    #             f"Moderator {guild_name(ctx.user)} warned {guild_name(user)} for {reason} (has {jav_user.warnings} warns)"
-    #         )
-    #         if jav_user.warnings >= 5:
-    #             logging.info(
-    #                 f"User {guild_name(user)} was banned due to a big amount of warns ({jav_user.warnings})"
-    #             )
-    #             await user.send(
-    #                 embed=Embed(
-    #                     title="Перманентне блокування",
-    #                     description=f"Вас було заблоковано за неодноразове порушення правил сервера.",
-    #                     color=Color.fail,
-    #                 )
-    #             )
-    #             await user.ban(reason=reason)
-    #         elif jav_user.warnings >= 2:
-    #             logging.info(
-    #                 f"User {guild_name(user)} was muted due to a big amount of warns ({jav_user.warnings})"
-    #             )
-    #             jav_user.warn(reason=reason)
-    #             await user.send(
-    #                 embed=Embed(
-    #                     title="Тимчасове блокування",
-    #                     description=f"Причина: `{reason}`\n\nНа вашому рахунку вже {jav_user.warnings} попереджень. Вас було тимчасово заблоковано на **1 годину**.\n\nЯкщо Ви продовжите порушувати правила сервера – згодом Вас заблокують.",
-    #                     color=0xDED56B,
-    #                 )
-    #             )
-    #             await user.timeout_for(timedelta(hours=1), reason=reason)
-    #         else:
-    #             jav_user.warn()
-
-    #         await ctx.respond(
-    #             embed=Embed(
-    #                 title="Попередження",
-    #                 description=f"{user.mention} Будь ласка, не порушуйте правила. Ви отримали попередження з причини `{reason}`.\n\nЯкщо Ви продовжите порушувати правила – це може призвести до блокування в спільноті.",
-    #                 color=0xDED56B,
-    #             )
-    #         )
-    #     else:
-    #         logging.warning(
-    #             f"User {guild_name(ctx.user)} tried to use /warn but permission denied"
-    #         )
-    #         await ctx.respond(
-    #             embed=Embed(
-    #                 title="Відмовлено в доступі",
-    #                 description="Здається, це команда лише для модераторів",
-    #                 color=Color.fail,
-    #             )
-    #         )
-    #         mod_role = ds_utils.get(
-    #             ctx.user.guild.roles, id=await config_get("moderators", "roles")
-    #         )
-    #         admin_chan = ds_utils.get(
-    #             ctx.user.guild.channels,
-    #             id=await config_get("adminchat", "channels", "text"),
-    #         )
-    #         await admin_chan.send(
-    #             content=f"{mod_role.mention}",
-    #             embed=Embed(
-    #                 title="Неавторизований запит",
-    #                 description=f"Користувач {ctx.user.mention} запитав у каналі {ctx.channel.mention} команду, до якої не повинен мати доступу/бачити.",
-    #                 color=Color.fail,
-    #             ),
-    #         )
-
     @slash_command(
         name="clear",
         description="Видалити деяку кількість повідомлень в каналі",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     @option("amount", description="Кількість")
     @option("user", description="Користувач", default=None)
@@ -127,6 +42,10 @@ class Admin(commands.Cog):
         amount: int,
         user: User,
     ) -> None:
+        """Command /clear <amount> [<user>]
+
+        Removes last <amount> messages in the current channel. Optionally from a specific user.
+        """
         if ctx.user.id in self.client.owner_ids:
             logging.info(
                 "User %s removed %s message(s) in %s",
@@ -161,10 +80,10 @@ class Admin(commands.Cog):
             )
         )
 
-        mod_role: Union[Role, None] = ds_utils.get(
+        mod_role: Role | None = ds_utils.get(
             ctx.user.guild.roles, id=await config_get("moderators", "roles")
         )
-        admin_chan: Union[TextChannel, None] = ds_utils.get(
+        admin_chan: TextChannel | None = ds_utils.get(
             ctx.user.guild.channels,
             id=await config_get("adminchat", "channels", "text"),
         )
@@ -182,9 +101,13 @@ class Admin(commands.Cog):
     @slash_command(
         name="reboot",
         description="Перезапустити бота",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     async def reboot_cmd(self, ctx: ApplicationContext) -> None:
+        """Command /reboot
+
+        Stops the bot. Is called "reboot" because it's assumed that the bot has automatic restart.
+        """
         await ctx.defer(ephemeral=True)
 
         if ctx.user.id in self.client.owner_ids:
@@ -217,10 +140,10 @@ class Admin(commands.Cog):
             )
         )
 
-        mod_role: Union[Role, None] = ds_utils.get(
+        mod_role: Role | None = ds_utils.get(
             ctx.user.guild.roles, id=await config_get("moderators", "roles")
         )
-        admin_chan: Union[TextChannel, None] = ds_utils.get(
+        admin_chan: TextChannel | None = ds_utils.get(
             ctx.user.guild.channels,
             id=await config_get("adminchat", "channels", "text"),
         )

cogs/analytics.py

@@ -16,11 +16,13 @@ class Analytics(commands.Cog):
 
     @Cog.listener()
     async def on_message(self, message: Message) -> None:
+        """Listener that collects analytical data (stickers, attachments, messages)."""
         if (
             (message.author != self.client.user)
             and (message.author.bot is False)
             and (message.author.system is False)
         ):
+            # Handle stickers
             stickers: List[Dict[str, Any]] = []
 
             for sticker in message.stickers:
@@ -33,6 +35,7 @@ class Analytics(commands.Cog):
                     }
                 )
 
+            # Handle attachments
             attachments: List[Dict[str, Any]] = []
 
             for attachment in message.attachments:
@@ -49,6 +52,7 @@ class Analytics(commands.Cog):
                     }
                 )
 
+            # Insert entry into the database
             await col_analytics.insert_one(
                 {
                     "user": message.author.id,

cogs/custom_channels.py

@@ -1,13 +1,12 @@
 import logging
-from typing import Any, Dict, Union
+from typing import Any, Dict
 
 from discord import ApplicationContext, Embed, option, TextChannel, Role
 from discord import utils as ds_utils
 from discord.abc import GuildChannel
 from discord.commands import SlashCommandGroup
 from discord.ext import commands
-from libbot import config_get
-from libbot.sync import config_get as sync_config_get
+from libbot.utils import config_get
 
 from classes.holo_bot import HoloBot
 from classes.holo_user import HoloUser
@@ -35,7 +34,7 @@ class CustomChannels(commands.Cog):
     @custom_channel_group.command(
         name="get",
         description="Отримати персональний текстовий канал",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     @option("name", description="Назва каналу")
     @option("reactions", description="Дозволити реакції")
@@ -43,6 +42,10 @@ class CustomChannels(commands.Cog):
     async def custom_channel_get_cmd(
         self, ctx: ApplicationContext, name: str, reactions: bool, threads: bool
     ) -> None:
+        """Command /customchannel get <name> <reactions> <threads>
+
+        Command to create a custom channel for a user.
+        """
         holo_user_ctx: HoloUser = HoloUser(ctx.user)
 
         # Return if the user is using the command outside of a guild
@@ -109,9 +112,7 @@ class CustomChannels(commands.Cog):
         bots: Dict[str, Any] = await config_get("bots")
 
         for bot in bots:
-            role: Union[Role, None] = ds_utils.get(
-                ctx.user.guild.roles, id=bots[bot]["role"]
-            )
+            role: Role | None = ds_utils.get(ctx.user.guild.roles, id=bots[bot]["role"])
 
             if role is not None:
                 await created_channel.set_permissions(
@@ -122,7 +123,7 @@ class CustomChannels(commands.Cog):
     @custom_channel_group.command(
         name="edit",
         description="Змінити параметри особистого каналу",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     @option("name", description="Назва каналу")
     @option("reactions", description="Дозволити реакції")
@@ -130,9 +131,13 @@ class CustomChannels(commands.Cog):
     async def custom_channel_edit_cmd(
         self, ctx: ApplicationContext, name: str, reactions: bool, threads: bool
     ) -> None:
+        """Command /customchannel edit <name> <reactions> <threads>
+
+        Command to change properties of a custom channel.
+        """
         holo_user_ctx: HoloUser = HoloUser(ctx.user)
 
-        custom_channel: Union[TextChannel, None] = ds_utils.get(
+        custom_channel: TextChannel | None = ds_utils.get(
             ctx.guild.channels, id=holo_user_ctx.customchannel
         )
 
@@ -167,12 +172,15 @@ class CustomChannels(commands.Cog):
     @custom_channel_group.command(
         name="remove",
         description="Відібрати канал, знищуючи його, та частково повернути кошти",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     @option("confirm", description="Підтвердження операції")
     async def custom_channel_remove_cmd(
         self, ctx: ApplicationContext, confirm: bool = False
     ) -> None:
+        """Command /customchannel remove [<confirm>]
+
+        Command to remove a custom channel. Requires additional confirmation."""
         holo_user_ctx: HoloUser = HoloUser(ctx.user)
 
         # Return if the user does not have a custom channel
@@ -189,7 +197,7 @@ class CustomChannels(commands.Cog):
 
         await ctx.defer()
 
-        custom_channel: Union[TextChannel, None] = ds_utils.get(
+        custom_channel: TextChannel | None = ds_utils.get(
             ctx.guild.channels, id=holo_user_ctx.customchannel
         )
 

cogs/data.py

@@ -2,16 +2,14 @@ import logging
 from logging import Logger
 from os import makedirs
 from pathlib import Path
-from typing import Union, List, Dict, Any
+from typing import List, Dict, Any
 from uuid import uuid4
 
 from discord import ApplicationContext, Embed, File, option, Role, TextChannel
 from discord import utils as ds_utils
 from discord.commands import SlashCommandGroup
 from discord.ext import commands
-from libbot import config_get
-from libbot.sync import config_get as sync_config_get
-from libbot.sync import json_write as sync_json_write
+from libbot.utils import config_get, json_write
 
 from classes.holo_bot import HoloBot
 from classes.holo_user import HoloUser
@@ -31,12 +29,15 @@ class Data(commands.Cog):
     @data.command(
         name="export",
         description="Експортувати дані",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     @option(
         "kind", description="Тип даних, які треба експортувати", choices=["Користувачі"]
     )
     async def data_export_cmd(self, ctx: ApplicationContext, kind: str) -> None:
+        """Command /data export <kind>
+
+        Command to export specific kind of data."""
         await ctx.defer()
 
         # Return if the user is not an owner and not in the council
@@ -56,10 +57,10 @@ class Data(commands.Cog):
                 )
             )
 
-            mod_role: Union[Role, None] = ds_utils.get(
+            mod_role: Role | None = ds_utils.get(
                 ctx.user.guild.roles, id=await config_get("moderators", "roles")
             )
-            admin_chan: Union[TextChannel, None] = ds_utils.get(
+            admin_chan: TextChannel | None = ds_utils.get(
                 ctx.user.guild.channels,
                 id=await config_get("adminchat", "channels", "text"),
             )
@@ -94,19 +95,26 @@ class Data(commands.Cog):
                     }
                 )
 
-            sync_json_write(users, Path(f"tmp/{uuid}"))
+            # Temporary file must be written synchronously,
+            # otherwise it will not be there when ctx.respond() is be called
+            json_write(users, Path(f"tmp/{uuid}"))
 
             await ctx.respond(file=File(Path(f"tmp/{uuid}"), filename="users.json"))
 
     @data.command(
         name="migrate",
         description="Мігрувати всіх користувачів до бази",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     @option(
         "kind", description="Тип даних, які треба експортувати", choices=["Користувачі"]
     )
     async def data_migrate_cmd(self, ctx: ApplicationContext, kind: str) -> None:
+        """Command /migrate <kind>
+
+        Command to migrate specific kind of data.
+
+        Migration of users in this case means creation of their DB entries."""
         await ctx.defer()
 
         # Return if the user is not an owner and not in the council
@@ -126,10 +134,10 @@ class Data(commands.Cog):
                 )
             )
 
-            mod_role: Union[Role, None] = ds_utils.get(
+            mod_role: Role | None = ds_utils.get(
                 ctx.user.guild.roles, id=await config_get("moderators", "roles")
             )
-            admin_chan: Union[TextChannel, None] = ds_utils.get(
+            admin_chan: TextChannel | None = ds_utils.get(
                 ctx.user.guild.channels,
                 id=await config_get("adminchat", "channels", "text"),
             )

cogs/fun.py

@@ -2,8 +2,7 @@ import logging
 
 from discord import ApplicationContext, Embed, User, option, slash_command
 from discord.ext import commands
-from libbot import config_get
-from libbot.sync import config_get as sync_config_get
+from libbot.utils import config_get
 
 from classes.holo_bot import HoloBot
 from modules.utils_sync import guild_name
@@ -19,15 +18,18 @@ class Fun(commands.Cog):
     @slash_command(
         name="action",
         description="Провести над користувачем РП дію",
-        guild_ids=[sync_config_get("guild")],
+        guild_ids=[config_get("guild")],
     )
     @option(
         "type",
         description="Тип дії, яку хочете провести з користувачем",
-        choices=sync_config_get("actions").keys(),
+        choices=config_get("actions").keys(),
     )
     @option("user", description="Користувач")
     async def action_cmd(self, ctx: ApplicationContext, type: str, user: User) -> None:
+        """Command /action <type> <user>
+
+        Command to perform some RP action on a user and send them a GIF."""
         await ctx.defer()
 
         action: str = await config_get("category", "actions", type)

cogs/logger.py

@@ -1,13 +1,16 @@
-from typing import Dict, Any, Union
+import logging
+from typing import Dict, Any
 
-from discord import Member, Message, TextChannel
+from discord import Member, Message, TextChannel, MessageType
 from discord import utils as ds_utils
 from discord.ext import commands
-from libbot import config_get
+from libbot.utils import config_get
 
 from classes.holo_bot import HoloBot
 from modules.database import col_users
 
+logger = logging.getLogger(__name__)
+
 
 class Logger(commands.Cog):
     def __init__(self, client: HoloBot):
@@ -15,6 +18,7 @@ class Logger(commands.Cog):
 
     @commands.Cog.listener()
     async def on_message(self, message: Message):
+        """Message listener. All actions on messages remain here for now."""
         if (
             (message.author != self.client.user)
             and (message.author.bot is False)
@@ -31,17 +35,31 @@ class Logger(commands.Cog):
 
                 await col_users.insert_one(document=user)
 
+        if (
+            (message.type == MessageType.thread_created)
+            and (message.channel is not None)
+            and (
+                await col_users.count_documents({"customchannel": message.channel.id})
+                > 0
+            )
+        ):
+            await message.delete()
+
     @commands.Cog.listener()
     async def on_member_join(self, member: Member) -> None:
-        welcome_chan: Union[TextChannel, None] = ds_utils.get(
+        """Member join handler. All actions on member join remain here for now."""
+        welcome_chan: TextChannel | None = ds_utils.get(
             self.client.get_guild(await config_get("guild")).channels,
             id=await config_get("welcome", "channels", "text"),
         )
-        rules_chan: Union[TextChannel, None] = ds_utils.get(
+        rules_chan: TextChannel | None = ds_utils.get(
             self.client.get_guild(await config_get("guild")).channels,
             id=await config_get("rules", "channels", "text"),
         )
 
+        if welcome_chan is None:
+            logger.warning("Could not find a welcome channel by its id")
+
         if (
             (member != self.client.user)
             and (member.bot is False)

cogs/utility.py

@@ -3,7 +3,7 @@ from logging import Logger
 
 from discord import Activity, ActivityType
 from discord.ext import commands
-from libbot import config_get
+from libbot.utils import config_get
 
 from classes.holo_bot import HoloBot
 
@@ -16,6 +16,7 @@ class Utility(commands.Cog):
 
     @commands.Cog.listener()
     async def on_ready(self) -> None:
+        """Listener for the event when bot connects to Discord and becomes "ready"."""
         logger.info("Logged in as %s", self.client.user)
 
         activity_type: str = await config_get("type", "status")

main.py

@@ -4,7 +4,7 @@ from logging import Logger
 from pathlib import Path
 
 from discord import LoginFailure, Intents
-from libbot.sync import config_get as sync_config_get
+from libbot.utils import config_get
 
 from classes.holo_bot import HoloBot
 from modules.scheduler import scheduler
@@ -38,7 +38,7 @@ def main() -> None:
     client.load_extension("cogs")
 
     try:
-        client.run(sync_config_get("bot_token", "bot"))
+        client.run(config_get("bot_token", "bot"))
     except LoginFailure as exc:
         logger.error("Provided bot token is invalid: %s", exc)
     except KeyboardInterrupt:

modules/database.py

@@ -1,12 +1,12 @@
 from typing import Dict, Any
 
 from async_pymongo import AsyncClient, AsyncCollection, AsyncDatabase
-from libbot.sync import config_get as sync_config_get
+from libbot.utils import config_get
 from pymongo import MongoClient
 from pymongo.synchronous.collection import Collection
 from pymongo.synchronous.database import Database
 
-db_config: Dict[str, Any] = sync_config_get("database")
+db_config: Dict[str, Any] = config_get("database")
 
 con_string: str = (
     "mongodb://{0}:{1}/{2}".format(

modules/utils_sync.py

@@ -1,9 +1,7 @@
-from typing import Union
-
 from discord import Member, User
 
 
-def guild_name(member: Union[Member, User]) -> str:
+def guild_name(member: Member | User) -> str:
     if isinstance(member, User):
         return member.name
 

requirements.txt

@@ -5,6 +5,7 @@ requests>=2.32.2
 aiofiles~=24.1.0
 apscheduler>=3.10.0
 async_pymongo==0.1.11
-libbot[speed,pycord]==3.3.1
+libbot[speed,pycord]==4.0.0
+typing-extensions~=4.12.2
 ujson~=5.10.0
 WaifuPicsPython==0.2.0