Merge branch 'v0.3.1'

fix path parsing for cmo and also fix db

Author: m1kql

README.md

@@ -4,10 +4,12 @@
   <br>
 </div>
 
-<img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/yak-fumblepack/pi/Build?logo=github&logoColor=lightgrey&style=plastic">
+<div>
+<img alt="GitHub Workflow Status" src="https://img.shields.io/github/workflow/status/yak-fumblepack/pi/Build?logo=github&logoColor=lightgrey&style=plastic"> 
 <img alt="GitHub release (latest by date)" src="https://img.shields.io/github/v/release/yak-fumblepack/pi?style=plastic">
 <img alt="GitHub" src="https://img.shields.io/github/license/yak-fumblepack/pi?style=plastic">
 <a href="https://discord.com/api/oauth2/authorize?client_id=842500814625832990&permissions=0&scope=bot"><img src="https://img.shields.io/badge/Invite-7289DA?style=plastic&logo=discord&logoColor=white" alt="Invite the bot to your discord server"></a>
+</div>
 
 ## Overview
 

bot/src/cogs/math/contest_problems.py

@@ -146,7 +146,7 @@ async def cmo(self, ctx):
 
         cmo_year = random.randint(1969, 1973)
         cmo_question = random.randint(1, 9)
-        requested_path = "CMO/%d/%d", cmo_year, cmo_question
+        requested_path = f"CMO/{cmo_year}/{cmo_question}"
 
         await ctx.send(
             f"https://raw.githubusercontent.com/yak-fumblepack/mathcontests/master/{requested_path}/statement.png"
@@ -177,9 +177,9 @@ async def aime(self, ctx):
         requested_path = ""
 
         if aime_year < 2000:
-            requested_path = "AIME/%d/%d", aime_year, aime_question
+            requested_path = f"AIME/{aime_year}/{aime_question}"
         else:
-            requested_path = "AIME/%d/%s/%d", aime_year, aime_version, aime_question
+            requested_path = f"AIME/{aime_year}/{aime_version}/{aime_question}"
 
         await ctx.send(
             f"https://raw.githubusercontent.com/yak-fumblepack/mathcontests/master/{requested_path}/statement.png"

bot/src/cogs/utility/db.py

@@ -114,6 +114,7 @@ async def open_user_db(guild_id, user_id):
             usajmo_attempted: 0,
             amc10_points: 0,
             amc12_points: 0,
+            cmo_attempted: 0,
         }
         db.collection(str(guild_id)).document(str(user_id)).set(data)
 
@@ -141,3 +142,8 @@ async def get_guild_db(guild_id):
         return guild_collection
     except Exception:
         pass
+
+
+async def get_all():
+    collection_ref = db.collections()
+    return collection_ref

bot/src/requirements.txt

@@ -1,4 +1,5 @@
 aiohttp==3.7.4.post0
+aiopyston==1.2.1
 appdirs==1.4.4
 async-timeout==3.0.1
 attrs==21.2.0

requirements.txt

@@ -1,4 +1,5 @@
 aiohttp==3.7.4.post0
+aiopyston==1.2.1
 appdirs==1.4.4
 async-timeout==3.0.1
 attrs==21.2.0