Tournament: optimized choices view

Author: karel26

core/utils/discord.py

@@ -267,7 +267,7 @@ async def selection(interaction: Union[discord.Interaction, commands.Context], *
 class YNQuestionView(View):
     def __init__(self):
         super().__init__(timeout=120)
-        self.result = False
+        self.result = None
 
     @discord.ui.button(label='Yes', style=discord.ButtonStyle.green, custom_id='yn_yes')
     async def on_yes(self, interaction: Interaction, _: Button):
@@ -288,7 +288,7 @@ async def on_error(self, interaction: Interaction, error: Exception, item: Item[
 
 
 async def yn_question(ctx: Union[commands.Context, discord.Interaction], question: str,
-                      message: Optional[str] = None, ephemeral: Optional[bool] = True) -> bool:
+                      message: Optional[str] = None, ephemeral: Optional[bool] = True) -> Optional[bool]:
     """
     :param ctx: The context in which the yn_question method is being called. It can be either a discord.py commands.Context object or a discord.Interaction object.
     :param question: The question to be displayed in the embedded message.
@@ -309,8 +309,7 @@ async def yn_question(ctx: Union[commands.Context, discord.Interaction], questio
     view = YNQuestionView()
     msg = await ctx.send(embed=embed, view=view, ephemeral=ephemeral)
     try:
-        if await view.wait():
-            return False
+        await view.wait()
         return view.result
     finally:
         try:

plugins/gamemaster/commands.py

@@ -520,7 +520,7 @@ async def on_message(self, message: discord.Message):
                         # await server.sendChatMessage(Coalition.RED, message.content, message.author.display_name)
                         pass
                 if server.channels[Channel.CHAT] and server.channels[Channel.CHAT] == message.channel.id:
-                    if message.content.startswith('/') is False:
+                    if not message.content.startswith('/'):
                         await server.sendChatMessage(Coalition.ALL, message.content, message.author.display_name)
 
     @commands.Cog.listener()

plugins/tournament/commands.py

@@ -1145,7 +1145,7 @@ async def setup_server_for_match(self, msg: discord.Message, messages: list[str]
         server.settings['require_pure_scripts'] = True
         server.settings['listShuffle'] = False
         server.settings['listLoop'] = False
-        if config.get('allow_exports', False) is False:
+        if not config.get('allow_exports', False):
             advanced |= {
                 "allow_ownship_export": False,
                 "allow_object_export": False,
@@ -1327,7 +1327,9 @@ async def start(self, interaction: discord.Interaction, tournament_id: int, matc
                     squadron = await self.get_squadron(match_id, squadrons[side]['id'])
                     if squadron.points > min_costs:
                         channel = self.bot.get_channel(channels[side])
-                        await channel.send(_("You can now use {} to chose your customizations!").format(
+                        await channel.send(_("You can now use {} to chose your customizations!\n"
+                                             "If you do not want to change anything, "
+                                             "please run it and say 'No Change'").format(
                             (await utils.get_command(self.bot, group=self.match.name,
                                                      name=self.customize.name)).mention))
                     else:
@@ -1591,11 +1593,13 @@ async def customize(self, interaction: discord.Interaction):
             if await view.wait():
                 return
 
-            if not view.saved or not await utils.yn_question(
+            if view.acknowledged is None or (view.acknowledged is True and not await utils.yn_question(
                     interaction, _("Are you sure?\nYour settings will be directly applied to the next round."),
-                    ephemeral=True):
-                await interaction.followup.send(_("Your choices were saved but will not be applied to the next round."),
-                                                ephemeral=ephemeral)
+                    ephemeral=True)):
+                await interaction.followup.send(
+                    _("Your choices were saved.\n"
+                      "If you want them to be applied to the next round, press 'Confirm & Buy'."),
+                    ephemeral=ephemeral)
                 return
 
             async with self.apool.connection() as conn:
@@ -1615,7 +1619,11 @@ async def customize(self, interaction: discord.Interaction):
                             (squadron_blue = %(squadron_id)s OR squadron_red = %(squadron_id)s)
                             AND match_id = %(match_id)s
                     """, {"match_id": match_id, "squadron_id": squadron_id})
-            await interaction.followup.send(_("Thanks, your selection will now be applied."), ephemeral=True)
+            if view.acknowledged is True:
+                await interaction.followup.send(_("Thanks, your selection will now be applied."), ephemeral=True)
+            else:
+                await interaction.followup.send(_("You decided to not buy any customizations in this round."),
+                                                ephemeral=True)
         finally:
             try:
                 await msg.delete()

plugins/tournament/view.py

@@ -164,7 +164,7 @@ def __init__(self, plugin: "Tournament", tournament_id: int, match_id: int, squa
         self.match_id = match_id
         self.squadron_id = squadron_id
         self.config = config
-        self.saved = False
+        self.acknowledged = None
 
     async def get_tickets(self) -> dict[str, int]:
         async with self.plugin.apool.connection() as conn:
@@ -238,12 +238,17 @@ async def render(self) -> discord.Embed:
                 ], min_values=1, max_values=1)
             select.callback = self.add_choice
             self.add_item(select)
-        button = Button(label="Confirm & buy", style=discord.ButtonStyle.green)
-        button.callback = self.save
-        self.add_item(button)
-        button = Button(label="Save & Close", style=discord.ButtonStyle.red)
-        button.callback = self.cancel
-        self.add_item(button)
+        if already_selected:
+            button = Button(label="Confirm & Buy", style=discord.ButtonStyle.green)
+            button.callback = self.save
+            self.add_item(button)
+            button = Button(label="Save & Close", style=discord.ButtonStyle.red)
+            button.callback = self.cancel
+            self.add_item(button)
+        else:
+            button = Button(label="Skip this round", style=discord.ButtonStyle.primary)
+            button.callback = self.no_change
+            self.add_item(button)
         return embed
 
     async def add_choice(self, interaction: discord.Interaction):
@@ -254,7 +259,7 @@ async def add_choice(self, interaction: discord.Interaction):
         ticket_name = self.config['presets']['choices'][choice].get('ticket')
         ticket_count = tickets.get(ticket_name, 99)
 
-        max_num = max(self.config['presets']['choices'][choice].get('max'), ticket_count)
+        max_num = max(self.config['presets']['choices'][choice].get('max', 99), ticket_count)
         if not max_num or max_num > 1:
             modal = NumbersModal(choice, costs, squadron.points, max_num)
             # noinspection PyUnresolvedReferences
@@ -320,14 +325,20 @@ async def remove_choice(self, interaction: discord.Interaction):
     async def save(self, interaction: discord.Interaction):
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
-        self.saved = True
+        self.acknowledged = True
         self.stop()
 
     async def cancel(self, interaction: discord.Interaction):
         # noinspection PyUnresolvedReferences
         await interaction.response.defer()
         self.stop()
 
+    async def no_change(self, interaction: discord.Interaction):
+        # noinspection PyUnresolvedReferences
+        await interaction.response.defer()
+        self.acknowledged = False
+        self.stop()
+
 
 class ApplicationView(View):