Merge branch 'master' into unique-ball-search

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()