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

Roll back once again

Browse Source
This commit is contained in:
Isaac
2024-01-15 21:09:32 +04:00
parent e71bf3beb6
commit 144b3aa656
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramCore/Sources/State/Serialization.swift
View File

@@ -210,7 +210,7 @@ public class BoxedMessage: NSObject {
public class Serialization: NSObject, MTSerialization { public class Serialization: NSObject, MTSerialization {
public func currentLayer() -> UInt { public func currentLayer() -> UInt {
return 173 return 172
} }
public func parseMessage(_ data: Data!) -> Any! { public func parseMessage(_ data: Data!) -> Any! {

4
submodules/TelegramCore/Sources/Utils/MessageUtils.swift
View File

@@ -489,13 +489,13 @@ public extension Message {
public extension Message { public extension Message {
func areReactionsTags(accountPeerId: PeerId) -> Bool { func areReactionsTags(accountPeerId: PeerId) -> Bool {
if self.id.peerId == accountPeerId { /*if self.id.peerId == accountPeerId {
if let reactionsAttribute = self.reactionsAttribute, !reactionsAttribute.reactions.isEmpty { if let reactionsAttribute = self.reactionsAttribute, !reactionsAttribute.reactions.isEmpty {
return reactionsAttribute.isTags return reactionsAttribute.isTags
} else { } else {
return true return true
} }
} }*/
return false return false
} }
} }

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

@@ -5219,7 +5219,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
isPremiumRequiredForMessaging isPremiumRequiredForMessaging
).startStrict(next: { [weak self] peerView, globalNotificationSettings, onlineMemberCount, hasScheduledMessages, peerReportNotice, pinnedCount, threadInfo, hasSearchTags, isPremiumRequiredForMessaging in ).startStrict(next: { [weak self] peerView, globalNotificationSettings, onlineMemberCount, hasScheduledMessages, peerReportNotice, pinnedCount, threadInfo, hasSearchTags, isPremiumRequiredForMessaging in
if let strongSelf = self { if let strongSelf = self {
if strongSelf.peerView === peerView && strongSelf.reportIrrelvantGeoNotice == peerReportNotice && strongSelf.hasScheduledMessages == hasScheduledMessages && strongSelf.threadInfo == threadInfo { if strongSelf.peerView === peerView && strongSelf.reportIrrelvantGeoNotice == peerReportNotice && strongSelf.hasScheduledMessages == hasScheduledMessages && strongSelf.threadInfo == threadInfo && strongSelf.presentationInterfaceState.hasSearchTags == hasSearchTags && strongSelf.presentationInterfaceState.isPremiumRequiredForMessaging == isPremiumRequiredForMessaging {
return return
} }
@@ -5440,6 +5440,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
} }
} }
} }
if strongSelf.presentationInterfaceState.search != nil && strongSelf.presentationInterfaceState.hasSearchTags {
didDisplayActionsPanel = true
}
var displayActionsPanel = false var displayActionsPanel = false
if let contactStatus = contactStatus, !contactStatus.isEmpty, let peerStatusSettings = contactStatus.peerStatusSettings { if let contactStatus = contactStatus, !contactStatus.isEmpty, let peerStatusSettings = contactStatus.peerStatusSettings {
@@ -5457,6 +5460,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
} }
} }
} }
if strongSelf.presentationInterfaceState.search != nil && hasSearchTags {
displayActionsPanel = true
}
if displayActionsPanel != didDisplayActionsPanel { if displayActionsPanel != didDisplayActionsPanel {
animated = true animated = true

9
submodules/TelegramUI/Sources/TopMessageReactions.swift
View File

@@ -7,13 +7,20 @@ import ReactionSelectionNode
func topMessageReactions(context: AccountContext, message: Message) -> Signal<[ReactionItem], NoError> { func topMessageReactions(context: AccountContext, message: Message) -> Signal<[ReactionItem], NoError> {
if message.id.peerId == context.account.peerId { if message.id.peerId == context.account.peerId {
var loadTags = true var loadTags = false
if let effectiveReactionsAttribute = message.effectiveReactionsAttribute(isTags: message.areReactionsTags(accountPeerId: context.account.peerId)) { if let effectiveReactionsAttribute = message.effectiveReactionsAttribute(isTags: message.areReactionsTags(accountPeerId: context.account.peerId)) {
loadTags = true
if !effectiveReactionsAttribute.reactions.isEmpty { if !effectiveReactionsAttribute.reactions.isEmpty {
if !effectiveReactionsAttribute.isTags { if !effectiveReactionsAttribute.isTags {
loadTags = false loadTags = false
} }
} }
} else {
loadTags = true
}
if "".isEmpty {
loadTags = false
} }
if loadTags { if loadTags {