Improved board cog display

Ambratolm · Ambratolm · commit 59fc8fbc31aa · 2025-02-27T03:43:59.000Z
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   deploy:
+    if: github.repository == 'simple-works/ACT'
     runs-on: ubuntu-latest
 
     steps:
diff --git a/bot/cogs/board_cog.py b/bot/cogs/board_cog.py
@@ -2,12 +2,12 @@
 
 from discord import Color, Embed, Interaction, Member, User, app_commands
 from discord.ext.commands import Cog
-from humanize import intcomma, naturaltime
+from humanize import intcomma, intword, metric, naturalsize, naturaltime, ordinal
 from odmantic import query
+from tabulate import tabulate
 
 from bot.main import ActBot
 from db.actor import Actor
-from humanize import intword, metric, ordinal
 
 
 class Board(Cog, description="Allows players to view their data."):
@@ -49,11 +49,11 @@ async def profile(
         )
         embed.add_field(
             name="Experience",
-            value=f"⏫ **{actor.xp}** / {actor.next_level_xp}\n{actor.xp_bar}",
+            value=f"⏫ **{intcomma(actor.xp)}** / {actor.next_level_xp}\n{actor.xp_bar}",
         )
         embed.add_field(name="", value="", inline=False)
-        embed.add_field(name="Gold", value=f"💰 **{actor.gold}**")
-        embed.add_field(name="Items", value=f"🎒 **{len(actor.items)}**")
+        embed.add_field(name="Gold", value=f"💰 **{intcomma(actor.gold)}**")
+        embed.add_field(name="Items", value=f"🎒 **{intcomma(len(actor.items))}**")
         if isinstance(member, Member):
             embed.add_field(
                 name="Joined",
@@ -105,22 +105,24 @@ async def leaderboard(self, interaction: Interaction):
         for i, actor in enumerate(actors):
             if i == 0:
                 top_actor = actor
-            name = f"{actor.display_name} ({actor.name})"
+            name = f"{actor.display_name} @{actor.name}"
             rank = actor.rank_name
             level = str(actor.level)
-            xp = intcomma(actor.xp)
-            gold = intcomma(actor.gold)
-            leaderboard_text += (
-                f"# {(i+1):<2} {name}\n\t 🏆{rank:<2}  🏅{level}  ⏫{xp}  💰{gold}\n\n"
-            )
+            xp = naturalsize(actor.xp, binary=False, gnu=True).replace("B", "")
+            gold = naturalsize(actor.gold, binary=False, gnu=True).replace("B", "")
+            leaderboard_text += f"#{(i+1):<2} {name}\n\t 🏆{rank:<2} 🏅{level:<2} ⏫{xp:<8} 💰{gold}\n\n"
         leaderboard_text += "```"
 
         # Create embed
         embed = Embed(title="🏆 Leaderboard", color=Color.blue())
-        top_member = guild.get_member(top_actor.id) or await guild.fetch_member(
-            top_actor.id
-        )
-        if top_member:
-            embed.set_thumbnail(url=top_member.display_avatar)
+        try:
+            top_member = guild.get_member(top_actor.id) or await guild.fetch_member(
+                top_actor.id
+            )
+            if top_member:
+                embed.set_thumbnail(url=top_member.display_avatar)
+        except:
+            pass
         embed.add_field(name="", value=leaderboard_text, inline=False)
         await interaction.followup.send(embed=embed)
+        await interaction.followup.send(embed=embed)
diff --git a/bot/cogs/farm_cog.py b/bot/cogs/farm_cog.py
@@ -93,11 +93,9 @@ async def on_message(self, message: Message):
     @staticmethod
     def calculate_xp_reward(message: Message):
         word_count = 0
-        message_content = message.content
 
         # Exclude URLs
-        message_content = re.sub(r"https?://\S+", "", message_content)  # Remove URLs
-        word_count += len(message_content.split())
+        word_count += len(re.sub(r"https?://\S+", "", message.content).split())
 
         # Handle embeds
         if message.embeds:
diff --git a/bot/cogs/filter_cog.py b/bot/cogs/filter_cog.py
@@ -16,6 +16,7 @@
 # * Filter Cog
 # ----------------------------------------------------------------------------------------------------
 class Filter(Cog, description="Filters blacklisted message content."):
+    TOLERANCE = 0.99  # Between 0 and 1
     MAX_OFFENSES = 5
     GOLD_PENALTY = 500
 
@@ -96,12 +97,12 @@ async def on_message(self, message: Message):
         embed.set_thumbnail(url=member.display_avatar.url)
         await censored_message.reply(embed=embed)
 
-    @staticmethod
-    def get_profane_words(words: list[str]) -> list[str]:
+    @classmethod
+    def get_profane_words(cls, words: list[str]) -> list[str]:
         """Get list of profane words from given list. If non found, get empty list."""
         predictions = predict_prob(words)
         profane_words = []
         for i, word in enumerate(words):
-            if predictions[i] >= 0.8:  # 1 means profane, 0 means clean
+            if predictions[i] >= cls.TOLERANCE:  # 1 means profane, 0 means clean
                 profane_words.append(word)
         return profane_words
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,6 +15,7 @@ dependencies = [
     "odmantic>=1.0.2",
     "pydantic>=2.10.6",
     "python-dotenv>=1.0.1",
+    "tabulate>=0.9.0",
 ]
 #----------------------------------------------------------------------------------------------------
 [dependency-groups]
diff --git a/uv.lock b/uv.lock
diff --git a/z_test/_utils.ipynb b/z_test/_utils.ipynb
@@ -63,35 +63,43 @@
      "output_type": "stream",
      "text": [
       "Bad words:\n",
-      "#0 Shoot: 75% (0.7548510274136075)\n",
-      "#1 Ohh: 54% (0.5386781922217238)\n",
-      "#2 We: 4% (0.03686327802381447)\n",
-      "#3 will: 4% (0.03686327802381447)\n",
-      "#4 test: 1% (0.008391262960679548)\n",
-      "#5 CuNt: 100% (0.9999905004769302)\n",
-      "#6 and: 4% (0.03686327802381447)\n",
-      "#7 FuCk.: 100% (0.9999999999972535)\n",
-      "#8 Maybe,: 3% (0.0326957016621721)\n",
-      "#9 Yeah: 7% (0.07411545808528545)\n",
-      "#10 bItch,: 100% (0.9999999999500696)\n",
-      "#11 What?: 4% (0.03686327802381447)\n",
-      "#12 This: 4% (0.03686327802381447)\n",
-      "#13 Is: 4% (0.03686327802381447)\n",
-      "#14 cring: 4% (0.03686327802381447)\n",
-      "#15 DuMbAsS: 100% (0.9989037354074615)\n",
-      "#16 Please: 4% (0.03686327802381447)\n",
-      "#17 no: 4% (0.03686327802381447)\n",
-      "#18 bad: 12% (0.1226694265167477)\n",
-      "#19 words: 4% (0.03613674029367816)\n"
+      "Shoot:\t 75 %\n",
+      "shit:\t 100 %\n",
+      "hate:\t 90 %\n",
+      "ugly:\t 89 %\n",
+      "sh:\t 85 %\n",
+      "shut:\t 98 %\n",
+      "up:\t 4 %\n",
+      "Ohh:\t 54 %\n",
+      "We:\t 4 %\n",
+      "will:\t 4 %\n",
+      "test:\t 1 %\n",
+      "CuNt:\t 100 %\n",
+      "and:\t 4 %\n",
+      "FuCk.:\t 100 %\n",
+      "Maybe,:\t 3 %\n",
+      "Yeah:\t 7 %\n",
+      "bItch,:\t 100 %\n",
+      "What?:\t 4 %\n",
+      "This:\t 4 %\n",
+      "Is:\t 4 %\n",
+      "cring:\t 4 %\n",
+      "DuMbAsS:\t 100 %\n",
+      "Please:\t 4 %\n",
+      "no:\t 4 %\n",
+      "bad:\t 12 %\n",
+      "words:\t 4 %\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "array([0.75485103, 0.53867819, 0.03686328, 0.03686328, 0.00839126,\n",
-       "       0.9999905 , 0.03686328, 1.        , 0.0326957 , 0.07411546,\n",
-       "       1.        , 0.03686328, 0.03686328, 0.03686328, 0.03686328,\n",
-       "       0.99890374, 0.03686328, 0.03686328, 0.12266943, 0.03613674])"
+       "array([0.75485103, 0.99999978, 0.90172162, 0.89174782, 0.84905614,\n",
+       "       0.98060388, 0.03686328, 0.53867819, 0.03686328, 0.03686328,\n",
+       "       0.00839126, 0.9999905 , 0.03686328, 1.        , 0.0326957 ,\n",
+       "       0.07411546, 1.        , 0.03686328, 0.03686328, 0.03686328,\n",
+       "       0.03686328, 0.99890374, 0.03686328, 0.03686328, 0.12266943,\n",
+       "       0.03613674])"
       ]
      },
      "execution_count": 12,
@@ -102,12 +110,12 @@
    "source": [
     "from profanity_check import predict, predict_prob\n",
     "\n",
-    "content = \"Shoot Ohh We will test CuNt and FuCk. Maybe, Yeah bItch, What? This Is cring DuMbAsS Please no bad words \".split()\n",
+    "content = \"Shoot shit hate ugly sh shut up Ohh We will test CuNt and FuCk. Maybe, Yeah bItch, What? This Is cring DuMbAsS Please no bad words \".split()\n",
     "predictions = predict_prob(content)\n",
     "\n",
     "print(\"Bad words:\")\n",
     "for i, prefiction in enumerate(predictions):\n",
-    "    print(f\"#{i}\", f\"{content[i]}:\",  f\"{round(100 * prefiction)}%\", f\"({prefiction})\")\n",
+    "    print(f\"{content[i]}:\\t\",  f\"{round(100 * prefiction)} %\")\n",
     "\n",
     "predictions"
    ]

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ dependencies = [`
`15`	`15`	`"odmantic>=1.0.2",`
`16`	`16`	`"pydantic>=2.10.6",`
`17`	`17`	`"python-dotenv>=1.0.1",`
	`18`	`+ "tabulate>=0.9.0",`
`18`	`19`	`]`
`19`	`20`	`#----------------------------------------------------------------------------------------------------`
`20`	`21`	`[dependency-groups]`