Add ability to use primary guild (clan) data for users #10211

blord0 · 2025-06-18T01:52:36Z

Summary

Checklist

If code changes were made then they have been tested.
- I have updated the documentation to reflect the changes.
This PR fixes an issue.
This PR adds something new (e.g. new method or parameters).
This PR is a breaking change (e.g. methods or parameters removed/renamed)
This PR is not a code change (e.g. documentation, README, ...)

Soheab · 2025-06-18T04:22:16Z

There is already a PR for this: #10190
~~even though this implementation looks majorly better~~

dolfies

the clan field is deprecated, this should use primary_guild (and the naming should prolly reflect that as clans are a dead concept)

discord/primary_guild.py

discord/user.py

Co-authored-by: DA344 <108473820+DA-344@users.noreply.github.com>

Forgot to add this one Co-authored-by: DA344 <108473820+DA-344@users.noreply.github.com>

… correct fix, but it works

…always an int

discord/asset.py

discord/primary_guild.py

Co-authored-by: dolfies <jeyalfie47@gmail.com>

discord/primary_guild.py

discord/user.py

discord/types/primary_guild.py

Co-authored-by: dolfies <jeyalfie47@gmail.com>

blord0 · 2025-06-19T21:40:50Z

Looks nice, but still needs to wait for discord to document this

Any idea how often discord updates their documentation? Latest pull in discord's api docs for tags was opened 2nd May 2024 and has not been updated in the past 3 weeks discord/discord-api-docs#6836

blord0 · 2025-06-19T23:38:42Z

Also the api does seem to be stable. From discord/discord-api-docs#6836 (comment) (19th May 2024) you can see that they still use the same fields of tag, identity_guild_id, identity_enabled and badge. Only part that has changed is it is now under the primary_guild section, not clan

DA-344 · 2025-06-20T15:04:12Z

You'll need to wait for Discord to just merge the documentation of it, and although it looks stable doesn't mean it will always be, rn is not documented so they have an excuse to (although even documented they do) break the field at any point.

blord0 · 2025-06-20T23:14:56Z

You'll need to wait for Discord to just merge the documentation of it, and although it looks stable doesn't mean it will always be, rn is not documented so they have an excuse to (although even documented they do) break the field at any point.

