ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-17 11:50:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '27fdb815dea2bb1f71e3714635e72b0d5ce02eb7'

Browse Source
This commit is contained in:
Ali 2023-04-18 11:50:27 +04:00
commit ddd7bd7457
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/Emoji/Sources/EmojiUtils.swift
View File

@ -5,7 +5,7 @@ import AVFoundation
extension Character { extension Character {
var isSimpleEmoji: Bool { var isSimpleEmoji: Bool {
guard let firstScalar = unicodeScalars.first else { return false } guard let firstScalar = unicodeScalars.first else { return false }
if #available(iOS 10.2, *) { if #available(iOS 10.2, macOS 10.12.2, *) {
return (firstScalar.properties.isEmoji && firstScalar.value > 0x238C) || firstScalar.isEmoji return (firstScalar.properties.isEmoji && firstScalar.value > 0x238C) || firstScalar.isEmoji
} else { } else {
return firstScalar.isEmoji return firstScalar.isEmoji
@ -13,7 +13,7 @@ extension Character {
} }
var isCombinedIntoEmoji: Bool { var isCombinedIntoEmoji: Bool {
if #available(iOS 10.2, *) { if #available(iOS 10.2, macOS 10.12.2, *) {
return self.unicodeScalars.count > 1 && self.unicodeScalars.first?.properties.isEmoji ?? false return self.unicodeScalars.count > 1 && self.unicodeScalars.first?.properties.isEmoji ?? false
} else { } else {
return self.unicodeScalars.count > 1 && self.unicodeScalars.first?.isEmoji ?? false return self.unicodeScalars.count > 1 && self.unicodeScalars.first?.isEmoji ?? false

2
submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift
View File

@ -302,7 +302,7 @@ public func resendMessages(account: Account, messageIds: [MessageId]) -> Signal<
} }
} }
if let forwardSource { if let forwardSource = forwardSource {
messages.append(.forward(source: forwardSource, threadId: nil, grouping: .auto, attributes: filteredAttributes, correlationId: nil)) messages.append(.forward(source: forwardSource, threadId: nil, grouping: .auto, attributes: filteredAttributes, correlationId: nil))
} else { } else {
messages.append(.message(text: message.text, attributes: filteredAttributes, inlineStickers: [:], mediaReference: message.media.first.flatMap(AnyMediaReference.standalone), replyToMessageId: replyToMessageId, localGroupingKey: message.groupingKey, correlationId: nil, bubbleUpEmojiOrStickersets: bubbleUpEmojiOrStickersets)) messages.append(.message(text: message.text, attributes: filteredAttributes, inlineStickers: [:], mediaReference: message.media.first.flatMap(AnyMediaReference.standalone), replyToMessageId: replyToMessageId, localGroupingKey: message.groupingKey, correlationId: nil, bubbleUpEmojiOrStickersets: bubbleUpEmojiOrStickersets))