Skip to content

Add GetEntitlement and new GetEntitlements param #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 2, 2024
+59 −32
Merged

Add GetEntitlement and new GetEntitlements param #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ab8ee6
Add GetEntitlement and new GetEntitlements param
sebm253 Nov 30, 2024
10047f6
Merge branch 'master' into feature/entitlement-endpoints
sebm253 Dec 1, 2024
76c6342
move params into a struct
sebm253 Dec 1, 2024
83390b5
move QueryParamsGetEntitlements
sebm253 Dec 1, 2024
fbb9528
shorten struct name
sebm253 Dec 2, 2024
3e2ccfa
rename struct again because ton cant decide
sebm253 Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions discord/entitlement.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,19 @@ import (
)

type Entitlement struct {
ID snowflake.ID `json:"id"`
SkuID snowflake.ID `json:"sku_id"`
ApplicationID snowflake.ID `json:"application_id"`
UserID *snowflake.ID `json:"user_id"`
Type EntitlementType `json:"type"`
Deleted bool `json:"deleted"`
StartsAt *time.Time `json:"starts_at"`
EndsAt *time.Time `json:"ends_at"`
GuildID *snowflake.ID `json:"guild_id"`
Consumed *bool `json:"consumed"`
ID snowflake.ID `json:"id"`
SkuID snowflake.ID `json:"sku_id"`
ApplicationID snowflake.ID `json:"application_id"`
UserID *snowflake.ID `json:"user_id"`
PromotionID *snowflake.ID `json:"promotion_id"`
Type EntitlementType `json:"type"`
Deleted bool `json:"deleted"`
GiftCodeFlags int `json:"gift_code_flags"`
Consumed *bool `json:"consumed"`
StartsAt *time.Time `json:"starts_at"`
EndsAt *time.Time `json:"ends_at"`
GuildID *snowflake.ID `json:"guild_id"`
SubscriptionID *snowflake.ID `json:"subscription_id"`
}

type EntitlementType int
Expand Down
67 changes: 45 additions & 22 deletions rest/applications.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ type Applications interface {
GetApplicationRoleConnectionMetadata(applicationID snowflake.ID, opts ...RequestOpt) ([]discord.ApplicationRoleConnectionMetadata, error)
UpdateApplicationRoleConnectionMetadata(applicationID snowflake.ID, newRecords []discord.ApplicationRoleConnectionMetadata, opts ...RequestOpt) ([]discord.ApplicationRoleConnectionMetadata, error)

GetEntitlements(applicationID snowflake.ID, userID snowflake.ID, guildID snowflake.ID, before snowflake.ID, after snowflake.ID, limit int, excludeEnded bool, skuIDs []snowflake.ID, opts ...RequestOpt) ([]discord.Entitlement, error)
GetEntitlements(applicationID snowflake.ID, params GetEntitlementsParams, opts ...RequestOpt) ([]discord.Entitlement, error)
GetEntitlement(applicationID snowflake.ID, entitlementID snowflake.ID, opts ...RequestOpt) (*discord.Entitlement, error)
CreateTestEntitlement(applicationID snowflake.ID, entitlementCreate discord.TestEntitlementCreate, opts ...RequestOpt) (*discord.Entitlement, error)
DeleteTestEntitlement(applicationID snowflake.ID, entitlementID snowflake.ID, opts ...RequestOpt) error
ConsumeEntitlement(applicationID snowflake.ID, entitlementID snowflake.ID, opts ...RequestOpt) error
Expand All @@ -51,6 +52,42 @@ type Applications interface {
GetActivityInstance(applicationID snowflake.ID, instanceID string, opts ...RequestOpt) (*discord.ActivityInstance, error)
}

// GetEntitlementsParams holds query parameters for Applications.GetEntitlements (https://discord.com/developers/docs/resources/entitlement#list-entitlements)
type GetEntitlementsParams struct {
UserID snowflake.ID
SkuIDs []snowflake.ID
Before int
After int
Limit int
GuildID snowflake.ID
ExcludeEnded bool
ExcludeDeleted bool
}

func (p GetEntitlementsParams) ToQueryValues() discord.QueryValues {
queryValues := discord.QueryValues{
"exclude_ended": p.ExcludeEnded,
"exclude_deleted": p.ExcludeDeleted,
"sku_ids": slicehelper.JoinSnowflakes(p.SkuIDs),
}
if p.UserID != 0 {
queryValues["user_id"] = p.UserID
}
if p.Before != 0 {
queryValues["before"] = p.Before
}
if p.After != 0 {
queryValues["after"] = p.After
}
if p.Limit != 0 {
queryValues["limit"] = p.Limit
}
if p.GuildID != 0 {
queryValues["guild_id"] = p.GuildID
}
return queryValues
}

type applicationsImpl struct {
client Client
}
Expand Down Expand Up @@ -183,27 +220,13 @@ func (s *applicationsImpl) UpdateApplicationRoleConnectionMetadata(applicationID
return
}

func (s *applicationsImpl) GetEntitlements(applicationID snowflake.ID, userID snowflake.ID, guildID snowflake.ID, before snowflake.ID, after snowflake.ID, limit int, excludeEnded bool, skuIDs []snowflake.ID, opts ...RequestOpt) (entitlements []discord.Entitlement, err error) {
queryValues := discord.QueryValues{
"exclude_ended": excludeEnded,
"sku_ids": slicehelper.JoinSnowflakes(skuIDs),
}
if userID != 0 {
queryValues["user_id"] = userID
}
if guildID != 0 {
queryValues["guild_id"] = guildID
}
if before != 0 {
queryValues["before"] = before
}
if after != 0 {
queryValues["after"] = after
}
if limit != 0 {
queryValues["limit"] = limit
}
err = s.client.Do(GetEntitlements.Compile(queryValues, applicationID), nil, &entitlements, opts...)
func (s *applicationsImpl) GetEntitlements(applicationID snowflake.ID, params GetEntitlementsParams, opts ...RequestOpt) (entitlements []discord.Entitlement, err error) {
err = s.client.Do(GetEntitlements.Compile(params.ToQueryValues(), applicationID), nil, &entitlements, opts...)
return
}

func (s *applicationsImpl) GetEntitlement(applicationID snowflake.ID, entitlementID snowflake.ID, opts ...RequestOpt) (entitlement *discord.Entitlement, err error) {
err = s.client.Do(GetEntitlement.Compile(nil, applicationID, entitlementID), nil, &entitlement, opts...)
return
}

Expand Down
1 change: 1 addition & 0 deletions rest/rest_endpoints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ var (
UpdateApplicationRoleConnectionMetadata = NewEndpoint(http.MethodPut, "/applications/{application.id}/role-connections/metadata")

GetEntitlements = NewEndpoint(http.MethodGet, "/applications/{application.id}/entitlements")
GetEntitlement = NewEndpoint(http.MethodGet, "/applications/{application.id}/entitlements/{entitlement.id}")
CreateTestEntitlement = NewEndpoint(http.MethodPost, "/applications/{application.id}/entitlements")
DeleteTestEntitlement = NewEndpoint(http.MethodDelete, "/applications/{application.id}/entitlements/{entitlement.id}")
ConsumeEntitlement = NewEndpoint(http.MethodPost, "/applications/{application.id}/entitlements/{entitlement.id}/consume")
Expand Down