patch (folders)!: add id property to GuildFolderItem

BREAKING CHANGE: signature of init modified
0ldF0x · Sep 8, 2022 · cbf0870 · cbf0870
1 parent 9bccc3b
commit cbf0870
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Sources/DiscordKit/Gateway/DiscordGateway.swift b/Sources/DiscordKit/Gateway/DiscordGateway.swift
@@ -51,7 +51,6 @@ public class DiscordGateway: ObservableObject {
 
     /// An array of guild folders
     @Published public var guildFolders: [GuildFolderItem] = []
-    @Published public var guildPositions: [Snowflake] = []
 
     private var evtListenerID: EventDispatch.HandlerIdentifier? = nil,
                 authFailureListenerID: EventDispatch.HandlerIdentifier? = nil,
@@ -227,6 +226,7 @@ public class DiscordGateway: ObservableObject {
         // Update guild folders
         guildFolders = settings.guildFolders.folders.map {
             .init(
+                id: $0.hasID ? String($0.id.value) : nil,
                 name: $0.hasName ? $0.name.value : nil,
                 guild_ids: $0.guildIds.map({ id in String(id) }),
                 color: $0.hasColor ? Int($0.color.value) : nil

diff --git a/Sources/DiscordKitCommon/Objects/Guild.swift b/Sources/DiscordKitCommon/Objects/Guild.swift
@@ -225,12 +225,14 @@ public struct GuildScheduledEventEntityMeta: Codable, GatewayData {
 ///
 /// Metadata for a guild folder
 public struct GuildFolderItem: Decodable, GatewayData, Equatable {
-    public init(name: String? = nil, guild_ids: [Snowflake], color: Int? = nil) {
+    public init(id: Snowflake? = nil, name: String? = nil, guild_ids: [Snowflake], color: Int? = nil) {
+        self.id = id
         self.name = name
         self.guild_ids = guild_ids
         self.color = color
     }
 
+    public let id: Snowflake?
     public let name: String?
     // let id: Int? // Sometimes Discord sends over String snowflakes, but sometimes it sends int snowflakes instead just to make life hard
     public let guild_ids: [Snowflake]