Add autocomplete to app commands

Author: Adikso

.gitignore

@@ -4,4 +4,5 @@ __pycache__/
 
 config.toml
 bashbot.log
-state.json
+state.json
+build.json

bashbot/command/controls.py

@@ -1,5 +1,5 @@
 import discord
-from discord import Message, Interaction, Embed
+from discord import Message, Interaction, Embed, app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 from discord.ui import View
@@ -77,3 +77,12 @@ async def remove(self, ctx: Context, label: str = None):
         if ctx.interaction:
             embed = Embed(description=f"Control removed", color=0xff0000)
             await ctx.reply(embed=embed, ephemeral=False, delete_after=0)
+
+    @remove.autocomplete('label')
+    async def remove_autocomplete(self, interaction: Interaction, current: str):
+        terminal: Terminal = sessions().by_channel(interaction.channel)
+        results = terminal.search_control(current)
+        return [
+            app_commands.Choice(name=option, value=option)
+            for option in results
+        ]

bashbot/command/macro.py

@@ -1,14 +1,14 @@
-from discord import Embed
+from discord import Embed, Interaction, app_commands
 from discord.ext import commands
 from discord.ext.commands import Context
 
 from bashbot.command import session_exists
 from bashbot.constants import EMBED_COLOR
-from bashbot.core.macros import execute_macro
+from bashbot.core.macros import execute_macro, search_macro
 
 
 class MacroCommand(commands.Cog):
-    @commands.command(
+    @commands.hybrid_command(
         name='macro',
         aliases=['.macro', '.m'],
         description='Executes macro from "macros" directory',
@@ -20,3 +20,11 @@ async def macro(self, ctx: Context, macro_name: str):
 
         embed = Embed(description=f"Executed macro {macro_name}", color=EMBED_COLOR)
         await ctx.send(embed=embed)
+
+    @macro.autocomplete('macro_name')
+    async def macro_autocomplete(self, interaction: Interaction, current: str):
+        results = search_macro(current)
+        return [
+            app_commands.Choice(name=option, value=option)
+            for option in results
+        ]

bashbot/command/select.py

@@ -1,4 +1,4 @@
-from discord import Embed
+from discord import Embed, Interaction, app_commands
 from discord.ext import commands
 
 from bashbot.constants import EMBED_COLOR
@@ -21,3 +21,11 @@ async def select(self, ctx, name):
         sessions().select(ctx.message.channel, terminal)
         embed = Embed(description=f"Selected terminal #{name}", color=EMBED_COLOR)
         await ctx.send(embed=embed)
+
+    @select.autocomplete('name')
+    async def select_autocomplete(self, interaction: Interaction, current: str):
+        results = sessions().search(current)
+        return [
+            app_commands.Choice(name=option.name, value=option.name)
+            for option in results
+        ]

bashbot/core/macros.py

@@ -17,3 +17,7 @@ async def execute_macro(ctx, name):
             await ctx.bot.process_commands(ctx.message)
         else:
             terminal.send_input(line)
+
+
+def search_macro(phrase):
+    return [name for name in settings().macros.keys() if name.startswith(phrase)]

bashbot/terminal/sessions.py

@@ -1,3 +1,5 @@
+from typing import List
+
 from discord import TextChannel, Message
 
 from bashbot.core.factory import SingletonDecorator
@@ -27,6 +29,9 @@ def by_message(self, searched_message: Message) -> Terminal:
             if searched_message.id == message.id:
                 return terminal
 
+    def search(self, phrase: str) -> List[Terminal]:
+        return [terminal for terminal in self.sessions.values() if terminal.name.startswith(phrase)]
+
     def by_name(self, name: str) -> Terminal:
         for message, terminal in self.sessions.items():
             if terminal.name == name:

bashbot/terminal/terminal.py

@@ -83,6 +83,9 @@ def add_control(self, emoji, content):
     def remove_control(self, emoji):
         self.controls.pop(emoji)
 
+    def search_control(self, phrase):
+        return [label for label in self.controls.keys() if label.startswith(phrase)]
+
     def __monitor_pty(self, loop):
         try:
             output = os.read(self.fd, 1024)