hellmbot/bot.py

@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from hellmbot.env import ENV
-from hellmbot.db import ServersDB
-from discord import Intents, Member, VoiceState
-from discord.ext import commands
-
-
-###############
-# Bot's logic #
-###############
-
-def init_bot() -> commands.Bot:
-    """
-    Initializes the bot object
-
-    :return: Bot class object
-    """
-    intents = Intents.default()
-    intents.message_content = True
-    return commands.Bot(command_prefix="/", intents=intents)
-
-
-# Init bot object
-bot = init_bot()
-
-
-def start() -> None:
-    """
-    Starts bot polling
-    """
-    bot.run(ENV.BOT_TOKEN.fget(None))
-
-
-@bot.command()
-async def create(ctx: commands.Context) -> None:
-    """
-    Creates a group of voice channels to move the user and adds their id to the database
-
-    :param ctx: Command context
-    """
-    server = ctx.guild
-    db = ServersDB(server.id)
-    circles_count = ENV.CIRCLES_COUNT.fget(None)
-    group = await server.create_category(f"{circles_count} Circles of Hell")
-    if db:
-        db.clear_channels()
-    for circle in range(circles_count):
-        vc = await server.create_voice_channel(f"{circle + 1} Circle", category=group)
-        db.add_channel(vc.id, circle + 1)
-
-
-user_before_channels = {}
-
-
-@bot.event
-async def on_voice_state_update(member: Member, before: VoiceState, after: VoiceState):
-    """
-    Moves the user through the group channels if the user has been connected to one of them
-
-    :param member: Discord member class objet
-    :param before: Before state of voice channel
-    :param after: After state of voice channel
-    """
-    server = member.guild.id
-    if before.channel != after.channel:
-        db = ServersDB(server)
-        channels = db.channels
-        if after.channel and after.channel.id in channels:
-            if member.id not in tuple(user_before_channels.keys()):
-                user_before_channels[member.id] = None
-                if before.channel is not None:
-                    user_before_channels[member.id] = before.channel.id
-            current_idx = channels.index(after.channel.id)
-            if current_idx + 1 != len(channels):
-                next_channel = bot.get_channel(channels[current_idx + 1])
-            else:
-                next_id = user_before_channels[member.id]
-                del user_before_channels[member.id]
-                if next_id is None:
-                    next_channel = next_id
-                else:
-                    next_channel = bot.get_channel(next_id)
-            await member.move_to(next_channel)
-
-
-if __name__ == "__main__":
-    start()

hellmbot/db.py

@@ -39,7 +39,7 @@ class DataBase(object):
         lst = [f"{column_title.lower()} {column_type.value}" for column_title, column_type in lst]
         return ", ".join(lst)
 
-    def _execute(self, request: str, params: list[Any] = None) -> None:
+    def execute(self, request: str, params: list[Any] = None) -> None:
         """
         Executes sqlite query
 
@@ -54,7 +54,7 @@ class DataBase(object):
             cursor.execute(request, params)
             db.commit()
 
-    def _gentable(self, table: str, columns: dict[str: DBColumnsTypes]) -> None:
+    def gentable(self, table: str, columns: dict[str: DBColumnsTypes]) -> None:
         """
         Generates table in the database
 
@@ -62,9 +62,9 @@ class DataBase(object):
         :param columns: Columns in the table
         """
         request = f"CREATE TABLE IF NOT EXISTS {table} (id INTEGER PRIMARY KEY, {self.__getcolumns(columns)})"
-        self._execute(request)
+        self.execute(request)
 
-    def _insert(self, table: str, items: dict[str: Any]) -> None:
+    def insert(self, table: str, items: dict[str: Any]) -> None:
         """
         Inserts data into a field of a database table
 
@@ -75,9 +75,9 @@ class DataBase(object):
         columns = ", ".join(columns)
         values = list(items.values())
         request = f"INSERT INTO {table} ({columns}) VALUES ({("?, " * len(values))[:-2]})"
-        self._execute(request, values)
+        self.execute(request, values)
 
-    def _get(self, table: str, column: list[str] = None, where: dict[str: Any] = None, order: str = None) -> list[Any]:
+    def get(self, table: str, column: list[str] = None, where: dict[str: Any] = None, order: str = None) -> list[Any]:
         """
         Returns data from sqlite table
 
@@ -108,10 +108,10 @@ class DataBase(object):
             cursor.execute(*request)
             return cursor.fetchall()
 
-    def _delete(self, table: str, where: dict[str: Any]) -> None:
+    def delete(self, table: str, where: dict[str: Any]) -> None:
         values = list(where.values())
         request = f"DELETE FROM {table} WHERE {", ".join(tuple(where.keys()))} = ({("?, " * len(values))[:-2]})"
-        self._execute(request, values)
+        self.execute(request, values)
 
 
 class ServersDB(DataBase):
@@ -129,7 +129,7 @@ class ServersDB(DataBase):
 
         :param server_id: id of discord server
         """
-        self._gentable(self.TABLE, {
+        self.gentable(self.TABLE, {
             "server_id": DBColumnsTypes.integer_number,  # id of discord server
             "channel_id": DBColumnsTypes.integer_number,  # id of discord voice channel id
             "loop": DBColumnsTypes.integer_number  # Channel sequence number 
@@ -140,22 +140,20 @@ class ServersDB(DataBase):
         """
         Checks the existence of the server in the database table
         """
-        lst = self._get(self.TABLE, ["server_id"])
+        lst = self.get(self.TABLE, ["server_id"])
         if len(lst) > 0:
             return True
         return False
 
-    def add_channel(self, channel_id: int, loop_number: int) -> None:
+    def add_channel(self, channel_id: int) -> None:
         """
         Adds channel to the database
 
         :param channel_id: id of discord channel
-        :param loop_number: Channel sequence number in the group
         """
-        self._insert(self.TABLE, {
+        self.insert(self.TABLE, {
             "server_id": self.server,
-            "channel_id": channel_id,
+            "channel_id": channel_id
-            "loop": loop_number
         })
 
     @property
@@ -165,7 +163,7 @@ class ServersDB(DataBase):
 
         :return: tuple of server channel id's
         """
-        lst = self._get(self.TABLE, ["channel_id"], {"server_id": self.server}, "loop")
+        lst = self.get(self.TABLE, ["channel_id"], {"server_id": self.server}, "loop")
         if len(lst) == 0:
             raise IndexError("This server has no added channels")
         return tuple(map(lambda element: element[0], lst))
@@ -174,7 +172,7 @@ class ServersDB(DataBase):
         """
         Deletes all server channels from the database
         """
-        self._delete(self.TABLE, {"server_id": self.server})
+        self.delete(self.TABLE, {"server_id": self.server})
 
     def __iter__(self) -> Iterable[int]:
         """

hellmbot/env.py

@@ -21,28 +21,3 @@ class ENV(object):
         if env is None:
             return default
         return env
-
-    @property
-    def BOT_TOKEN(self) -> str:
-        """
-        Gets the Discord bot authorization token from the system environment
-
-        :return: Discord bot token
-        """
-        env = environ.get("BOT_TOKEN")
-        if env is None:
-            raise ValueError("Bot token is not set\nTry to install the system ENV BOT_TOKEN\n(export "
-                             "BOT_TOKEN=inserthereyourbottoken)")
-        return env
-
-    @property
-    def CIRCLES_COUNT(self) -> int:
-        """
-        Sets count of channels to be created
-
-        :return: Count of channels
-        """
-        env = environ.get("CIRCLES_COUNT")
-        if env is None:
-            env = 9
-        return env