Merge remote-tracking branch 'origin/feature/pick_game' into feature/…

…pick_game

# Conflicts:
#	src/heckbot/cogs/picker.py

src/heckbot/cogs/picker.py

@@ -7,7 +7,8 @@
 from datetime import datetime
 from datetime import timedelta
 from pathlib import Path
-from urllib.parse import quote, quote_from_bytes
+from urllib.parse import quote
+from urllib.parse import quote_from_bytes
 
 from discord.ext import commands
 from discord.ext.commands import Bot
@@ -95,9 +96,11 @@ def get_pick_link(user_name: str) -> str:
         datetime.utcnow() + timedelta(seconds=TTL)
     ).isoformat()
     token, iv = encrypt(user_name, expiry)
-    return (PICK_SERVER_URL +
-            f'/form?token={quote(b64encode(token))}'
-            f'&iv={quote(b64encode(iv))}')
+    return (
+        PICK_SERVER_URL +
+        f'/form?token={quote(b64encode(token))}'
+        f'&iv={quote(b64encode(iv))}'
+    )
 
 
 class Picker(commands.Cog):

src/heckbot/utils/auth.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import os
 from datetime import datetime
 from datetime import timedelta
@@ -24,15 +26,15 @@ def encrypt(username: str, expiry: str) -> tuple[bytes, bytes]:
     return ciphertext, iv
 
 
-def decrypt(ciphertext: bytes, iv: bytes) -> Optional[str]:
+def decrypt(ciphertext: bytes, iv: bytes) -> str | None:
     cipher = Cipher(
         algorithms.AES(
-            SECRET_KEY
-        ), modes.CFB(iv), backend=default_backend()
+            SECRET_KEY,
+        ), modes.CFB(iv), backend=default_backend(),
     )
     decryptor = cipher.decryptor()
     decrypted_data = decryptor.update(
-        ciphertext
+        ciphertext,
     ) + decryptor.finalize()
     decoded_data = decrypted_data.decode()
     username, timestamp = decoded_data.split(':')