Make discriminator not required in relevant classes

somerandomapi/clients/client.py

@@ -331,7 +331,7 @@ async def welcome_image(
         background: Optional[WelcomeBackground] = None,
         avatar_url: Optional[str] = None,
         username: Optional[str] = None,
-        discriminator: Optional[Union[int, str]] = None,
+        discriminator: Optional[int] = None,
         server_name: Optional[str] = None,
         member_count: Optional[int] = None,
         text_color: Optional[WelcomeTextColor] = None,
@@ -354,8 +354,8 @@ async def welcome_image(
             The avatar URL to use. Required if ``obj`` is not passed.
         username: Optional[:class:`str`]
             The username to use. Required if ``obj`` is not passed.
-        discriminator: Optional[Union[:class:`int`, :class:`str`]]
-            The discriminator to use. Required if ``obj`` is not passed.
+        discriminator: Optional[:class:`int`]
+            The discriminator to use. Required if ``obj`` is not passed. 
         server_name: Optional[:class:`str`]
             The server name to use. Required if ``obj`` is not passed.
         member_count: Optional[:class:`int`]
@@ -373,10 +373,10 @@ async def welcome_image(
             ("background", background, True),
             ("avatar_url", avatar_url, True),
             ("username", username, True),
-            ("discriminator", discriminator, True),
             ("server_name", server_name, True),
             ("member_count", member_count, True),
             ("text_color", text_color, True),
+            ("discriminator", discriminator, False),
             ("key", key, False),
             ("font", font, False),
         )

somerandomapi/clients/premium.py

@@ -81,7 +81,7 @@ async def rankcard(
         *,
         username: Optional[str] = None,
         avatar_url: Optional[str] = None,
-        discriminator: Optional[str] = None,
+        discriminator: Optional[int] = None,
         level: Optional[int] = None,
         current_xp: Optional[int] = None,
         needed_xp: Optional[int] = None,
@@ -102,8 +102,8 @@ async def rankcard(
             The username. Max 32 characters. Required if `obj` is not passed.
         avatar_url: Optional[:class:`str`]
             The avatar URL. Required if `obj` is not passed.
-        discriminator: Optional[:class:`str`]
-            The discriminator. Required if `obj` is not passed.
+        discriminator: Optional[:class:`int`]
+            The discriminator to use. Required if ``obj`` is not passed. 
         level: Optional[:class:`int`]
             The level. Required if `obj` is not passed.
         current_xp: Optional[:class:`int`]
@@ -126,10 +126,10 @@ async def rankcard(
         values = (
             ("username", username, True),
             ("avatar_url", avatar_url, True),
-            ("discriminator", discriminator, True),
             ("level", level, True),
             ("current_xp", current_xp, True),
             ("needed_xp", needed_xp, True),
+            ("discriminator", discriminator, False),
             ("key", key, False),
             ("background_url", background_url, False),
             ("background_color", background_color, False),
@@ -153,7 +153,7 @@ async def welcome_image(
         type: Optional[WelcomeType] = None,
         username: Optional[str] = None,
         avatar_url: Optional[str] = None,
-        discriminator: Optional[str] = None,
+        discriminator: Optional[int] = None,
         server_name: Optional[str] = None,
         member_count: Optional[int] = None,
         text_color: Optional[WelcomeTextColor] = None,
@@ -175,8 +175,8 @@ async def welcome_image(
             The username. Required if `obj` is not passed.
         avatar_url: Optional[:class:`str`]
             The avatar URL. Required if `obj` is not passed.
-        discriminator: Optional[:class:`str`]
-            The discriminator. Required if `obj` is not passed.
+        discriminator: Optional[:class:`int`]
+            The discriminator to use. Required if ``obj`` is not passed. 
         server_name: Optional[:class:`str`]
             The server name. Required if `obj` is not passed.
         member_count: Optional[:class:`int`]
@@ -195,10 +195,10 @@ async def welcome_image(
             ("background_url", background_url, True),
             ("avatar_url", avatar_url, True),
             ("username", username, True),
-            ("discriminator", discriminator, True),
             ("server_name", server_name, True),
             ("member_count", member_count, True),
             ("text_color", text_color, True),
+            ("discriminator", discriminator, False),
             ("key", key, False),
             ("font", font, False),
         )

somerandomapi/internals/endpoints.py

@@ -449,7 +449,7 @@ def base(cls):
         "rankcard",
         username=Parameter(extra="maximum 32 characters"),
         avatar=Parameter(extra="use png or jpg"),
-        discriminator=Parameter(),
+        discriminator=Parameter(required=False),
         level=Parameter(),
         cxp=Parameter(extra="Current XP"),
         nxp=Parameter(extra="Needed XP"),
@@ -465,7 +465,7 @@ def base(cls):
         type=Parameter(),
         username=Parameter(),
         avatar=Parameter(extra="use png or jpg"),
-        discriminator=Parameter(),
+        discriminator=Parameter(required=False),
         guildName=Parameter(),
         memberCount=Parameter(),
         textcolor=Parameter(extra="red, orange, yellow, green, blue, indigo, purple, pink, black, or white"),
@@ -516,7 +516,7 @@ def base(cls):
         type=Parameter(),
         username=Parameter(),
         avatar=Parameter(extra="use png or jpg"),
-        discriminator=Parameter(),
+        discriminator=Parameter(required=False),
         guildName=Parameter(),
         memberCount=Parameter(),
         textcolor=Parameter(extra="red, orange, yellow, green, blue, indigo, purple, pink, black, or white"),

somerandomapi/models/rankcard.py

@@ -19,14 +19,17 @@ class Rankcard(BaseImageModel):
     """The username of the user. Max 32 characters."""
     avatar_url: str = field(metadata={"alias_of": "avatar"})
     """The avatar URL of the user. Must be .png or .jpg."""
-    discriminator: int = field(metadata={"length": 4})
-    """The discriminator of the user."""
     level: int
     """The current level of the user."""
     current_xp: int = field(metadata={"alias_of": "cxp"})
     """The current XP of the user."""
     needed_xp: int = field(metadata={"alias_of": "nxp"})
     """The needed XP to level up."""
+    discriminator: Optional[int] = field(default=None, metadata={"range": [1, 4]})
+    """The discriminator of the user.
+
+    Will be stripped if equal to 0
+    """
     key: Optional[str] = None
     """The API key for the rank card. Not required if you have a key set in the client."""
     background_url: Optional[str] = field(default=None, metadata={"alias_of": "bg"})
@@ -65,10 +68,10 @@ def from_dict(
             *,
             username: str,
             avatar: str,
-            discriminator: int,
             level: int,
             cxp: int,
             nxp: int,
+            discriminator: Optional[int] = None,
             key: Optional[str] = None,
             bg: Optional[str] = None,
             cbg: Optional[str] = None,

somerandomapi/models/welcome/free.py

@@ -27,14 +27,17 @@ class WelcomeFree(BaseImageModel):
     """The username of the user."""
     avatar_url: str = field(metadata={"alias_of": "avatar"})
     """The avatar URL of the user. Must be .png or .jpg."""
-    discriminator: int = field(metadata={"length": 4})
-    """The discriminator of the user."""
     server_name: str = field(metadata={"alias_of": "guildName"})
     """The server name."""
     member_count: int = field(metadata={"alias_of": "memberCount"})
     """The member count."""
     text_color: WelcomeTextColor = field(metadata={"alias_of": "textcolor"})
     """The text color."""
+    discriminator: Optional[int] = field(default=None, metadata={"range": [1, 4]})
+    """The discriminator of the user.
+
+    Will be stripped if equal to 0
+    """
     key: Optional[str] = field(default=None, repr=False)
     """The key, doesn't need to be active.
 
@@ -57,10 +60,10 @@ def from_dict(
             background: Backgrounds,
             username: str,
             avatar: str,
-            discriminator: int,
             guildName: str,
             memberCount: int,
             textcolor: WelcomeTextColors,
+            discriminator: Optional[int] = None,
             key: Optional[str] = None,
             font: Optional[int] = None,
         ):

somerandomapi/models/welcome/premium.py

@@ -24,14 +24,17 @@ class WelcomePremium(BaseImageModel):
     """The username of the user."""
     avatar_url: str = field(metadata={"alias_of": "avatar"})
     """The avatar URL of the user. Must be .png or .jpg."""
-    discriminator: int
-    """The discriminator of the user."""
     server_name: str = field(metadata={"alias_of": "guildName"})
     """The server name."""
     member_count: int = field(metadata={"alias_of": "memberCount"})
     """The member count."""
     text_color: WelcomeTextColor = field(metadata={"alias_of": "textcolor"})
     """The text color."""
+    discriminator: Optional[int] = field(default=None, metadata={"range": [1, 4]})
+    """The discriminator of the user.
+
+    Will be stripped if equal to 0
+    """
     key: Optional[str] = field(default=None, repr=False)
     """The key. At least tier 2 is required. Use the free endpoint if you don't have a tier 2 key.
 
@@ -54,10 +57,10 @@ def from_dict(
             type: Literal["join", "leave"],
             username: str,
             avatar: str,
-            discriminator: int,
             guildName: str,
             memberCount: int,
             textcolor: WelcomeTextColors,
+            discriminator: Optional[int] = None,
             key: Optional[str] = None,
             bg: Optional[str] = None,
             font: Optional[int] = None,