ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 09:20:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements

Browse Source
This commit is contained in:
Isaac 2024-01-30 14:53:23 +01:00
parent 8a0fbe7f21
commit 0f2eca17bd
11 changed files with 132 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/ChatListUI/Sources/Node/ChatListItem.swift
View File

@ -2517,7 +2517,9 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
switch item.content { switch item.content {
case let .peer(peerData): case let .peer(peerData):
if let peer = peerData.messages.last?.author { if let peer = peerData.messages.last?.author {
if peer.isScam { if case .savedMessagesChats = item.chatListLocation, peer.id == item.context.account.peerId {
currentCredibilityIconContent = nil
} else if peer.isScam {
currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_ScamAccount.uppercased()) currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_ScamAccount.uppercased())
} else if peer.isFake { } else if peer.isFake {
currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_FakeAccount.uppercased()) currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_FakeAccount.uppercased())
@ -2537,7 +2539,9 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
break break
} }
} else if case let .chat(itemPeer) = contentPeer, let peer = itemPeer.chatMainPeer { } else if case let .chat(itemPeer) = contentPeer, let peer = itemPeer.chatMainPeer {
if peer.isScam { if case .savedMessagesChats = item.chatListLocation, peer.id == item.context.account.peerId {
currentCredibilityIconContent = nil
} else if peer.isScam {
currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_ScamAccount.uppercased()) currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_ScamAccount.uppercased())
} else if peer.isFake { } else if peer.isFake {
currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_FakeAccount.uppercased()) currentCredibilityIconContent = .text(color: item.presentationData.theme.chat.message.incoming.scamColor, string: item.presentationData.strings.Message_FakeAccount.uppercased())

36
submodules/TelegramCore/Sources/State/MessageReactions.swift
View File

