Merge commit '7621e2f8dec938cf48181c8b10afc9b01f444e68' into beta

submodules/MediaResources/Sources/CachedResourceRepresentations.swift

@@ -0,0 +1,391 @@
+import Foundation
+import UIKit
+import Postbox
+import SwiftSignalKit
+
+public final class CachedStickerAJpegRepresentation: CachedMediaResourceRepresentation {
+    public let size: CGSize?
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public var uniqueId: String {
+        if let size = self.size {
+            return "sticker-ajpeg-\(Int(size.width))x\(Int(size.height))"
+        } else {
+            return "sticker-ajpeg"
+        }
+    }
+    
+    public init(size: CGSize?) {
+        self.size = size
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedStickerAJpegRepresentation {
+            return self.size == to.size
+        } else {
+            return false
+        }
+    }
+}
+
+public enum CachedScaledImageRepresentationMode: Int32 {
+    case fill = 0
+    case aspectFit = 1
+}
+
+public final class CachedScaledImageRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public let size: CGSize
+    public let mode: CachedScaledImageRepresentationMode
+    
+    public var uniqueId: String {
+        return "scaled-image-\(Int(self.size.width))x\(Int(self.size.height))-\(self.mode.rawValue)"
+    }
+    
+    public init(size: CGSize, mode: CachedScaledImageRepresentationMode) {
+        self.size = size
+        self.mode = mode
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedScaledImageRepresentation {
+            return self.size == to.size && self.mode == to.mode
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedVideoFirstFrameRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public var uniqueId: String {
+        return "first-frame"
+    }
+    
+    public init() {
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if to is CachedVideoFirstFrameRepresentation {
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedVideoPrefixFirstFrameRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public var uniqueId: String {
+        return "prefix-first-frame"
+    }
+    
+    public let prefixLength: Int32
+    
+    public init(prefixLength: Int32) {
+        self.prefixLength = prefixLength
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedVideoPrefixFirstFrameRepresentation {
+            if self.prefixLength != to.prefixLength {
+                return false
+            }
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedScaledVideoFirstFrameRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public let size: CGSize
+    
+    public var uniqueId: String {
+        return "scaled-frame-\(Int(self.size.width))x\(Int(self.size.height))"
+    }
+    
+    public init(size: CGSize) {
+        self.size = size
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedScaledVideoFirstFrameRepresentation {
+            return self.size == to.size
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedBlurredWallpaperRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public var uniqueId: String {
+        return "blurred-wallpaper"
+    }
+    
+    public init() {
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if to is CachedBlurredWallpaperRepresentation {
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedAlbumArtworkRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public let size: CGSize?
+    
+    public var uniqueId: String {
+        if let size = self.size {
+            return "album-artwork-\(Int(size.width))x\(Int(size.height))"
+        } else {
+            return "album-artwork"
+        }
+    }
+    
+    public init(size: CGSize) {
+        self.size = size
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedAlbumArtworkRepresentation {
+            return self.size == to.size
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedEmojiThumbnailRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public let outline: Bool
+    
+    public var uniqueId: String {
+        return "emoji-thumb-\(self.outline ? 1 : 0)"
+    }
+    
+    public init(outline: Bool) {
+        self.outline = outline
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedEmojiThumbnailRepresentation {
+            return self.outline == to.outline
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedEmojiRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public let tile: UInt8
+    public let outline: Bool
+    
+    public var uniqueId: String {
+        return "emoji-\(Int(self.tile))-\(self.outline ? 1 : 0)"
+    }
+    
+    public init(tile: UInt8, outline: Bool) {
+        self.tile = tile
+        self.outline = outline
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let to = to as? CachedEmojiRepresentation {
+            return self.tile == to.tile && self.outline == to.outline
+        } else {
+            return false
+        }
+    }
+}
+
+public enum EmojiFitzModifier: Int32, Equatable {
+    case type12
+    case type3
+    case type4
+    case type5
+    case type6
+    
+    public init?(emoji: String) {
+        switch emoji.unicodeScalars.first?.value {
+            case 0x1f3fb:
+                self = .type12
+            case 0x1f3fc:
+                self = .type3
+            case 0x1f3fd:
+                self = .type4
+            case 0x1f3fe:
+                self = .type5
+            case 0x1f3ff:
+                self = .type6
+            default:
+                return nil
+        }
+    }
+}
+
+public final class CachedAnimatedStickerFirstFrameRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public let width: Int32
+    public let height: Int32
+    public let fitzModifier: EmojiFitzModifier?
+    
+    public init(width: Int32, height: Int32, fitzModifier: EmojiFitzModifier? = nil) {
+        self.width = width
+        self.height = height
+        self.fitzModifier = fitzModifier
+    }
+    
+    public var uniqueId: String {
+        let version: Int = 1
+        if let fitzModifier = self.fitzModifier {
+            return "animated-sticker-first-frame-\(self.width)x\(self.height)-fitz\(fitzModifier.rawValue)-v\(version)"
+        } else {
+            return "animated-sticker-first-frame-\(self.width)x\(self.height)-v\(version)"
+        }
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let other = to as? CachedAnimatedStickerFirstFrameRepresentation {
+            if other.width != self.width {
+                return false
+            }
+            if other.height != self.height {
+                return false
+            }
+            if other.fitzModifier != self.fitzModifier {
+                return false
+            }
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedAnimatedStickerRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .shortLived
+    
+    public let width: Int32
+    public let height: Int32
+    public let fitzModifier: EmojiFitzModifier?
+    
+    public var uniqueId: String {
+        let version: Int = 8
+        if let fitzModifier = self.fitzModifier {
+            return "animated-sticker-\(self.width)x\(self.height)-fitz\(fitzModifier.rawValue)-v\(version)"
+        } else {
+            return "animated-sticker-\(self.width)x\(self.height)-v\(version)"
+        }
+    }
+    
+    public init(width: Int32, height: Int32, fitzModifier: EmojiFitzModifier? = nil) {
+        self.width = width
+        self.height = height
+        self.fitzModifier = fitzModifier
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let other = to as? CachedAnimatedStickerRepresentation {
+            if other.width != self.width {
+                return false
+            }
+            if other.height != self.height {
+                return false
+            }
+            if other.fitzModifier != self.fitzModifier {
+                return false
+            }
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedVideoStickerRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .shortLived
+    
+    public let width: Int32
+    public let height: Int32
+    
+    public var uniqueId: String {
+        let version: Int = 3
+        return "video-sticker-\(self.width)x\(self.height)-v\(version)"
+        
+    }
+    
+    public init(width: Int32, height: Int32) {
+        self.width = width
+        self.height = height
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if let other = to as? CachedVideoStickerRepresentation {
+            if other.width != self.width {
+                return false
+            }
+            if other.height != self.height {
+                return false
+            }
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public final class CachedPreparedPatternWallpaperRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public var uniqueId: String {
+        return "prepared-pattern-wallpaper"
+    }
+    
+    public init() {
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if to is CachedPreparedPatternWallpaperRepresentation {
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+
+public final class CachedPreparedSvgRepresentation: CachedMediaResourceRepresentation {
+    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
+    
+    public var uniqueId: String {
+        return "prepared-svg"
+    }
+    
+    public init() {
+    }
+    
+    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
+        if to is CachedPreparedSvgRepresentation {
+            return true
+        } else {
+            return false
+        }
+    }
+}

submodules/MediaResources/Sources/MediaPlaybackStoredState.swift

@@ -0,0 +1,57 @@
+import Foundation
+import UIKit
+import SwiftSignalKit
+import TelegramCore
+import TelegramUIPreferences
+import Postbox
+
+public final class MediaPlaybackStoredState: Codable {
+    public let timestamp: Double
+    public let playbackRate: AudioPlaybackRate
+    
+    public init(timestamp: Double, playbackRate: AudioPlaybackRate) {
+        self.timestamp = timestamp
+        self.playbackRate = playbackRate
+    }
+    
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: StringCodingKey.self)
+
+        self.timestamp = try container.decode(Double.self, forKey: "timestamp")
+        self.playbackRate = AudioPlaybackRate(rawValue: try container.decode(Int32.self, forKey: "playbackRate"))
+    }
+    
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: StringCodingKey.self)
+
+        try container.encode(self.timestamp, forKey: "timestamp")
+        try container.encode(self.playbackRate.rawValue, forKey: "playbackRate")
+    }
+}
+
+public func mediaPlaybackStoredState(engine: TelegramEngine, messageId: EngineMessage.Id) -> Signal<MediaPlaybackStoredState?, NoError> {
+    return engine.data.get(TelegramEngine.EngineData.Item.Messages.Message(id: messageId))
+    |> map { message -> MediaPlaybackStoredState? in
+        guard let message else {
+            return nil
+        }
+        for attribute in message.attributes {
+            if let attribute = attribute as? DerivedDataMessageAttribute {
+                return attribute.data["mps"]?.get(MediaPlaybackStoredState.self)
+            }
+        }
+        return nil
+    }
+}
+
+public func updateMediaPlaybackStoredStateInteractively(engine: TelegramEngine, messageId: EngineMessage.Id, state: MediaPlaybackStoredState?) -> Signal<Never, NoError> {
+    return engine.messages.updateLocallyDerivedData(messageId: messageId, update: { data in
+        var data = data
+        if let state, let entry = CodableEntry(state) {
+            data["mps"] = entry
+        } else {
+            data.removeValue(forKey: "mps")
+        }
+        return data
+    })
+}