From 449a36aa6b0c8ea5ae08aaa63580ff8dad6dd1f2 Mon Sep 17 00:00:00 2001
From: overtake <overtakeful@gmail.com>
Date: Tue, 28 Feb 2017 13:29:48 +0300
Subject: [PATCH] StickerPack changes

---
 TelegramCore/StickerManagement.swift | 11 +++++++--
 TelegramCore/StickerPack.swift       | 36 +++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/TelegramCore/StickerManagement.swift b/TelegramCore/StickerManagement.swift
index b1a5cbb510..6a7bd3e1ee 100644
--- a/TelegramCore/StickerManagement.swift
+++ b/TelegramCore/StickerManagement.swift
@@ -39,8 +39,15 @@ func manageStickerPacks(network: Network, postbox: Postbox) -> Signal<Void, NoEr
                         case let .allStickers(_, sets):
                             for apiPack in sets {
                                 switch apiPack {
-                                    case let .stickerSet(_, id, accessHash, title, shortName, _, nHash):
-                                        stickerPackInfos.append(StickerPackCollectionInfo(id: ItemCollectionId(namespace: Namespaces.ItemCollection.CloudStickerPacks, id: id), accessHash: accessHash, title: title, shortName: shortName, hash: nHash))
+                                    case let .stickerSet(flags, id, accessHash, title, shortName, _, nHash):
+                                        var setFlags:StickerPackCollectionInfoFlags = StickerPackCollectionInfoFlags()
+                                        if (flags & (1 << 2)) != 0 {
+                                            setFlags.insert(.official)
+                                        }
+                                        if (flags & (1 << 3)) != 0 {
+                                            setFlags.insert(.masks)
+                                        }
+                                        stickerPackInfos.append(StickerPackCollectionInfo(id: ItemCollectionId(namespace: Namespaces.ItemCollection.CloudStickerPacks, id: id), flags: setFlags, accessHash: accessHash, title: title, shortName: shortName, hash: nHash))
                                 }
                             }
                             break
diff --git a/TelegramCore/StickerPack.swift b/TelegramCore/StickerPack.swift
index f8905fb938..cffeebcfd1 100644
--- a/TelegramCore/StickerPack.swift
+++ b/TelegramCore/StickerPack.swift
@@ -5,15 +5,47 @@ import Foundation
     import Postbox
 #endif
 
+public struct StickerPackCollectionInfoFlags : OptionSet {
+    public var rawValue: Int32
+    
+    public init(rawValue: Int32) {
+        self.rawValue = rawValue
+    }
+    
+    public init() {
+        self.rawValue = 0
+    }
+    
+    public init(_ flags: StickerPackCollectionInfoFlags) {
+        var rawValue: Int32 = 0
+        
+        if flags.contains(StickerPackCollectionInfoFlags.masks) {
+            rawValue |= StickerPackCollectionInfoFlags.masks.rawValue
+        }
+        
+        if flags.contains(StickerPackCollectionInfoFlags.official) {
+            rawValue |= StickerPackCollectionInfoFlags.official.rawValue
+        }
+        
+        self.rawValue = rawValue
+    }
+    
+    public static let masks = StickerPackCollectionInfoFlags(rawValue: 1)
+    public static let official = StickerPackCollectionInfoFlags(rawValue: 2)
+}
+
+
 public final class StickerPackCollectionInfo: ItemCollectionInfo, Equatable {
     public let id: ItemCollectionId
+    public let flags:StickerPackCollectionInfoFlags
     public let accessHash: Int64
     public let title: String
     public let shortName: String
     public let hash: Int32
     
-    public init(id: ItemCollectionId, accessHash: Int64, title: String, shortName: String, hash: Int32) {
+    public init(id: ItemCollectionId, flags: StickerPackCollectionInfoFlags, accessHash: Int64, title: String, shortName: String, hash: Int32) {
         self.id = id
+        self.flags = flags
         self.accessHash = accessHash
         self.title = title
         self.shortName = shortName
@@ -26,6 +58,7 @@ public final class StickerPackCollectionInfo: ItemCollectionInfo, Equatable {
         self.title = decoder.decodeStringForKey("t")
         self.shortName = decoder.decodeStringForKey("s")
         self.hash = decoder.decodeInt32ForKey("h")
+        self.flags = StickerPackCollectionInfoFlags(rawValue: decoder.decodeInt32ForKey("f"))
     }
     
     public func encode(_ encoder: Encoder) {
@@ -34,6 +67,7 @@ public final class StickerPackCollectionInfo: ItemCollectionInfo, Equatable {
         encoder.encodeString(self.title, forKey: "t")
         encoder.encodeString(self.shortName, forKey: "s")
         encoder.encodeInt32(self.hash, forKey: "h")
+        encoder.encodeInt32(self.flags.rawValue, forKey: "f")
     }
     
     public static func ==(lhs: StickerPackCollectionInfo, rhs: StickerPackCollectionInfo) -> Bool {