@ -18,10 +18,40 @@ public enum UpdateMessageReaction {
} }
} }
public func updateMessageReactionsInteractively(account: Account, messageId: MessageId, reactions: [UpdateMessageReaction], isLarge: Bool, storeAsRecentlyUsed: Bool, add: Bool = false) -> Signal<Never, NoError> { public func updateMessageReactionsInteractively(account: Account, messageIds: [MessageId], reactions: [UpdateMessageReaction], isLarge: Bool, storeAsRecentlyUsed: Bool, add: Bool = false) -> Signal<Never, NoError> {
return account.postbox.transaction { transaction -> Void in return account.postbox.transaction { transaction -> Void in
guard let chatPeerId = messageIds.first?.peerId else {
return
}
var messagesWithoutGroups: [Message] = []
var messagesByGroupId: [Int64: [Message]] = [:]
let messages = messageIds.compactMap { transaction.getMessage($0) }
for message in messages {
if let groupingKey = message.groupingKey {
if messagesByGroupId[groupingKey] == nil {
messagesByGroupId[groupingKey] = [message]
} else {
messagesByGroupId[groupingKey]?.append(message)
}
} else {
messagesWithoutGroups.append(message)
}
}
var messageIds: [MessageId] = []
for message in messagesWithoutGroups {
messageIds.append(message.id)
}
for (_, messages) in messagesByGroupId {
if let minMessageId = messages.map(\.id).min() {
messageIds.append(minMessageId)
}
}
var sendAsPeerId = account.peerId var sendAsPeerId = account.peerId
if let cachedData = transaction.getPeerCachedData(peerId: messageId.peerId) { if let cachedData = transaction.getPeerCachedData(peerId: chatPeerId) {
if let cachedData = cachedData as? CachedChannelData { if let cachedData = cachedData as? CachedChannelData {
if let sendAsPeerIdValue = cachedData.sendAsPeerId { if let sendAsPeerIdValue = cachedData.sendAsPeerId {
sendAsPeerId = sendAsPeerIdValue sendAsPeerId = sendAsPeerIdValue
@ -39,6 +69,7 @@ public func updateMessageReactionsInteractively(account: Account, messageId: Mes
maxCount = 1 maxCount = 1
} }
for messageId in messageIds {
var mappedReactions: [PendingReactionsMessageAttribute.PendingReaction] = [] var mappedReactions: [PendingReactionsMessageAttribute.PendingReaction] = []
var reactions: [UpdateMessageReaction] = reactions var reactions: [UpdateMessageReaction] = reactions
@ -128,6 +159,7 @@ public func updateMessageReactionsInteractively(account: Account, messageId: Mes
return .update(StoreMessage(id: currentMessage.id, globallyUniqueId: currentMessage.globallyUniqueId, groupingKey: currentMessage.groupingKey, threadId: currentMessage.threadId, timestamp: currentMessage.timestamp, flags: StoreMessageFlags(currentMessage.flags), tags: currentMessage.tags, globalTags: currentMessage.globalTags, localTags: currentMessage.localTags, forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: currentMessage.text, attributes: attributes, media: currentMessage.media)) return .update(StoreMessage(id: currentMessage.id, globallyUniqueId: currentMessage.globallyUniqueId, groupingKey: currentMessage.groupingKey, threadId: currentMessage.threadId, timestamp: currentMessage.timestamp, flags: StoreMessageFlags(currentMessage.flags), tags: currentMessage.tags, globalTags: currentMessage.globalTags, localTags: currentMessage.localTags, forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: currentMessage.text, attributes: attributes, media: currentMessage.media))
}) })
} }
}
|> ignoreValues |> ignoreValues
} }

9
submodules/TelegramCore/Sources/TelegramEngine/Data/MessagesData.swift
View File

@ -333,24 +333,27 @@ public extension TelegramEngine.EngineData.Item {
public struct ReactionTagMessageCount: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem { public struct ReactionTagMessageCount: TelegramEngineDataItem, TelegramEngineMapKeyDataItem, PostboxViewDataItem {
public struct ItemKey: Hashable { public struct ItemKey: Hashable {
public var peerId: EnginePeer.Id public var peerId: EnginePeer.Id
public var threadId: Int64?
public var reaction: MessageReaction.Reaction public var reaction: MessageReaction.Reaction
} }
public typealias Result = Int? public typealias Result = Int?
fileprivate var peerId: EnginePeer.Id fileprivate var peerId: EnginePeer.Id
fileprivate var threadId: Int64?
fileprivate var reaction: MessageReaction.Reaction fileprivate var reaction: MessageReaction.Reaction
public var mapKey: ItemKey { public var mapKey: ItemKey {
return ItemKey(peerId: self.peerId, reaction: self.reaction) return ItemKey(peerId: self.peerId, threadId: self.threadId, reaction: self.reaction)
} }
public init(peerId: EnginePeer.Id, reaction: MessageReaction.Reaction) { public init(peerId: EnginePeer.Id, threadId: Int64?, reaction: MessageReaction.Reaction) {
self.peerId = peerId self.peerId = peerId
self.threadId = threadId
self.reaction = reaction self.reaction = reaction
} }
var key: PostboxViewKey { var key: PostboxViewKey {
return .historyTagSummaryView(tag: [], peerId: self.peerId, threadId: nil, namespace: Namespaces.Message.Cloud, customTag: ReactionsMessageAttribute.messageTag(reaction: self.reaction)) return .historyTagSummaryView(tag: [], peerId: self.peerId, threadId: self.threadId, namespace: Namespaces.Message.Cloud, customTag: ReactionsMessageAttribute.messageTag(reaction: self.reaction))
} }
func extract(view: PostboxView) -> Result { func extract(view: PostboxView) -> Result {

8
submodules/TelegramCore/Sources/TelegramEngine/Messages/TelegramEngineMessages.swift
View File

@ -299,12 +299,12 @@ public extension TelegramEngine {
} }
public func setMessageReactions( public func setMessageReactions(
id: EngineMessage.Id, ids: [EngineMessage.Id],
reactions: [UpdateMessageReaction] reactions: [UpdateMessageReaction]
) { ) {
let _ = updateMessageReactionsInteractively( let _ = updateMessageReactionsInteractively(
account: self.account, account: self.account,
messageId: id, messageIds: ids,
reactions: reactions, reactions: reactions,
isLarge: false, isLarge: false,
storeAsRecentlyUsed: false, storeAsRecentlyUsed: false,
@ -313,12 +313,12 @@ public extension TelegramEngine {
} }
public func addMessageReactions( public func addMessageReactions(
id: EngineMessage.Id, ids: [EngineMessage.Id],
reactions: [UpdateMessageReaction] reactions: [UpdateMessageReaction]
) { ) {
let _ = updateMessageReactionsInteractively( let _ = updateMessageReactionsInteractively(
account: self.account, account: self.account,
messageId: id, messageIds: ids,
reactions: reactions, reactions: reactions,
isLarge: false, isLarge: false,
storeAsRecentlyUsed: false, storeAsRecentlyUsed: false,

8
submodules/TelegramUI/Components/Chat/ChatMessageSelectionInputPanelNode/Sources/ChatMessageSelectionInputPanelNode.swift
View File

@ -324,15 +324,11 @@ public final class ChatMessageSelectionInputPanelNode: ChatInputPanelNode {
} }
} }
if let selectionState = presentationInterfaceState.interfaceState.selectionState { if let selectionState = presentationInterfaceState.interfaceState.selectionState {
for id in selectionState.selectedIds { context.engine.messages.setMessageReactions(ids: Array(selectionState.selectedIds), reactions: mappedUpdatedReactions)
context.engine.messages.setMessageReactions(id: id, reactions: mappedUpdatedReactions)
}
} }
} else { } else {
if let selectionState = presentationInterfaceState.interfaceState.selectionState { if let selectionState = presentationInterfaceState.interfaceState.selectionState {
for id in selectionState.selectedIds { context.engine.messages.addMessageReactions(ids: Array(selectionState.selectedIds), reactions: [updateReaction])
context.engine.messages.addMessageReactions(id: id, reactions: [updateReaction])
}
} }
} }

2
submodules/TelegramUI/Sources/Chat/ChatControllerOpenMessageContextMenu.swift
View File

@ -430,7 +430,7 @@ extension ChatControllerImpl {
} }
} }
let _ = updateMessageReactionsInteractively(account: self.context.account, messageId: message.id, reactions: mappedUpdatedReactions, isLarge: isLarge, storeAsRecentlyUsed: true).startStandalone() let _ = updateMessageReactionsInteractively(account: self.context.account, messageIds: [message.id], reactions: mappedUpdatedReactions, isLarge: isLarge, storeAsRecentlyUsed: true).startStandalone()
} }
self.forEachController({ controller in self.forEachController({ controller in

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

@ -1565,7 +1565,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}) })
} }
let _ = updateMessageReactionsInteractively(account: strongSelf.context.account, messageId: message.id, reactions: mappedUpdatedReactions, isLarge: false, storeAsRecentlyUsed: false).startStandalone() let _ = updateMessageReactionsInteractively(account: strongSelf.context.account, messageIds: [message.id], reactions: mappedUpdatedReactions, isLarge: false, storeAsRecentlyUsed: false).startStandalone()
} }
}) })
}, activateMessagePinch: { [weak self] sourceNode in }, activateMessagePinch: { [weak self] sourceNode in
@ -10927,7 +10927,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
let tag = updatedFilter.customTag let tag = updatedFilter.customTag
let _ = (self.context.engine.data.get( let _ = (self.context.engine.data.get(
TelegramEngine.EngineData.Item.Messages.ReactionTagMessageCount(peerId: self.context.account.peerId, reaction: reaction) TelegramEngine.EngineData.Item.Messages.ReactionTagMessageCount(peerId: self.context.account.peerId, threadId: self.chatLocation.threadId, reaction: reaction)
) )
|> deliverOnMainQueue).start(next: { [weak self] count in |> deliverOnMainQueue).start(next: { [weak self] count in
guard let self else { guard let self else {

2
submodules/TelegramUI/Sources/ChatControllerForwardMessages.swift
View File

@ -297,7 +297,7 @@ extension ChatControllerImpl {
return return
} }
strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer), keepStack: .always, purposefulAction: {}, peekData: nil)) strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer), keepStack: .always, purposefulAction: {}, peekData: nil, forceOpenChat: true))
}) })
return true return true
} }

