ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2024-07-22 20:43:52 +04:00
parent 4e46697a66
commit 31ba87fb0f
16 changed files with 252 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
submodules/TelegramCore/Sources/TelegramEngine/Messages/MediaArea.swift
View File

@@ -8,6 +8,7 @@ public enum MediaArea: Codable, Equatable {
case value
case flags
case temperature
case color
}
public struct Coordinates: Codable, Equatable {
@@ -150,7 +151,7 @@ public enum MediaArea: Codable, Equatable {
case reaction(coordinates: Coordinates, reaction: MessageReaction.Reaction, flags: ReactionFlags)
case channelMessage(coordinates: Coordinates, messageId: EngineMessage.Id)
case link(coordinates: Coordinates, url: String)
case weather(coordinates: Coordinates, emoji: String, temperature: Double, flags: WeatherFlags)
case weather(coordinates: Coordinates, emoji: String, temperature: Double, color: Int32)
public struct ReactionFlags: OptionSet {
public var rawValue: Int32
@@ -167,21 +168,6 @@ public enum MediaArea: Codable, Equatable {
public static let isFlipped = ReactionFlags(rawValue: 1 << 1)
}
public struct WeatherFlags: OptionSet {
public var rawValue: Int32
public init(rawValue: Int32) {
self.rawValue = rawValue
}
public init() {
self.rawValue = 0
}
public static let isDark = WeatherFlags(rawValue: 1 << 0)
}
private enum MediaAreaType: Int32 {
case venue
case reaction
@@ -222,8 +208,8 @@ public enum MediaArea: Codable, Equatable {
let coordinates = try container.decode(MediaArea.Coordinates.self, forKey: .coordinates)
let emoji = try container.decode(String.self, forKey: .value)
let temperature = try container.decode(Double.self, forKey: .temperature)
let flags = WeatherFlags(rawValue: try container.decodeIfPresent(Int32.self, forKey: .flags) ?? 0)
self = .weather(coordinates: coordinates, emoji: emoji, temperature: temperature, flags: flags)
let color = try container.decodeIfPresent(Int32.self, forKey: .color) ?? 0
self = .weather(coordinates: coordinates, emoji: emoji, temperature: temperature, color: color)
}
}
@@ -248,12 +234,12 @@ public enum MediaArea: Codable, Equatable {
try container.encode(MediaAreaType.link.rawValue, forKey: .type)
try container.encode(coordinates, forKey: .coordinates)
try container.encode(url, forKey: .value)
case let .weather(coordinates, emoji, temperature, flags):
case let .weather(coordinates, emoji, temperature, color):
try container.encode(MediaAreaType.weather.rawValue, forKey: .type)
try container.encode(coordinates, forKey: .coordinates)
try container.encode(emoji, forKey: .value)
try container.encode(temperature, forKey: .temperature)
try container.encode(flags.rawValue, forKey: .flags)
try container.encode(color, forKey: .color)
}
}
}