commands/economy_support_commands.py

@@ -38,15 +38,21 @@ def register_economy_support_commands(
                 )
                 return
 
+            # Reserve the amount synchronously (no await between the range check
+            # and the decrement) so two concurrent modal submits can't both fund
+            # the same request. discord.py runs each submit as its own task and
+            # do_give is not idempotent, so without this reservation a funder
+            # could double-submit and transfer `amount` more than once.
+            self._view.remaining -= amount
             res = await economy.do_give(interaction.user.id, self._view.requester.id, amount)
             if not res["ok"]:
+                self._view.remaining += amount  # roll back the reservation
                 data = await economy.get_user(interaction.user.id)
                 await interaction.response.send_message(
                     S.ERR["broke"].format(bal=coin(data["balance"])), ephemeral=True
                 )
                 return
 
-            self._view.remaining -= amount
             funded_line = S.REQUEST_UI["funded_line"].format(
                 name=interaction.user.display_name,
                 amount=coin(amount),
@@ -84,6 +90,9 @@ def register_economy_support_commands(
             self.add_item(self.fund_btn)
 
         async def _fund(self, interaction: discord.Interaction):
+            if self.remaining <= 0 or self.is_finished():
+                await interaction.response.send_message(S.ERR["request_closed"], ephemeral=True)
+                return
             if interaction.user.id == self.requester.id:
                 await interaction.response.send_message(S.ERR["request_self_fund"], ephemeral=True)
                 return

strings.py

@@ -674,6 +674,7 @@ ERR: dict[str, str] = {
     "request_self":      "❌ Sa ei saa iseendalt anuda.",
     "request_bot":       "❌ Botid on teatavasti kitsid.",
     "request_targeted":  "❌ See taotlus on suunatud kasutajale **{name}**.",
+    "request_closed":    "❌ See taotlus on juba rahastatud või aegunud.",
     "already_in_game":   "❌ Sul on juba aktiivne mäng käimas!",
     "invalid_amount":    "❌ Sisesta kehtiv summa või 'all'.",
     "fund_range":        "❌ Sisesta summa vahemikus 1-{max}.",