mark Stickers deprecated

andersfylling · Aug 7, 2021 · bc648e9 · bc648e9
1 parent 78ff537
commit bc648e9
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 29 deletions.
diff --git a/iface_copier_gen.go b/iface_copier_gen.go
diff --git a/iface_reseter_gen.go b/iface_reseter_gen.go
diff --git a/message.go b/message.go
@@ -155,35 +155,37 @@ var _ DeepCopier = (*MessageSticker)(nil)
 
 // Message https://discord.com/developers/docs/resources/channel#message-object-message-structure
 type Message struct {
-	ID                Snowflake           `json:"id"`
-	ChannelID         Snowflake           `json:"channel_id"`
-	GuildID           Snowflake           `json:"guild_id"`
-	Author            *User               `json:"author"`
-	Member            *Member             `json:"member"`
-	Content           string              `json:"content"`
-	Timestamp         Time                `json:"timestamp"`
-	EditedTimestamp   Time                `json:"edited_timestamp"` // ?
-	Tts               bool                `json:"tts"`
-	MentionEveryone   bool                `json:"mention_everyone"`
-	Mentions          []*User             `json:"mentions"`
-	MentionRoles      []Snowflake         `json:"mention_roles"`
-	MentionChannels   []*MentionChannel   `json:"mention_channels"`
-	Attachments       []*Attachment       `json:"attachments"`
-	Embeds            []*Embed            `json:"embeds"`
-	Reactions         []*Reaction         `json:"reactions"` // ?
-	Nonce             interface{}         `json:"nonce"`     // NOT A SNOWFLAKE! DONT TOUCH!
-	Pinned            bool                `json:"pinned"`
-	WebhookID         Snowflake           `json:"webhook_id"` // ?
-	Type              MessageType         `json:"type"`
-	Activity          MessageActivity     `json:"activity"`
-	Application       MessageApplication  `json:"application"`
-	MessageReference  *MessageReference   `json:"message_reference"`
-	ReferencedMessage *Message            `json:"referenced_message"`
-	Flags             MessageFlag         `json:"flags"`
-	StickerItems      []*StickerItem      `json:"sticker_items"`
-	Stickers          []*MessageSticker   `json:"stickers"`
-	Components        []*MessageComponent `json:"components"`
-	Interaction       *MessageInteraction `json:"interaction"`
+	ID                Snowflake          `json:"id"`
+	ChannelID         Snowflake          `json:"channel_id"`
+	GuildID           Snowflake          `json:"guild_id"`
+	Author            *User              `json:"author"`
+	Member            *Member            `json:"member"`
+	Content           string             `json:"content"`
+	Timestamp         Time               `json:"timestamp"`
+	EditedTimestamp   Time               `json:"edited_timestamp"` // ?
+	Tts               bool               `json:"tts"`
+	MentionEveryone   bool               `json:"mention_everyone"`
+	Mentions          []*User            `json:"mentions"`
+	MentionRoles      []Snowflake        `json:"mention_roles"`
+	MentionChannels   []*MentionChannel  `json:"mention_channels"`
+	Attachments       []*Attachment      `json:"attachments"`
+	Embeds            []*Embed           `json:"embeds"`
+	Reactions         []*Reaction        `json:"reactions"` // ?
+	Nonce             interface{}        `json:"nonce"`     // NOT A SNOWFLAKE! DONT TOUCH!
+	Pinned            bool               `json:"pinned"`
+	WebhookID         Snowflake          `json:"webhook_id"` // ?
+	Type              MessageType        `json:"type"`
+	Activity          MessageActivity    `json:"activity"`
+	Application       MessageApplication `json:"application"`
+	MessageReference  *MessageReference  `json:"message_reference"`
+	ReferencedMessage *Message           `json:"referenced_message"`
+	Flags             MessageFlag        `json:"flags"`
+	StickerItems      []*StickerItem     `json:"sticker_items"`
+
+	// Deprecated
+	Stickers    []*MessageSticker   `json:"stickers"`
+	Components  []*MessageComponent `json:"components"`
+	Interaction *MessageInteraction `json:"interaction"`
 	// SpoilerTagContent is only true if the entire message text is tagged as a spoiler (aka completely wrapped in ||)
 	SpoilerTagContent        bool `json:"-"`
 	SpoilerTagAllAttachments bool `json:"-"`

diff --git a/sort_gen.go b/sort_gen.go
@@ -255,6 +255,8 @@ func derefSliceP(v interface{}) (s interface{}) {
 		s = *t
 	case *[]*MessageSticker:
 		s = *t
+	case *[]*StickerItem:
+		s = *t
 	case *[]*GetReactionURLParams:
 		s = *t
 	case *[]*Reaction:
@@ -443,6 +445,12 @@ func sortByID(v interface{}, flags Flag) {
 		} else {
 			less = func(i, j int) bool { return s[i].ID < s[j].ID }
 		}
+	case []*StickerItem:
+		if descending {
+			less = func(i, j int) bool { return s[i].ID > s[j].ID }
+		} else {
+			less = func(i, j int) bool { return s[i].ID < s[j].ID }
+		}
 	case []*Role:
 		if descending {
 			less = func(i, j int) bool { return s[i].ID > s[j].ID }
@@ -923,6 +931,12 @@ func sortByName(v interface{}, flags Flag) {
 		} else {
 			less = func(i, j int) bool { return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name) }
 		}
+	case []*StickerItem:
+		if descending {
+			less = func(i, j int) bool { return strings.ToLower(s[i].Name) > strings.ToLower(s[j].Name) }
+		} else {
+			less = func(i, j int) bool { return strings.ToLower(s[i].Name) < strings.ToLower(s[j].Name) }
+		}
 	case []*Role:
 		if descending {
 			less = func(i, j int) bool { return strings.ToLower(s[i].Name) > strings.ToLower(s[j].Name) }