Merge pull request #65 from AnotherCat/db-refactor

Use ORM

Author: quirky-bluejay

Pipfile

@@ -9,6 +9,8 @@ asyncpg = "~=0.23"
 aiohttp = "~=3.7"
 jishaku = "*"
 discord-py-slash-command = "~=1.1"
+tortoise-orm = {extras = ["asyncpg"], version = "*"}
+aerich = "*"
 
 [dev-packages]
 black = "==21.4b2"

Pipfile.lock

@@ -1,8 +1,8 @@
 # Message Manager
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/326569ef23ba4a46848e531a662970c0)](https://app.codacy.com/gh/AnotherCat/message-bot?utm_source=github.com&utm_medium=referral&utm_content=AnotherCat/message-bot&utm_campaign=Badge_Grade_Settings)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) 
-[![time tracker](https://wakatime.com/badge/github/AnotherCat/message-manager.svg)](https://wakatime.com/badge/github/AnotherCat/message-manager)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black) [![wakatime](https://wakatime.com/badge/github/AnotherCat/message-manager.svg)](https://wakatime.com/badge/github/AnotherCat/message-manager)
+
 <!--
 [![Support Server Invite](https://discord.com/api/guilds/742373263593963614/embed.png)](https://discord.gg/xFZu29t)
 -->
@@ -14,7 +14,7 @@ Current version: `v1.7`
 
 ## License
 
-Message Manager is licensed under the [GNU Affero General Public License](https://github.com/AnotherCat/message-bot/blob/master/LICENSE)  
+Message Manager is licensed under the [GNU Affero General Public License](https://github.com/AnotherCat/message-manager/blob/master/LICENSE)  
 Here is a [simplified version](https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)#summary)
 
 ## Invite link

README.md

@@ -0,0 +1,4 @@
+[aerich]
+tortoise_orm = tortoise_config.TORTOISE_ORM
+location = ./migrations
+

aerich.ini

@@ -30,7 +30,7 @@
 
 from discord.ext import commands
 
-from cogs.utils import Context, errors
+from src import Context, errors
 from main import Bot
 
 if TYPE_CHECKING:

cogs/admin.py

@@ -22,7 +22,7 @@
 
 from discord.ext import commands, tasks
 
-from cogs.utils import Context, list_wrappers
+from src import Context, list_wrappers
 from main import Bot
 
 if TYPE_CHECKING:

cogs/listing.py

@@ -27,7 +27,7 @@
 from discord.ext import commands
 from discord_slash import SlashContext, cog_ext
 
-from cogs.utils import Context
+from src import Context
 from main import Bot
 
 if TYPE_CHECKING:
@@ -105,13 +105,13 @@ def create_privacy_embed() -> discord.Embed:
     embed = discord.Embed(
         title="Privacy Policy",
         description="We do store data. Please read our privacy policy.",
-        url="https://github.com/AnotherCat/message-bot/blob/master/PRIVACY_POLICY.md",
+        url="https://github.com/AnotherCat/message-manager/blob/master/PRIVACY_POLICY.md",
         colour=discord.Colour.red(),
         timestamp=datetime.now(timezone.utc),
     )
     embed.add_field(
         name="Where to find the privacy policy",
-        value="My privacy policy is located on [github](https://github.com/AnotherCat/message-bot/blob/master/PRIVACY_POLICY.md)",
+        value="My privacy policy is located on [github](https://github.com/AnotherCat/message-manager/blob/master/PRIVACY_POLICY.md)",
     )
     return embed
 
@@ -139,8 +139,8 @@ def create_docs_embed() -> discord.Embed:
 def create_source_embed() -> discord.Embed:
     return discord.Embed(
         title="Source Code!",
-        description="My [source code](https://github.com/AnotherCat/message-bot)",
-        url="https://github.com/AnotherCat/message-bot",
+        description="My [source code](https://github.com/AnotherCat/message-manager)",
+        url="https://github.com/AnotherCat/message-manager",
         colour=discord.Colour(0xC387C1),
         timestamp=datetime.now(timezone.utc),
     )

cogs/maincog.py

@@ -29,7 +29,7 @@
 
 from discord.ext import commands
 
-from cogs.utils import Context, checks, errors, send_log_once
+from src import Context, checks, errors, send_log_once
 from main import Bot
 
 if TYPE_CHECKING: