fix: match behavior to discord docs pr

discord/discord-api-docs#6130

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: str | None = attrs.field(repr=True, metadata=docs("The user's 4-digit discord-tag"), default=None)
+    discriminator: str = attrs.field(
+        repr=True, metadata=docs("The user's 4-digit discord-tag")
+    )  # 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,14 +64,16 @@ 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 not self.discriminator or self.discriminator == "0":
+        if self.discriminator == "0":
             return f"@{self.username}"
         return f"{self.username}#{self.discriminator}"
 

interactions/models/discord/user.pyi

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