Exclude untradeable balls from trade queries (#725)

Author: Ray-Hsueh

ballsdex/core/utils/transformers.py

@@ -184,8 +184,13 @@ async def get_options(
 
         if interaction.command and (trade_type := interaction.command.extras.get("trade", None)):
             if trade_type == TradeCommandType.PICK:
-                balls_queryset = balls_queryset.filter(
-                    Q(Q(locked__isnull=True) | Q(locked__lt=timezone.now() - timedelta(minutes=30)))
+                balls_queryset = (
+                    balls_queryset.filter(
+                        Q(Q(locked__isnull=True) | Q(locked__lt=timezone.now() - timedelta(minutes=30)))
+                    )
+                    .exclude(tradeable=False)
+                    .exclude(ball__tradeable=False)
+                    .exclude(special__tradeable=False)
                 )
             else:
                 balls_queryset = balls_queryset.filter(

ballsdex/packages/trade/cog.py

@@ -336,6 +336,7 @@ async def bulk_add(
             )
             .exclude(tradeable=False)
             .exclude(ball__tradeable=False)
+            .exclude(special__tradeable=False)
         )
         if countryball:
             query = query.filter(ball=countryball)