Merge branch 'v3' of https://github.com/Ballsdex-Team/BallsDex-DiscordBot into v3

Author: flaree

admin_panel/settings/models.py

@@ -119,12 +119,17 @@ def currency_enabled(self) -> bool:
 
     # admin command control
     admin_channel_ids = models.TextField(
-        help_text="Semicolon-delimited list of channel IDs where admin commands can be used. Ignored for owners. "
+        help_text="Semicolon-delimited channel IDs where staff may bypass inventory privacy. Ignored for owners."
         "If empty, then admin commands can be used everywhere.",
         validators=(RegexValidator(COLON_IDS_RE, message="The IDs must be semicolon-separated"),),
         blank=True,
         default="",
     )
+
+    @cached_property
+    def inv_privacy_bypass_ids(self) -> list[int]:
+        return [] if self.admin_channel_ids is None else [int(x) for x in self.admin_channel_ids.split(";") if x]
+
     webhook_logging = models.URLField(
         help_text="An optional Discord Webhook where admin events will be logged.",
         validators=(RegexValidator(DISCORD_WEBHOOK_RE, message="Only Discord webhooks are supported."),),

ballsdex/core/utils/utils.py

@@ -4,6 +4,7 @@
 
 from bd_models.enums import PrivacyPolicy
 from bd_models.models import Player
+from settings.models import settings
 
 from .checks import get_user_for_check
 
@@ -35,6 +36,7 @@ async def is_staff(interaction: discord.Interaction["BallsDexBot"], *perms: str)
         return user
     if not user.is_staff:
         return False
+
     return await user.ahas_perms(perms)
 
 
@@ -70,7 +72,9 @@ async def inventory_privacy(
     if interaction.user.id == player.discord_id:
         return True
     if await is_staff(interaction):
-        return True
+        if settings.inv_privacy_bypass_ids and interaction.channel_id in settings.inv_privacy_bypass_ids:
+            return True
+
     if privacy_policy == PrivacyPolicy.DENY:
         await interaction.followup.send("This user has set their inventory to private.", ephemeral=True)
         return False

ballsdex/packages/balls/cog.py

@@ -190,13 +190,14 @@ async def list(
             else:
                 combined = ""
 
+            combined_txt = f"{combined} " if combined else ""
             if user_obj == interaction.user:
                 await interaction.followup.send(
-                    f"You don't have any {combined} {settings.plural_collectible_name} yet."
+                    f"You don't have any {combined_txt}{settings.plural_collectible_name} yet."
                 )
             else:
                 await interaction.followup.send(
-                    f"{user_obj.name} doesn't have any {combined} {settings.plural_collectible_name} yet."
+                    f"{user_obj.name} doesn't have any {combined_txt}{settings.plural_collectible_name} yet."
                 )
             return
         if reverse:

ballsdex/packages/trade/trade.py

@@ -21,6 +21,7 @@
 from ballsdex.core.discord import UNKNOWN_INTERACTION, Container, LayoutView, Modal
 from ballsdex.core.utils.buttons import ConfirmChoiceView
 from ballsdex.core.utils.menus import CountryballFormatter, Menu, ModelSource, TextFormatter, TextSource
+from bd_models.enums import TradeCooldownPolicy
 from bd_models.models import BallInstance, Player, Trade, TradeObject
 from settings.models import settings
 from settings.utils import format_currency
@@ -49,6 +50,7 @@
 log = logging.getLogger(__name__)
 
 TRADE_TIMEOUT = 60 * 30
+COOLDOWN_BYPASS_TIMEOUT = 10
 
 
 class SetMoneyModal(Modal, title="Set money offering"):
@@ -423,6 +425,7 @@ def __init__(self, cog: "TradeCog"):
         self.confirmation_lock = asyncio.Lock()
         self.edit_lock = asyncio.Lock()
         self.next_edit_interaction: Interaction | None = None
+        self.confirmation_phase_start: datetime | None = None
 
         self.timeout_task = asyncio.create_task(self._timeout(), name=f"trade-timeout-{id(self)}")
 
@@ -465,6 +468,8 @@ async def lock_button(self, interaction: Interaction, button: Button):
         except TradeError as e:
             await interaction.followup.send(e.error_message, ephemeral=True)
         else:
+            if self.confirmation_phase and self.confirmation_phase_start is None:
+                self.confirmation_phase_start = datetime.now()
             await self.edit_message(interaction)
 
     @buttons.button(label="Reset", emoji="\N{DASH SYMBOL}", style=discord.ButtonStyle.secondary)
@@ -517,6 +522,18 @@ async def cancel_button(self, interaction: Interaction, button: Button):
     )
     async def confirm_button(self, interaction: Interaction, button: Button):
         trader = {self.trader1.user.id: self.trader1, self.trader2.user.id: self.trader2}[interaction.user.id]
+        both_bypass = (
+            self.trader1.player.trade_cooldown_policy == TradeCooldownPolicy.BYPASS
+            and self.trader2.player.trade_cooldown_policy == TradeCooldownPolicy.BYPASS
+        )
+        if not both_bypass and self.confirmation_phase_start is not None:
+            elapsed = (datetime.now() - self.confirmation_phase_start).total_seconds()
+            remaining = COOLDOWN_BYPASS_TIMEOUT - elapsed
+            if remaining > 0:
+                await interaction.response.send_message(
+                    f"Please wait {remaining:.0f} more second(s) before confirming.", ephemeral=True
+                )
+                return
         await interaction.response.defer()
         try:
             await trader.confirm()