Merge branch 'Pycord-Development:master' into master

Author: janu8ry

discord/embeds.py

@@ -424,6 +424,22 @@ def set_image(self: E, *, url: MaybeEmpty[Any]) -> E:
 
         return self
 
+    def remove_image(self: E) -> E:
+        """Removes the embed's image.
+
+        This function returns the class instance to allow for fluent-style
+        chaining.
+
+        .. versionadded:: 2.0
+        """
+        try:
+            del self._image
+        except AttributeError:
+            pass
+        
+        return self
+
+
     @property
     def thumbnail(self) -> _EmbedMediaProxy:
         """Returns an ``EmbedProxy`` denoting the thumbnail contents.
@@ -466,6 +482,21 @@ def set_thumbnail(self: E, *, url: MaybeEmpty[Any]) -> E:
 
         return self
 
+    def remove_thumbnail(self: E) -> E:
+        """Removes the embed's thumbnail.
+        
+        This function returns the class instance to allow for fluent-style
+        chaining.
+
+        .. versionadded:: 2.0
+        """
+        try:
+            del self._thumbnail
+        except AttributeError:
+            pass
+        
+        return self
+
     @property
     def video(self) -> _EmbedVideoProxy:
         """Returns an ``EmbedProxy`` denoting the video contents.

discord/errors.py

@@ -355,5 +355,5 @@ class ExtensionNotFound(ExtensionError):
         The extension that had the error.
     """
     def __init__(self, name: str) -> None:
-        msg = f'Extension {name!r} could not be loaded.'
+        msg = f'Extension {name!r} could not be found.'
         super().__init__(msg, name=name)

examples/app_commands/slash_basic.py

@@ -2,24 +2,27 @@
 
 bot = discord.Bot()
 
-# If you use commands.Bot, @bot.slash_command should be used for
-# slash commands. You can use @bot.slash_command with discord.Bot aswell
+# Note: If you want you can use commands.Bot instead of discord.Bot
+# Use discord.Bot if you don't want prefixed message commands
 
+# With discord.Bot you can use @bot.command as an alias 
+# of @bot.slash_command but this is overriden by commands.Bot
 
-@bot.command(guild_ids=[...])  # create a slash command for the supplied guilds
+
+@bot.slash_command(guild_ids=[...])  # create a slash command for the supplied guilds
 async def hello(ctx):
     """Say hello to the bot"""  # the command description can be supplied as the docstring
     await ctx.send(f"Hello {ctx.author}!")
 
 
-@bot.command(
+@bot.slash_command(
     name="hi"
 )  # Not passing in guild_ids creates a global slash command (might take an hour to register)
 async def global_command(ctx, num: int):  # Takes one integer parameter
     await ctx.send(f"This is a global command, {num}!")
 
 
-@bot.command(guild_ids=[...])
+@bot.slash_command(guild_ids=[...])
 async def joined(
     ctx, member: discord.Member = None
 ):  # Passing a default value makes the argument optional

examples/app_commands/slash_options.py

@@ -3,15 +3,13 @@
 
 bot = discord.Bot()
 
-# If you use commands.Bot, @bot.slash_command should be used for
-# slash commands. You can use @bot.slash_command with discord.Bot aswell
-
-
-@bot.command(guild_ids=[...])
+@bot.slash_command(guild_ids=[...])
 async def hello(
     ctx,
     name: Option(str, "Enter your name"),
     gender: Option(str, "Choose your gender", choices=["Male", "Female", "Other"]),
     age: Option(int, "Enter your age", required=False, default=18),
 ):
     await ctx.send(f"Hello {name}")
+
+bot.run('TOKEN')