fix: account for discord's discrim change (#1384)

* fix: correct typehint for discrim

* fix💥: account for discord's discrim change

* fix: match behavior to discord docs pr

discord/discord-api-docs#6130

* feat: set default for discrim

---------

Co-authored-by: Astrea49 <25420078+Astrea49@users.noreply.github.com>

Author: AstreaTSS

interactions/models/discord/user.py

@@ -51,7 +51,9 @@ class BaseUser(DiscordObject, _SendDMMixin):
     global_name: str | None = attrs.field(
         repr=True, metadata=docs("The user's chosen display name, platform-wide"), default=None
     )
-    discriminator: int = attrs.field(repr=True, metadata=docs("The user's 4-digit discord-tag"))
+    discriminator: str = attrs.field(
+        repr=True, metadata=docs("The user's 4-digit discord-tag"), default="0"
+    )  # will likely be removed in future api version
     avatar: "Asset" = attrs.field(repr=False, metadata=docs("The user's default avatar"))
 
     def __str__(self) -> str:
@@ -62,13 +64,17 @@ def _process_dict(cls, data: Dict[str, Any], client: "Client") -> Dict[str, Any]
         if not isinstance(data["avatar"], Asset):
             if data["avatar"]:
                 data["avatar"] = Asset.from_path_hash(client, f"avatars/{data['id']}/{{}}", data["avatar"])
+            elif data["discriminator"] == "0":
+                data["avatar"] = Asset(client, f"{Asset.BASE}/embed/avatars/{(int(data['id']) >> 22) % 5}")
             else:
                 data["avatar"] = Asset(client, f"{Asset.BASE}/embed/avatars/{int(data['discriminator']) % 5}")
         return data
 
     @property
     def tag(self) -> str:
         """Returns the user's Discord tag."""
+        if self.discriminator == "0":
+            return f"@{self.username}"
         return f"{self.username}#{self.discriminator}"
 
     @property

interactions/models/discord/user.pyi

@@ -39,7 +39,7 @@ class _SendDMMixin(SendMixin):
 class FakeBaseUserMixin(DiscordObject, _SendDMMixin):
     username: str
     global_name: str | None
-    discriminator: int
+    discriminator: str
     avatar: Asset
     def __str__(self) -> str: ...
     @classmethod