4
submodules/TelegramUI/Sources/ChatControllerNode.swift
View File

@ -2478,6 +2478,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
} }
let context = self.context let context = self.context
let chatLocation = self.chatLocation
let _ = inlineSearchResults.update( let _ = inlineSearchResults.update(
transition: inlineSearchResultsTransition, transition: inlineSearchResultsTransition,
component: AnyComponent(ChatInlineSearchResultsListComponent( component: AnyComponent(ChatInlineSearchResultsListComponent(
@ -2560,7 +2562,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
input, input,
ignoreMessagesInTimestampRange: nil, ignoreMessagesInTimestampRange: nil,
context: context, context: context,
chatLocation: .peer(id: peerId), chatLocation: chatLocation,
chatLocationContextHolder: Atomic(value: nil), chatLocationContextHolder: Atomic(value: nil),
scheduled: false, scheduled: false,
fixedCombinedReadStates: nil, fixedCombinedReadStates: nil,

4
submodules/TelegramUI/Sources/ChatControllerOpenMessageShareMenu.swift
View File

@ -61,9 +61,7 @@ func chatShareToSavedMessagesAdditionalView(_ chatController: ChatControllerImpl
return return
} }
if !messageIds.isEmpty { if !messageIds.isEmpty {
for messageId in messageIds { let _ = chatController.context.engine.messages.setMessageReactions(ids: messageIds, reactions: [updateReaction])
let _ = chatController.context.engine.messages.setMessageReactions(id: messageId, reactions: [updateReaction])
}
var isBuiltinReaction = false var isBuiltinReaction = false
if case .builtin = updateReaction { if case .builtin = updateReaction {

2
submodules/TelegramUI/Sources/ChatTagSearchInputPanelNode.swift
View File

@ -123,7 +123,7 @@ final class ChatTagSearchInputPanelNode: ChatInputPanelNode {
if self.tagMessageCount?.disposable == nil { if self.tagMessageCount?.disposable == nil {
if let context = self.context { if let context = self.context {
self.tagMessageCount?.disposable = (context.engine.data.subscribe( self.tagMessageCount?.disposable = (context.engine.data.subscribe(
TelegramEngine.EngineData.Item.Messages.ReactionTagMessageCount(peerId: context.account.peerId, reaction: reaction) TelegramEngine.EngineData.Item.Messages.ReactionTagMessageCount(peerId: context.account.peerId, threadId: params.interfaceState.chatLocation.threadId, reaction: reaction)
) )
|> deliverOnMainQueue).startStrict(next: { [weak self] count in |> deliverOnMainQueue).startStrict(next: { [weak self] count in
guard let self else { guard let self else {