ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 14:45:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ilya Laktyushin
2025-08-21 09:08:54 +04:00
parent 0bac271cdb adf218345a
commit ed2b41a1a1
35 changed files with 990 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
submodules/TelegramUI/Sources/ChatController.swift
View File

@@ -2516,6 +2516,22 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
return
} else if !message.attributes.contains(where: { attribute in
if let attribute = attribute as? ReplyMarkupMessageAttribute, !attribute.rows.isEmpty {
return true
} else {
return false
}
}), let data = data?.makeData(), data.count == 1 {
let buttonType = data.withUnsafeBytes { buffer -> UInt8 in
return buffer.baseAddress!.assumingMemoryBound(to: UInt8.self).pointee
}
if buttonType == 3 {
if let threadId = message.threadId {
strongSelf.updateChatLocationThread(threadId: threadId, animationDirection: .right)
return
}
}
}
let _ = (strongSelf.context.engine.data.get(TelegramEngine.EngineData.Item.Messages.Message(id: messageId))
@@ -7995,10 +8011,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
func transformEnqueueMessages(_ messages: [EnqueueMessage], silentPosting: Bool, scheduleTime: Int32? = nil, postpone: Bool = false) -> [EnqueueMessage] {
var defaultThreadId: Int64?
var defaultReplyMessageSubject: EngineMessageReplySubject?
switch self.chatLocation {
case .peer:
break
if let channel = self.presentationInterfaceState.renderedPeer?.peer as? TelegramChannel, channel.linkedBotId != nil {
defaultThreadId = EngineMessage.newTopicThreadId
}
case let .replyThread(replyThreadMessage):
if let effectiveMessageId = replyThreadMessage.effectiveMessageId {
defaultReplyMessageSubject = EngineMessageReplySubject(messageId: effectiveMessageId, quote: nil, todoItemId: nil)
@@ -8023,6 +8042,22 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
break
}
}
if let defaultThreadId {
var updateThread = false
switch message {
case let .message(_, _, _, _, threadId, replyToMessageId, _, _, _, _):
if threadId == nil && replyToMessageId == nil {
updateThread = true
}
case let .forward(_, threadId, _, _, _):
if threadId == nil {
updateThread = true
}
}
if updateThread {
message = message.withUpdatedThreadId(defaultThreadId)
}
}
if case let .replyThread(replyThreadMessage) = self.chatLocation, replyThreadMessage.peerId == self.context.account.peerId {
switch message {
@@ -10011,10 +10046,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
var currentChatSwitchDirection: ChatControllerAnimateInnerChatSwitchDirection?
func updateChatLocationToOther(chatLocation: ChatLocation) {
if self.isUpdatingChatLocationThread {
return
}
self.saveInterfaceState()
self.chatDisplayNode.dismissTextInput()
@@ -10155,11 +10186,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
))
}
} else {
if let channel = peer as? TelegramChannel, let linkedBotId = channel.linkedBotId {
/*if let channel = peer as? TelegramChannel, let linkedBotId = channel.linkedBotId {
updatedChatLocation = .peer(id: linkedBotId)
} else {
} else {*/
updatedChatLocation = .peer(id: peerId)
}
//}
}
let navigationSnapshot = self.chatTitleView?.prepareSnapshotState()