Merge branch 'dev'

doc/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v2.0.1
+
+**Changes:**
+
+- Removed mention of already done AFK members when a leggacy contract is added, to avoid this mild annoyance to AFK members
+
 ## v2.0.0
 
 **Changes:**

extensions/checks.py

@@ -91,4 +91,11 @@ def check_is_afk(author: pycord.Member, guild: pycord.Guild):
     afk_role = pycord.utils.get(guild.roles, name="AFK")
     return afk_role in author.roles
 
+def check_is_id_afk(member_id: Union[int, str], guild: pycord.Guild):
+    if isinstance(member_id, str):
+        id: int = int(member_id.replace("alt", ""))
+    else:
+        id: int = member_id
+    return check_is_afk(guild.get_member(id), guild)
+
 #endregion

extensions/utils.py

@@ -2,6 +2,7 @@
 import interactions
 
 import extensions.db_connection as db
+from extensions.checks import check_is_id_afk
 
 import json
 from typing import *
@@ -56,7 +57,8 @@ async def generate_contract_message_content_component(pycord_bot: pycord.Client,
     if is_leggacy:
         already_done_mentions = []
         for id in contract_dic["already_done"]:
-            already_done_mentions.append(await get_member_mention(id, guild, pycord_bot, db_connection))
+            if not check_is_id_afk(id, guild):
+                already_done_mentions.append(await get_member_mention(id, guild, pycord_bot, db_connection))
     remaining_mentions = []
     for id in contract_dic["remaining"]:
         remaining_mentions.append(await get_member_mention(id, guild, pycord_bot, db_connection))