Update docs and prepare for launch.

Author: i0bs

discord_slash/client.py

@@ -308,7 +308,7 @@ async def to_dict(self):
                             "options": selected.options or [],
                             "default_permission": selected.default_permission,
                             "permissions": selected.permissions or {},
-                            "type": selected.type,
+                            "type": selected._type,
                         }
                         wait["global"][x] = copy.deepcopy(command_dict)
 
@@ -1022,7 +1022,7 @@ def wrapper(cmd):
 
         return wrapper
 
-    def context_menu(self, target: int, name: str, guild_ids: list = None):
+    def context_menu(self, *, target: int, name: str, guild_ids: list = None):
         """
         Decorator that adds context menu commands.
 

discord_slash/cog_ext.py

@@ -192,7 +192,7 @@ def wrapper(cmd):
 # I don't feel comfortable with having these right now, they're too buggy even when they were working.
 
 
-def cog_context_menu(name: str, guild_ids: list = None, target: int = 1):
+def cog_context_menu(*, name: str, guild_ids: list = None, target: int = 1):
     """
     Decorator that adds context menu commands.
 

discord_slash/context.py

@@ -638,13 +638,11 @@ class MenuContext(InteractionContext):
     """
     Context of a context menu interaction. Has all attributes from :class:`InteractionContext`, plus the context-specific ones below.
 
-    :ivar target_id: The target ID of the context menu command.
     :ivar context_type: The type of context menu command.
-    :ivar menu_messages: Dictionary of messages collected from the context menu command. Defaults to ``None``.
-    :ivar menu_authors: Dictionary of users collected from the context menu command. Defaults to ``None``.
-    :ivar context_message: The message of the context menu command if present. Defaults to ``None``.
-    :ivar context_author: The author of the context menu command if present. Defaults to ``None``.
     :ivar _resolved: The data set for the context menu.
+    :ivar target_message: The targeted message of the context menu command if present. Defaults to ``None``.
+    :ivar target_id: The target ID of the context menu command.
+    :ivar target_author: The author targeted from the context menu command.
     """
 
     def __init__(
@@ -657,33 +655,37 @@ def __init__(
         super().__init__(_http=_http, _json=_json, _discord=_discord, logger=logger)
         self.context_type = _json["type"]
         self._resolved = self.data["resolved"] if "resolved" in self.data.keys() else None
-        self.target = {"id": self.data["target_id"], "message": None}
+        self.target_message = None
+        self.target_author = None
+        self.target_id = self.data["target_id"]
 
         if self._resolved is not None:
-            if self.context_type in [3, "3"]:
-                self.target["message"] = model.SlashMessage(
-                    state=self.bot._connection,
-                    channel=_discord.get_channel(self.channel_id),
-                    data=[msg for msg in self._resolved["messages"]][0],
-                    _http=_http,
-                    interaction_token=self._token,
-                )
-
             try:
-                if self.guild and self._resolved["members"]:
-                    _member = True
-                    self.target["author"] = discord.Member(
-                        data=[auth for auth in self._resolved["members"]][0],
+                if self._resolved["messages"]:
+                    _msg = [msg for msg in self._resolved["messages"]][0]
+                    self.target_message = model.SlashMessage(
                         state=self.bot._connection,
-                        guild=self.guild
+                        channel=_discord.get_channel(self.channel_id),
+                        data=self._resolved["messages"][_msg],
+                        _http=_http,
+                        interaction_token=self._token,
                     )
             except KeyError:  # noqa
                 pass
+
             try:
-                if self._resolved["users"]:
-                    self.target["author"] = discord.User(
-                        data=[auth for auth in self._resolved["users"]][0],
-                        state=self.bot_connection
+                if self.guild and self._resolved["members"]:
+                    _auth = [auth for auth in self._resolved["members"]][0]
+                    self.target_author = discord.Member(
+                        data=self._resolved["members"][_auth],
+                        state=self.bot._connection,
+                        guild=self.guild
+                    )
+                else:
+                    _auth = [auth for auth in self._resolved["users"]][0]
+                    self.target_author = discord.User(
+                        data=self._resolved["users"][_auth],
+                        state=self.bot._connection
                     )
             except KeyError:  # noqa
                 pass

docs/gettingstarted.rst

@@ -358,21 +358,41 @@ Unlike `manage_commands` and `manage_components`, you will have to use a decorat
 
 .. code-block :: python
 
+  from discord_slash.context import MenuContext
   from discord_slash.model import ContextMenuType
 
-  @slash.context_menu(ContextMenuType.MESSAGE,
+  @slash.context_menu(target=ContextMenuType.MESSAGE,
                       name="commandname",
                       guild_ids=[789032594456576001])
   async def commandname(ctx: MenuContext):
     await ctx.send(
-      content="Responded!",
+      content=f"Responded! The content of the message targeted: {ctx.target_message.content}",
       hidden=True
     )
 
 The `@slash.context_menu` decorator takes in the context type as given (to either appear when you right-click on a user or when you right-click on a message) as well
 as the name of the command, and any guild IDs if given if you would like to make it applicable to only a guild. **We only accept connected names** for the time being,
 although context menus will have the ability to have spaces in their name in the future when development further progresses.
 
+You are able to also use the `@cog_ext.cog_context_menu` path which will require an import from `cog_ext.py` respectively, however, it is worth nothing that
+the `target` kwarg for the decorator **must** be brought to the very end.
+
+Can I use components with context menus?
+----------------------------------------
+Of course! However, you will need to add in some additional code in order for both of the separate contexts to work seamlessly. Below is the given code of what will need
+to be changed:
+
+.. code-block :: python
+
+  from discord_slash.context import ComponentContext, MenuContext
+  from discord_slash.model import ContextMenuType
+  from typing import Union
+
+  ...
+
+  async def my_new_command(ctx: Union[ComponentContext, MenuContext]):
+    ...
+
 Hey, what about component/[X] listening?
 ----------------------------------------
 The decision has been made that this will not be implemented because of two reasons: context menus currently have no ability to hold any options or choices, so listening