Add new activity fields

discord/discord-api-docs#7674

Author: sebm253

bot/handlers/presence_update_handler.go

@@ -120,8 +120,11 @@ func isActivityUpdated(old discord.Activity, new discord.Activity) bool {
 		compareActivityTimestampsPtr(old.Timestamps, new.Timestamps) ||
 		compareStringPtr(old.SyncID, new.SyncID) ||
 		old.ApplicationID != new.ApplicationID ||
+		compareStatusDisplayTypePtr(old.StatusDisplayType, new.StatusDisplayType) ||
 		compareStringPtr(old.Details, new.Details) ||
+		compareStringPtr(old.DetailsURL, new.DetailsURL) ||
 		compareStringPtr(old.State, new.State) ||
+		compareStringPtr(old.StateURL, new.StateURL) ||
 		comparePartialEmojiPtr(old.Emoji, new.Emoji) ||
 		compareActivityPartyPtr(old.Party, new.Party) ||
 		compareActivityAssetsPtr(old.Assets, new.Assets) ||
@@ -204,7 +207,7 @@ func compareActivityAssetsPtr(old *discord.ActivityAssets, new *discord.Activity
 	if old == nil || new == nil {
 		return true
 	}
-	return old.LargeText != new.LargeText || old.LargeImage != new.LargeImage || old.SmallText != new.SmallText || old.SmallImage != new.SmallImage
+	return old.LargeText != new.LargeText || old.LargeImage != new.LargeImage || old.LargeURL != new.LargeURL || old.SmallText != new.SmallText || old.SmallImage != new.SmallImage || old.SmallURL != new.SmallURL
 }
 
 func compareActivitySecretsPtr(old *discord.ActivitySecrets, new *discord.ActivitySecrets) bool {
@@ -216,3 +219,13 @@ func compareActivitySecretsPtr(old *discord.ActivitySecrets, new *discord.Activi
 	}
 	return old.Join != new.Join || old.Spectate != new.Spectate || old.Match != new.Match
 }
+
+func compareStatusDisplayTypePtr(old *discord.ActivityStatusDisplayType, new *discord.ActivityStatusDisplayType) bool {
+	if old == nil && new == nil {
+		return false
+	}
+	if old == nil || new == nil {
+		return true
+	}
+	return *old != *new
+}

discord/activity.go

@@ -24,23 +24,26 @@ const (
 
 // Activity represents the fields of a user's presence
 type Activity struct {
-	ID            string              `json:"id"`
-	Name          string              `json:"name"`
-	Type          ActivityType        `json:"type"`
-	URL           *string             `json:"url,omitempty"`
-	CreatedAt     time.Time           `json:"created_at"`
-	Timestamps    *ActivityTimestamps `json:"timestamps,omitempty"`
-	SyncID        *string             `json:"sync_id,omitempty"`
-	ApplicationID snowflake.ID        `json:"application_id,omitempty"`
-	Details       *string             `json:"details,omitempty"`
-	State         *string             `json:"state,omitempty"`
-	Emoji         *PartialEmoji       `json:"emoji,omitempty"`
-	Party         *ActivityParty      `json:"party,omitempty"`
-	Assets        *ActivityAssets     `json:"assets,omitempty"`
-	Secrets       *ActivitySecrets    `json:"secrets,omitempty"`
-	Instance      *bool               `json:"instance,omitempty"`
-	Flags         ActivityFlags       `json:"flags,omitempty"`
-	Buttons       []string            `json:"buttons,omitempty"`
+	ID                string                     `json:"id"`
+	Name              string                     `json:"name"`
+	Type              ActivityType               `json:"type"`
+	URL               *string                    `json:"url,omitempty"`
+	CreatedAt         time.Time                  `json:"created_at"`
+	Timestamps        *ActivityTimestamps        `json:"timestamps,omitempty"`
+	SyncID            *string                    `json:"sync_id,omitempty"`
+	ApplicationID     snowflake.ID               `json:"application_id,omitempty"`
+	StatusDisplayType *ActivityStatusDisplayType `json:"status_display_type,omitempty"`
+	Details           *string                    `json:"details,omitempty"`
+	DetailsURL        *string                    `json:"details_url,omitempty"`
+	State             *string                    `json:"state,omitempty"`
+	StateURL          *string                    `json:"state_url,omitempty"`
+	Emoji             *PartialEmoji              `json:"emoji,omitempty"`
+	Party             *ActivityParty             `json:"party,omitempty"`
+	Assets            *ActivityAssets            `json:"assets,omitempty"`
+	Secrets           *ActivitySecrets           `json:"secrets,omitempty"`
+	Instance          *bool                      `json:"instance,omitempty"`
+	Flags             ActivityFlags              `json:"flags,omitempty"`
+	Buttons           []string                   `json:"buttons,omitempty"`
 }
 
 func (a *Activity) UnmarshalJSON(data []byte) error {
@@ -149,8 +152,10 @@ type ActivityParty struct {
 type ActivityAssets struct {
 	LargeImage string `json:"large_image,omitempty"`
 	LargeText  string `json:"large_text,omitempty"`
+	LargeURL   string `json:"large_url,omitempty"`
 	SmallImage string `json:"small_image,omitempty"`
 	SmallText  string `json:"small_text,omitempty"`
+	SmallURL   string `json:"small_url,omitempty"`
 }
 
 // ActivitySecrets contain secrets for Rich Presence joining and spectating
@@ -159,3 +164,11 @@ type ActivitySecrets struct {
 	Spectate string `json:"spectate,omitempty"`
 	Match    string `json:"match,omitempty"`
 }
+
+type ActivityStatusDisplayType int
+
+const (
+	ActivityStatusDisplayTypeName ActivityStatusDisplayType = iota
+	ActivityStatusDisplayTypeState
+	ActivityStatusDisplayTypeDetails
+)