Merge pull request #36 from RedCokeDevelopment/dev

Fix Database Incorrect Schema

Author: RedTea

.github/workflows/python-app.yml

@@ -20,10 +20,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python 3.8
+    - name: Set up Python 3.8.0
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.8.0
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

Teapot.py

@@ -64,7 +64,7 @@
     time_start = time.perf_counter()
     database = teapot.managers.database.__init__()
     db = teapot.managers.database.db(database)
-    db.execute('ALTER DATABASE teapot CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
+    db.execute('ALTER DATABASE `' + teapot.config.db_schema() + '` CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
     db.execute(
         'CREATE TABLE IF NOT EXISTS `guilds` (`guild_id` BIGINT, `guild_name` TINYTEXT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci')
     db.execute(

teapot/config.py

@@ -10,6 +10,12 @@ def bot_owner():
 def bot_token():
     return os.getenv('BOT_TOKEN')
 
+def osu_api_key():
+    return os.getenv('OSU_API_KEY')
+
+def trn_api_key():
+    return os.getenv('TRN_API_KEY')
+
 
 def bot_prefix():
     return eval(os.getenv('BOT_PREFIX', "['/teapot ', '/tp']"))