mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-24 07:05:35 +00:00
Merge branch 'beta'
This commit is contained in:
@@ -20,12 +20,14 @@ public class OutgoingMessageInfoAttribute: MessageAttribute {
|
||||
public let flags: OutgoingMessageInfoFlags
|
||||
public let acknowledged: Bool
|
||||
public let correlationId: Int64?
|
||||
public let bubbleUpEmojiOrStickersets: [ItemCollectionId]
|
||||
|
||||
public init(uniqueId: Int64, flags: OutgoingMessageInfoFlags, acknowledged: Bool, correlationId: Int64?) {
|
||||
public init(uniqueId: Int64, flags: OutgoingMessageInfoFlags, acknowledged: Bool, correlationId: Int64?, bubbleUpEmojiOrStickersets: [ItemCollectionId]) {
|
||||
self.uniqueId = uniqueId
|
||||
self.flags = flags
|
||||
self.acknowledged = acknowledged
|
||||
self.correlationId = correlationId
|
||||
self.bubbleUpEmojiOrStickersets = bubbleUpEmojiOrStickersets
|
||||
}
|
||||
|
||||
required public init(decoder: PostboxDecoder) {
|
||||
@@ -33,6 +35,11 @@ public class OutgoingMessageInfoAttribute: MessageAttribute {
|
||||
self.flags = OutgoingMessageInfoFlags(rawValue: decoder.decodeInt32ForKey("f", orElse: 0))
|
||||
self.acknowledged = decoder.decodeInt32ForKey("ack", orElse: 0) != 0
|
||||
self.correlationId = decoder.decodeOptionalInt64ForKey("cid")
|
||||
if let data = decoder.decodeDataForKey("bubbleUpEmojiOrStickersets") {
|
||||
self.bubbleUpEmojiOrStickersets = ItemCollectionId.decodeArrayFromBuffer(ReadBuffer(data: data))
|
||||
} else {
|
||||
self.bubbleUpEmojiOrStickersets = []
|
||||
}
|
||||
}
|
||||
|
||||
public func encode(_ encoder: PostboxEncoder) {
|
||||
@@ -44,13 +51,16 @@ public class OutgoingMessageInfoAttribute: MessageAttribute {
|
||||
} else {
|
||||
encoder.encodeNil(forKey: "cid")
|
||||
}
|
||||
let bubbleUpEmojiOrStickersetsBuffer = WriteBuffer()
|
||||
ItemCollectionId.encodeArrayToBuffer(self.bubbleUpEmojiOrStickersets, buffer: bubbleUpEmojiOrStickersetsBuffer)
|
||||
encoder.encodeData(bubbleUpEmojiOrStickersetsBuffer.makeData(), forKey: "bubbleUpEmojiOrStickersets")
|
||||
}
|
||||
|
||||
public func withUpdatedFlags(_ flags: OutgoingMessageInfoFlags) -> OutgoingMessageInfoAttribute {
|
||||
return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: flags, acknowledged: self.acknowledged, correlationId: self.correlationId)
|
||||
return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: flags, acknowledged: self.acknowledged, correlationId: self.correlationId, bubbleUpEmojiOrStickersets: self.bubbleUpEmojiOrStickersets)
|
||||
}
|
||||
|
||||
public func withUpdatedAcknowledged(_ acknowledged: Bool) -> OutgoingMessageInfoAttribute {
|
||||
return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: self.flags, acknowledged: acknowledged, correlationId: self.correlationId)
|
||||
return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: self.flags, acknowledged: acknowledged, correlationId: self.correlationId, bubbleUpEmojiOrStickersets: self.bubbleUpEmojiOrStickersets)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user