Experiments.

Author: i0bs

.gitignore

@@ -5,4 +5,7 @@
 .cache/
 _build/
 build/
-dist/
+dist/
+
+# dev test
+.TOKEN

bot.py

@@ -0,0 +1,32 @@
+from discord_slash import SlashCommand, SlashContext
+from discord_slash.model import ContextMenuType
+from discord import Intents
+from discord.ext.commands import Bot
+
+bot = Bot(
+    command_prefix="/",
+    help_command=None,
+    intents=Intents.default()
+)
+slash = SlashCommand(
+    bot,
+    sync_commands=False
+)
+
+@bot.event
+async def on_ready():
+    print("we're live!")
+
+@slash.slash(name="testcmd", guild_ids=[852402668294766612])
+async def testcmd(ctx: SlashContext):
+    print(ctx)
+    await ctx.send("test!")
+
+@slash.context_menu(ContextMenuType.MESSAGE, name="testname", guild_ids=[852402668294766612])
+async def testname(ctx: SlashContext):
+    print(1 + 1)
+    print(ctx)
+    print(ctx.message_menus)
+    await ctx.send("test!")
+
+bot.run(open(".TOKEN", "r").read(), reconnect=True, bot=True)

discord_slash/client.py

@@ -659,6 +659,15 @@ def add_context_menu(self, cmd, name: str, _type: int, guild_ids: list = None):
             raise error.IncorrectGuildIDType(
                 f"The snowflake IDs {guild_ids} given are not a list of integers. Because of discord.py convention, please use integer IDs instead. Furthermore, the command '{name}' will be deactivated and broken until fixed."
             )
+        
+        if name in self.commands["context"]:
+            tgt = self.commands["context"][name]
+            if not tgt.has_subcommands:
+                raise error.DuplicateCommand(name)
+            has_subcommands = tgt.has_subcommands
+            for x in tgt.allowed_guild_ids:
+                if x not in guild_ids:
+                    guild_ids.append(x)
 
         _cmd = {
             "default_permission": None,
@@ -866,11 +875,8 @@ async def _pick(ctx, choice1, choice2): # Command with 1 or more args.
 
         def wrapper(cmd):
             decorator_permissions = getattr(cmd, "__permissions__", None)
-            decorator_context = getattr(cmd, "__context_menu__", None)
             if decorator_permissions:
                 permissions.update(decorator_permissions)
-            if decorator_context:
-                context.update(decorator_context)
 
             obj = self.add_slash_command(
                 cmd,
@@ -1439,6 +1445,51 @@ async def _on_slash(self, to_use):
 
             await self.invoke_command(selected_cmd, ctx, args)
 
+    async def _on_context_menu(self, to_use):
+        if to_use["data"]["name"] in self.commands["context"]:
+            ctx = context.SlashContext(self.req, to_use, self._discord, self.logger)
+            cmd_name = to_use["data"]["name"]
+            
+            if cmd_name not in self.commands["context"] and cmd_name in self.subcommands:
+                return await self.handle_subcommand(ctx, to_use)
+
+            selected_cmd = self.commands["context"][cmd_name]
+
+            if (
+                selected_cmd.allowed_guild_ids
+                and ctx.guild_id not in selected_cmd.allowed_guild_ids
+            ):
+                return
+
+            if selected_cmd.has_subcommands and not selected_cmd.func:
+                return await self.handle_subcommand(ctx, to_use)
+
+            if "options" in to_use["data"]:
+                for x in to_use["data"]["options"]:
+                    if "value" not in x:
+                        return await self.handle_subcommand(ctx, to_use)
+
+            # This is to temporarily fix Issue #97, that on Android device
+            # does not give option type from API.
+            temporary_auto_convert = {}
+            for x in selected_cmd.options:
+                temporary_auto_convert[x["name"].lower()] = x["type"]
+
+            args = (
+                await self.process_options(
+                    ctx.guild,
+                    to_use["data"]["options"],
+                    selected_cmd.connector,
+                    temporary_auto_convert,
+                )
+                if "options" in to_use["data"]
+                else {}
+            )
+
+            self._discord.dispatch("context_menu", ctx)
+
+            await self.invoke_command(selected_cmd, ctx, args)
+
     async def handle_subcommand(self, ctx: context.SlashContext, data: dict):
         """
         Coroutine for handling subcommand.

discord_slash/context.py

@@ -52,7 +52,7 @@ def __init__(
         self.data = _json["data"]
         self._message_menu_id = self.data["resolved"]["messages"] if "resolved" in self.data.keys() else None # Should be set later.
         self._author_menus_id = self.data["resolved"]["members"] if "resolved" in self.data.keys() else None
-        self.interaction_id = self.data["id"] if "id" in self.data.keys() else _json["id"]
+        self.interaction_id = self.data["id"] if "resolved" in self.data.keys() else _json["id"]
         self._http = _http
         self.bot = _discord
         self._logger = logger
@@ -78,13 +78,17 @@ def __init__(
         self.message_menus = None
         try:
             if self._message_menu_id:
-                self.message_menus = model.SlashMessage(
-                    state=self.bot._connection,
-                    channel=_discord.get_channel(self.channel_id),
-                    data=_json["data"]["resolved"]["messages"][self._message_menu_id],
-                    _http=_http,
-                    interaction_token=self._token,
-                )
+                self.message_menus = []
+                for message in self._message_menu_id:
+                    self.message_menus.append(
+                        model.SlashMessage(
+                            state=self.bot._connection,
+                            channel=_discord.get_channel(self.channel_id),
+                            data=self._message_menu_id[message],
+                            _http=_http,
+                            interaction_token=self._token,
+                        )
+                    )
             else:
                 raise KeyError
         except KeyError as err: