Merge branch 'main' of https://github.com/bentettmar/discord.py-self_embed

Author: bennyscripts

discord_self_embed/utils/embed.py

@@ -1,7 +1,7 @@
 import urllib.parse
 
 class Embed:
-    def __init__(self, title, *, description = "", colour = "000000", url = "") -> None:
+    def __init__(self, title, **kwargs) -> None:
         """
         Initialize the embed object.
 
@@ -12,16 +12,26 @@ def __init__(self, title, *, description = "", colour = "000000", url = "") -> N
             url (str): The url of the embed.
         """
 
-        if colour.startswith("#"):
-            colour = colour[1:]
+        description = kwargs.get("description", "")
+        colour = kwargs.get("colour", "") or kwargs.get("color", "") or "000000"
+        url = kwargs.get("url", "")
+
+        if isinstance(colour, int):
+            colour = str(hex(colour)[2:])
+
+        elif isinstance(colour, str):
+            if colour.startswith("#"):
+                colour = colour[1:]
+            elif colour.startswith("0x"):
+                colour = colour[2:]
 
         self.hide_text = "||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||||​||"
-        self.base_url = "https://embed.rauf.wtf/?"
+        self.base_url = "https://embed.benny.fun/?"
         self.params = {
             "title": title,
             "description": description,
-            "color": colour,
-            "redirect": url
+            "colour": colour,
+            "url": url
         }
 
     def __str__(self) -> str:
@@ -34,15 +44,63 @@ def __str__(self) -> str:
 
         return self.generate_url(hide_url=True)
 
-    def set_author(self, text) -> None:
+    def set_title(self, title) -> None:
+        """
+        Set the title of the embed.
+
+        Parameters:
+            title (str): The title of the embed.
+        """
+
+        self.params["title"] = title
+    
+    def set_description(self, description) -> None:
+        """
+        Set the description of the embed.
+
+        Parameters:
+            description (str): The description of the embed. (Max 340 characters)
+        """
+
+        self.params["description"] = description
+
+    def set_colour(self, colour) -> None:
+        """
+        Set the colour of the embed.
+
+        Parameters:
+            colour (str): The hex colour of the embed.
+        """
+
+        self.params["colour"] = colour        
+
+    def set_author(self, name, *, url) -> None:
         """
         Set the author of the embed.
 
         Parameters:
-            text (str): The text of the author.
+            name (str): The name of the author.
+            url (str): The url to redirect to when the author is clicked.
+        """
+
+        self.params["author_name"] = name
+
+        if url:
+            self.params["author_url"] = url
+
+    def set_provider(self, name, *, url) -> None:
+        """
+        Set the provider of the embed.
+
+        Parameters:
+            name (str): The name of the provider.
+            url (str): The url to redirect to when the provider is clicked.
         """
 
-        self.params["author"] = text
+        self.params["provider_name"] = name
+
+        if url:
+            self.params["provider_url"] = url
 
     def set_image(self, url) -> None:
         """
@@ -54,6 +112,16 @@ def set_image(self, url) -> None:
 
         self.params["image"] = url
 
+    def set_video(self, url) -> None:
+        """
+        Set the video of the embed.
+
+        Parameters:
+            url (str): The url of the video.
+        """
+
+        self.params["video"] = url
+
     def generate_url(self, *, hide_url=False) -> str:
         """
         Generate the url of the embed.
@@ -69,4 +137,6 @@ def generate_url(self, *, hide_url=False) -> str:
         if hide_url:
             return self.hide_text + " " + self.base_url + urllib.parse.urlencode(self.params)
         else:
-            return self.base_url + urllib.parse.urlencode(self.params)
+            return self.base_url + urllib.parse.urlencode(self.params)
+
+    set_color = set_colour

examples/embed_cmd.py

@@ -1,4 +1,3 @@
-from click import command
 import discord_self_embed
 from discord.ext import commands
 
@@ -15,4 +14,4 @@ async def embed_cmd(ctx):
 
     await ctx.send(embed.generate_url(hide_url=True)) # You can also send the embed converted to a string which will auto hide the url.
 
-bot.run("TOKEN_HERE")
+bot.run("TOKEN_HERE")