From d0e37a041b95f046708b2c85711e81b2002229f4 Mon Sep 17 00:00:00 2001
From: Jamie <31554168+flaree@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:27:59 +0000
Subject: [PATCH 1/2] [trade] change donation message if favourite cb (#528)

* Change message if have to request approval

* fix precommit

* Update to favourite ball

* Update mentions

* update mentions
---
 ballsdex/packages/balls/cog.py | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/ballsdex/packages/balls/cog.py b/ballsdex/packages/balls/cog.py
index f991759a..d2992235 100644
--- a/ballsdex/packages/balls/cog.py
+++ b/ballsdex/packages/balls/cog.py
@@ -529,7 +529,8 @@ async def give(
                 ephemeral=True,
             )
             return
-        if countryball.favorite:
+        favorite = countryball.favorite
+        if favorite:
             view = ConfirmChoiceView(
                 interaction,
                 accept_message=f"{settings.collectible_name.title()} donated.",
@@ -609,10 +610,22 @@ async def give(
             countryball.description(short=True, include_emoji=True, bot=self.bot, is_trade=True)
             + f" (`{countryball.attack_bonus:+}%/{countryball.health_bonus:+}%`)"
         )
-        await interaction.followup.send(
-            f"You just gave the {settings.collectible_name} {cb_txt} to {user.mention}!",
-            allowed_mentions=discord.AllowedMentions(users=new_player.can_be_mentioned),
-        )
+        mentions = []
+        if new_player.can_be_mentioned:
+            mentions.append(new_player.discord_id)
+        if old_player.can_be_mentioned:
+            mentions.append(old_player.discord_id)
+        if favorite:
+            await interaction.followup.send(
+                f"{interaction.user.mention}, you just gave the "
+                f"{settings.collectible_name} {cb_txt} to {user.mention}!",
+                allowed_mentions=discord.AllowedMentions(users=mentions),
+            )
+        else:
+            await interaction.followup.send(
+                f"You just gave the {settings.collectible_name} {cb_txt} to {user.mention}!",
+                allowed_mentions=discord.AllowedMentions(users=mentions),
+            )
         await countryball.unlock()
 
     @app_commands.command()

From e7ce3b368ad328391e7501e4fdfa545032f65ea4 Mon Sep 17 00:00:00 2001
From: Jamie <31554168+flaree@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:34:22 +0000
Subject: [PATCH 2/2] fix searching on empty catch names (#541)

---
 ballsdex/core/utils/transformers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ballsdex/core/utils/transformers.py b/ballsdex/core/utils/transformers.py
index d0a18bd9..0facf6ae 100644
--- a/ballsdex/core/utils/transformers.py
+++ b/ballsdex/core/utils/transformers.py
@@ -182,8 +182,9 @@ async def get_options(
             balls_queryset.select_related("ball")
             .annotate(
                 searchable=RawSQL(
-                    "to_hex(ballinstance.id) || ' ' || ballinstance__ball.country || "
-                    "' ' || ballinstance__ball.catch_names"
+                    "to_hex(ballinstance.id) || ' ' || ballinstance__ball.country || ' ' || "
+                    "COALESCE(ballinstance__ball.catch_names, '') || ' ' || "
+                    "COALESCE(ballinstance__ball.translations, '')"
                 )
             )
             .filter(searchable__icontains=value.replace(".", ""))