ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-28 19:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't display saved tab until it's ready

Browse Source
This commit is contained in:
Isaac 2023-12-29 21:32:41 +04:00
parent a28d32e9b3
commit d88c78da57
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift
View File

@ -876,7 +876,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
if hasSavedMessagesChats { if hasSavedMessagesChats {
availablePanes?.insert(.savedMessagesChats, at: 0) availablePanes?.insert(.savedMessagesChats, at: 0)
} }
} else if hasSavedMessages { } else if hasSavedMessages && hasSavedMessagesChats {
if var availablePanesValue = availablePanes { if var availablePanesValue = availablePanes {
if let index = availablePanesValue.firstIndex(of: .media) { if let index = availablePanesValue.firstIndex(of: .media) {
availablePanesValue.insert(.savedMessages, at: index + 1) availablePanesValue.insert(.savedMessages, at: index + 1)
@ -956,6 +956,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
|> distinctUntilChanged |> distinctUntilChanged
let hasSavedMessages: Signal<Bool, NoError> let hasSavedMessages: Signal<Bool, NoError>
let hasSavedMessagesChats: Signal<Bool, NoError>
if case .peer = chatLocation { if case .peer = chatLocation {
hasSavedMessages = context.engine.data.subscribe(TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: context.account.peerId, threadId: peerId.toInt64(), tag: MessageTags())) hasSavedMessages = context.engine.data.subscribe(TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: context.account.peerId, threadId: peerId.toInt64(), tag: MessageTags()))
|> map { count -> Bool in |> map { count -> Bool in
@ -966,8 +967,14 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
} }
} }
|> distinctUntilChanged |> distinctUntilChanged
hasSavedMessagesChats = context.engine.messages.savedMessagesPeerListHead()
|> map { headPeerId -> Bool in
return headPeerId != nil
}
|> distinctUntilChanged
} else { } else {
hasSavedMessages = .single(false) hasSavedMessages = .single(false)
hasSavedMessagesChats = .single(false)
} }
return combineLatest( return combineLatest(
@ -982,9 +989,10 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
hasStories, hasStories,
accountIsPremium, accountIsPremium,
context.engine.peers.recommendedChannels(peerId: peerId), context.engine.peers.recommendedChannels(peerId: peerId),
hasSavedMessages hasSavedMessages,
hasSavedMessagesChats
) )
|> map { peerView, availablePanes, globalNotificationSettings, status, currentInvitationsContext, invitations, currentRequestsContext, requests, hasStories, accountIsPremium, recommendedChannels, hasSavedMessages -> PeerInfoScreenData in |> map { peerView, availablePanes, globalNotificationSettings, status, currentInvitationsContext, invitations, currentRequestsContext, requests, hasStories, accountIsPremium, recommendedChannels, hasSavedMessages, hasSavedMessagesChats -> PeerInfoScreenData in
var availablePanes = availablePanes var availablePanes = availablePanes
if let hasStories { if let hasStories {
if hasStories { if hasStories {
@ -995,7 +1003,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
} }
if case .peer = chatLocation { if case .peer = chatLocation {
if hasSavedMessages, var availablePanesValue = availablePanes { if hasSavedMessages, hasSavedMessagesChats, var availablePanesValue = availablePanes {
if let index = availablePanesValue.firstIndex(of: .media) { if let index = availablePanesValue.firstIndex(of: .media) {
availablePanesValue.insert(.savedMessages, at: index + 1) availablePanesValue.insert(.savedMessages, at: index + 1)
} else { } else {
@ -1182,6 +1190,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
|> distinctUntilChanged |> distinctUntilChanged
let hasSavedMessages: Signal<Bool, NoError> let hasSavedMessages: Signal<Bool, NoError>
let hasSavedMessagesChats: Signal<Bool, NoError>
if case .peer = chatLocation { if case .peer = chatLocation {
hasSavedMessages = context.engine.data.subscribe(TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: context.account.peerId, threadId: peerId.toInt64(), tag: MessageTags())) hasSavedMessages = context.engine.data.subscribe(TelegramEngine.EngineData.Item.Messages.MessageCount(peerId: context.account.peerId, threadId: peerId.toInt64(), tag: MessageTags()))
|> map { count -> Bool in |> map { count -> Bool in
@ -1192,8 +1201,14 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
} }
} }
|> distinctUntilChanged |> distinctUntilChanged
hasSavedMessagesChats = context.engine.messages.savedMessagesPeerListHead()
|> map { headPeerId -> Bool in
return headPeerId != nil
}
|> distinctUntilChanged
} else { } else {
hasSavedMessages = .single(false) hasSavedMessages = .single(false)
hasSavedMessagesChats = .single(false)
} }
return combineLatest(queue: .mainQueue(), return combineLatest(queue: .mainQueue(),
@ -1209,9 +1224,10 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
threadData, threadData,
context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration]), context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration]),
accountIsPremium, accountIsPremium,
hasSavedMessages hasSavedMessages,
hasSavedMessagesChats
) )
|> mapToSignal { peerView, availablePanes, globalNotificationSettings, status, membersData, currentInvitationsContext, invitations, currentRequestsContext, requests, threadData, preferencesView, accountIsPremium, hasSavedMessages -> Signal<PeerInfoScreenData, NoError> in |> mapToSignal { peerView, availablePanes, globalNotificationSettings, status, membersData, currentInvitationsContext, invitations, currentRequestsContext, requests, threadData, preferencesView, accountIsPremium, hasSavedMessages, hasSavedMessagesChats -> Signal<PeerInfoScreenData, NoError> in
var discussionPeer: Peer? var discussionPeer: Peer?
if case let .known(maybeLinkedDiscussionPeerId) = (peerView.cachedData as? CachedChannelData)?.linkedDiscussionPeerId, let linkedDiscussionPeerId = maybeLinkedDiscussionPeerId, let peer = peerView.peers[linkedDiscussionPeerId] { if case let .known(maybeLinkedDiscussionPeerId) = (peerView.cachedData as? CachedChannelData)?.linkedDiscussionPeerId, let linkedDiscussionPeerId = maybeLinkedDiscussionPeerId, let peer = peerView.peers[linkedDiscussionPeerId] {
discussionPeer = peer discussionPeer = peer
@ -1227,7 +1243,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
} }
if case .peer = chatLocation { if case .peer = chatLocation {
if hasSavedMessages, var availablePanesValue = availablePanes { if hasSavedMessages, hasSavedMessagesChats, var availablePanesValue = availablePanes {
if let index = availablePanesValue.firstIndex(of: .media) { if let index = availablePanesValue.firstIndex(of: .media) {
availablePanesValue.insert(.savedMessages, at: index + 1) availablePanesValue.insert(.savedMessages, at: index + 1)
} else { } else {