mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2026-01-04 12:14:29 +00:00
Merge branch 'beta'
This commit is contained in:
@@ -203,9 +203,9 @@ final class StickerPackEmojisItemNode: GridItemNode {
|
||||
var emojiAttribute: ChatTextInputTextCustomEmojiAttribute?
|
||||
loop: for attribute in file.attributes {
|
||||
switch attribute {
|
||||
case let .CustomEmoji(_, displayText, packReference):
|
||||
case let .CustomEmoji(_, displayText, _):
|
||||
text = displayText
|
||||
emojiAttribute = ChatTextInputTextCustomEmojiAttribute(stickerPack: packReference, fileId: file.fileId.id, file: file)
|
||||
emojiAttribute = ChatTextInputTextCustomEmojiAttribute(interactivelySelectedFromPackId: nil, fileId: file.fileId.id, file: file)
|
||||
break loop
|
||||
default:
|
||||
break
|
||||
@@ -229,9 +229,9 @@ final class StickerPackEmojisItemNode: GridItemNode {
|
||||
var emojiAttribute: ChatTextInputTextCustomEmojiAttribute?
|
||||
loop: for attribute in file.attributes {
|
||||
switch attribute {
|
||||
case let .CustomEmoji(_, displayText, packReference):
|
||||
case let .CustomEmoji(_, displayText, _):
|
||||
text = displayText
|
||||
emojiAttribute = ChatTextInputTextCustomEmojiAttribute(stickerPack: packReference, fileId: file.fileId.id, file: file)
|
||||
emojiAttribute = ChatTextInputTextCustomEmojiAttribute(interactivelySelectedFromPackId: nil, fileId: file.fileId.id, file: file)
|
||||
break loop
|
||||
default:
|
||||
break
|
||||
|
||||
@@ -1680,7 +1680,7 @@ public final class StickerPackScreenImpl: ViewController {
|
||||
MessageTextEntity(
|
||||
range: 0 ..< (text as NSString).length,
|
||||
type: .CustomEmoji(
|
||||
stickerPack: attribute.stickerPack,
|
||||
stickerPack: nil,
|
||||
fileId: attribute.fileId
|
||||
)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user