Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
Ilya Laktyushin
2023-06-20 18:05:27 +04:00
92 changed files with 1860 additions and 656 deletions

View File

@@ -948,7 +948,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
var selectedNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
if let itemNode = itemNode as? ChatMessageItemView {
if let result = itemNode.transitionNode(id: message.id, media: image) {
if let result = itemNode.transitionNode(id: message.id, media: image, adjustRect: false) {
selectedNode = result
}
}
@@ -1002,12 +1002,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
self?.chatDisplayNode.dismissInput()
}, present: { c, a in
self?.present(c, in: .window(.root), with: a, blockInteraction: true)
}, transitionNode: { messageId, media in
}, transitionNode: { messageId, media, adjustRect in
var selectedNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
if let strongSelf = self {
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
if let itemNode = itemNode as? ChatMessageItemView {
if let result = itemNode.transitionNode(id: messageId, media: media) {
if let result = itemNode.transitionNode(id: messageId, media: media, adjustRect: adjustRect) {
selectedNode = result
}
}
@@ -4509,6 +4509,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
guard let self else {
return
}
if let story = message.associatedStories[storyId], story.data.isEmpty {
return
}
let storyContent = SingleStoryContentContextImpl(context: self.context, storyId: storyId)
let _ = (storyContent.state
|> take(1)
@@ -18244,7 +18248,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
var selectedNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
self.chatDisplayNode.historyNode.forEachItemNode { itemNode in
if let itemNode = itemNode as? ChatMessageItemView {
if let result = itemNode.transitionNode(id: messageId, media: media) {
if let result = itemNode.transitionNode(id: messageId, media: media, adjustRect: false) {
selectedNode = result
}
}