Yea I get that, but tags have been rolled out to all servers now. The one change discord did was the field name from clan -> primary_guild due to clans being deprecated (I would argue that this is an even stronger indication that they won't change as the fields of tag, identity_guild_id, identity_enabled and badge are all the same even after a renaming, as that would have been the perfect point to re-do anything they wanted to do)

+In the unlikely event they do, I would be more than happy to fix/patch/whatever the code

DA-344 · 2025-06-20T23:20:23Z

Still, docs must be merged first

Rapptz · 2025-06-20T23:23:38Z

Generally speaking I don't merge features that are undocumented because we've been bitten by it in the past (most recently, voice channel statuses) and it's not worth the upkeep.

discord/primary_guild.py

discord/types/user.py

discord/primary_guild.py

Soheab · 2025-07-01T23:40:07Z

The API docs have been merged per discord/discord-api-docs@a1bac5f !

DA-344

The route has changed

discord/asset.py

Co-authored-by: DA344 <108473820+DA-344@users.noreply.github.com>

blord0 · 2025-07-03T13:18:13Z

Just double checked the docs and everything seems good to me
https://discord.com/developers/docs/resources/user#user-object-user-primary-guild

Soheab

LGMT overall.

discord/user.py

discord/primary_guild.py

Soheab · 2025-07-05T09:46:14Z

discord/primary_guild.py

+        payload: PrimaryGuildPayload = {"identity_guild_id": None, "identity_enabled": False, "tag": None, "badge": None}
+        return cls(state=state, data=payload)


You don't really need to define each key here; an empty dict would work too since the _update method makes everything default to None regardless.

I guess it's better to be explicit, but I’m not sure.

I agree here.

Changed it to set only identity_enabled to False, as None has a specific meaning

discord/primary_guild.py

Rapptz · 2025-07-07T07:25:56Z

discord/primary_guild.py

+        payload: PrimaryGuildPayload = {"identity_guild_id": None, "identity_enabled": False, "tag": None, "badge": None}
+        return cls(state=state, data=payload)


I agree here.

discord/user.py

blord0 · 2025-07-11T10:53:21Z

Sorry for delays, was on holiday

Rapptz

LGTM. Thanks

blord0 added 6 commits June 18, 2025 02:16

Added clan property to user object

4e1d3c9

Added base code for clan properties

a9413a6

Added getting clan tag asset

b422aaf

Fix type corrections

81e63bc

Comments

644aba8

Fix circular import issues

e3e234c

dolfies suggested changes Jun 18, 2025

View reviewed changes

Rename all clan references to primary_guild

106ad77

blord0 commented Jun 18, 2025

View reviewed changes

discord/primary_guild.py Outdated Show resolved Hide resolved

blord0 changed the title ~~Add ability to use clan data for users~~ Add ability to use primary guild (clan) data for users Jun 18, 2025

DA-344 suggested changes Jun 18, 2025

View reviewed changes

blord0 and others added 8 commits June 18, 2025 13:34

Apply suggestions from code review

cb6d304

Co-authored-by: DA344 <108473820+DA-344@users.noreply.github.com>

Fix import issues

1aa48a1

Fix as identity_enabled is only field assured to be returned

ddf68cb

Apply change from code review

6eb8e05

Forgot to add this one Co-authored-by: DA344 <108473820+DA-344@users.noreply.github.com>

Styling changes

f6d93c4

Add docs for PrimaryGuild

2f4000d

tab complete was not working for members. Not too sure if this is the…

db82935

… correct fix, but it works

guild_id would sometimes return a string, convert to make sure it is …

9dc9c40

…always an int

dolfies suggested changes Jun 18, 2025

View reviewed changes

discord/asset.py Outdated Show resolved Hide resolved

discord/primary_guild.py Outdated Show resolved Hide resolved

discord/primary_guild.py Outdated Show resolved Hide resolved

discord/primary_guild.py Outdated Show resolved Hide resolved

blord0 and others added 4 commits June 18, 2025 20:18

Apply suggestions from code review

82b9483

Co-authored-by: dolfies <jeyalfie47@gmail.com>

Change guild_id to id

d63672e

Style fixes

3a8e441

Remove unnecessary returning of private attributes

f718627

dolfies suggested changes Jun 18, 2025

View reviewed changes

blord0 and others added 4 commits June 18, 2025 21:23

Apply suggestions from code review

15cff6a

Co-authored-by: dolfies <jeyalfie47@gmail.com>

Apply suggestions from code review

7802aaa

Co-authored-by: dolfies <jeyalfie47@gmail.com>

Mark identity_enabled and _badge as optional

4929a17

Checks that identity_enabled is true when returning a PrimaryGuild

96bebf4

blord0 added 2 commits June 19, 2025 22:32

Move primary_guild's type file into user's as it was too small

5c69689

Formatting

4875a3d

Rapptz mentioned this pull request Jun 20, 2025

add support for clan/server tags #10190

Closed

6 tasks

Rapptz added the pending label Jun 20, 2025

Merge branch 'Rapptz:master' into master

0218fed

DA-344 suggested changes Jun 23, 2025

View reviewed changes

discord/primary_guild.py Outdated Show resolved Hide resolved

discord/primary_guild.py Show resolved Hide resolved

discord/types/user.py Show resolved Hide resolved

discord/primary_guild.py Show resolved Hide resolved

blord0 mentioned this pull request Jun 25, 2025

feat(user): add primary_guild nextcord/nextcord#1259

Open

3 tasks

DA-344 suggested changes Jul 2, 2025

View reviewed changes

discord/asset.py Outdated Show resolved Hide resolved

Update discord/asset.py

3897ace

Co-authored-by: DA344 <108473820+DA-344@users.noreply.github.com>

Merge branch 'Rapptz:master' into master

85f9830

Soheab suggested changes Jul 5, 2025

View reviewed changes

Rapptz requested changes Jul 7, 2025

View reviewed changes

Rapptz removed the pending label Jul 8, 2025

blord0 and others added 3 commits July 11, 2025 11:39

Merge branch 'Rapptz:master' into master

d2fda92

Add recommended changes

fcda2e6

Forgot to run black

84dc82b

blord0 requested a review from Rapptz July 12, 2025 11:06

blord0 added 2 commits July 12, 2025 12:10

Reformat "is not None" checks to fit format

551129b

Give state the correct type hinting

0ff7bb4

Rapptz approved these changes Jul 18, 2025

View reviewed changes

Rapptz merged commit 7724764 into Rapptz:master Jul 18, 2025
8 checks passed

		payload: PrimaryGuildPayload = {"identity_guild_id": None, "identity_enabled": False, "tag": None, "badge": None}
		return cls(state=state, data=payload)

Uh oh!

Add ability to use primary guild (clan) data for users #10211

Add ability to use primary guild (clan) data for users #10211

Conversation

blord0 commented Jun 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

Soheab commented Jun 18, 2025

Uh oh!

dolfies left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

blord0 commented Jun 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blord0 commented Jun 19, 2025

Uh oh!

DA-344 commented Jun 20, 2025

Uh oh!

blord0 commented Jun 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DA-344 commented Jun 20, 2025

Uh oh!

Rapptz commented Jun 20, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Soheab commented Jul 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DA-344 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

blord0 commented Jul 3, 2025

Uh oh!

Soheab left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Soheab Jul 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Rapptz Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

blord0 Jul 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Rapptz Jul 7, 2025

Choose a reason for hiding this comment

Uh oh!

blord0 commented Jun 18, 2025 •

edited

Loading

blord0 commented Jun 19, 2025 •

edited

Loading

blord0 commented Jun 20, 2025 •

edited

Loading

Soheab commented Jul 1, 2025 •

edited

Loading

Soheab Jul 5, 2025 •

edited

Loading