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

Stories

Browse Source
This commit is contained in:
Ali 2023-06-20 13:00:27 +03:00
parent 34e8c54bb0
commit e9e5b4c749
14 changed files with 65 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/ChatListUI/Sources/ChatListController.swift
View File

@ -1253,7 +1253,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
return
}
let storyContent = StoryContentContextImpl(context: self.context, includeHidden: false, focusedPeerId: peerId, singlePeer: false)
let storyContent = StoryContentContextImpl(context: self.context, isHidden: false, focusedPeerId: peerId, singlePeer: false)
let _ = (storyContent.state
|> filter { $0.slice != nil }
|> take(1)
@ -1744,7 +1744,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
|> distinctUntilChanged
self.preloadStorySubscriptionsDisposable = (combineLatest(queue: .mainQueue(),
self.context.engine.messages.preloadStorySubscriptions(includeHidden: false),
self.context.engine.messages.preloadStorySubscriptions(isHidden: false),
self.context.sharedContext.automaticMediaDownloadSettings,
automaticDownloadNetworkType
)
@ -1790,7 +1790,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
self.preloadStoryResourceDisposables.removeValue(forKey: id)
}
})
self.storySubscriptionsDisposable = (self.context.engine.messages.storySubscriptions(includeHidden: false)
self.storySubscriptionsDisposable = (self.context.engine.messages.storySubscriptions(isHidden: false)
|> deliverOnMainQueue).start(next: { [weak self] storySubscriptions in
guard let self else {
return
@ -2391,7 +2391,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
return
}
let storyContent = StoryContentContextImpl(context: self.context, includeHidden: false, focusedPeerId: peer?.id, singlePeer: false)
let storyContent = StoryContentContextImpl(context: self.context, isHidden: false, focusedPeerId: peer?.id, singlePeer: false)
let _ = (storyContent.state
|> take(1)
|> deliverOnMainQueue).start(next: { [weak self] storyContentState in

2
submodules/ContactListUI/Sources/ContactsController.swift
View File

@ -515,7 +515,7 @@ public class ContactsController: ViewController {
return
}
let storyContent = StoryContentContextImpl(context: self.context, includeHidden: true, focusedPeerId: peer?.id, singlePeer: false)
let storyContent = StoryContentContextImpl(context: self.context, isHidden: true, focusedPeerId: peer?.id, singlePeer: false)
let _ = (storyContent.state
|> take(1)
|> deliverOnMainQueue).start(next: { [weak self] storyContentState in

2
submodules/ContactListUI/Sources/ContactsControllerNode.swift
View File

@ -227,7 +227,7 @@ final class ContactsControllerNode: ASDisplayNode {
return self.contentScrollingEnded(listView: listView)
}
self.storySubscriptionsDisposable = (self.context.engine.messages.storySubscriptions(includeHidden: true)
self.storySubscriptionsDisposable = (self.context.engine.messages.storySubscriptions(isHidden: true)
|> deliverOnMainQueue).start(next: { [weak self] storySubscriptions in
guard let self else {
return

2
submodules/Postbox/Sources/StorySubscriptionsView.swift
View File

@ -1,7 +1,7 @@
import Foundation
public enum PostboxStorySubscriptionsKey: Int32 {
case all = 0
case hidden = 0
case filtered = 1
}

8
submodules/TelegramCore/Sources/Account/Account.swift
View File

@ -975,7 +975,7 @@ public class Account {
let networkStatsContext: NetworkStatsContext
public let filteredStorySubscriptionsContext: StorySubscriptionsContext?
public let allStorySubscriptionsContext: StorySubscriptionsContext?
public let hiddenStorySubscriptionsContext: StorySubscriptionsContext?
public init(accountManager: AccountManager<TelegramAccountManagerTypes>, id: AccountRecordId, basePath: String, testingEnvironment: Bool, postbox: Postbox, network: Network, networkArguments: NetworkInitializationArguments, peerId: PeerId, auxiliaryMethods: AccountAuxiliaryMethods, supplementary: Bool) {
self.accountManager = accountManager
@ -995,11 +995,11 @@ public class Account {
self.peerInputActivityManager = PeerInputActivityManager()
if !supplementary {
self.filteredStorySubscriptionsContext = StorySubscriptionsContext(accountPeerId: peerId, postbox: postbox, network: network, includesHidden: false)
self.allStorySubscriptionsContext = StorySubscriptionsContext(accountPeerId: peerId, postbox: postbox, network: network, includesHidden: true)
self.filteredStorySubscriptionsContext = StorySubscriptionsContext(accountPeerId: peerId, postbox: postbox, network: network, isHidden: false)
self.hiddenStorySubscriptionsContext = StorySubscriptionsContext(accountPeerId: peerId, postbox: postbox, network: network, isHidden: true)
} else {
self.filteredStorySubscriptionsContext = nil
self.allStorySubscriptionsContext = nil
self.hiddenStorySubscriptionsContext = nil
}
self.callSessionManager = CallSessionManager(postbox: postbox, network: network, maxLayer: networkArguments.voipMaxLayer, versions: networkArguments.voipVersions, addUpdates: { [weak self] updates in

20
submodules/TelegramCore/Sources/TelegramEngine/Messages/StoryListContext.swift
View File

@ -144,7 +144,7 @@ public final class StorySubscriptionsContext {
private let queue: Queue
private let postbox: Postbox
private let network: Network
private let includesHidden: Bool
private let isHidden: Bool
private var taskState = TaskState()
@ -155,12 +155,12 @@ public final class StorySubscriptionsContext {
private let loadMoreDisposable = MetaDisposable()
private let refreshTimerDisposable = MetaDisposable()
init(queue: Queue, accountPeerId: PeerId, postbox: Postbox, network: Network, includesHidden: Bool) {
init(queue: Queue, accountPeerId: PeerId, postbox: Postbox, network: Network, isHidden: Bool) {
self.accountPeerId = accountPeerId
self.queue = queue
self.postbox = postbox
self.network = network
self.includesHidden = includesHidden
self.isHidden = isHidden
self.taskState.isRefreshScheduled = true
@ -183,7 +183,7 @@ public final class StorySubscriptionsContext {
return
}
let subscriptionsKey: PostboxStorySubscriptionsKey = self.includesHidden ? .all : .filtered
let subscriptionsKey: PostboxStorySubscriptionsKey = self.isHidden ? .hidden : .filtered
if self.taskState.isRefreshScheduled {
self.isLoading = true
@ -244,7 +244,7 @@ public final class StorySubscriptionsContext {
private func loadImpl(isRefresh: Bool, stateMark: OpaqueStateMark) {
var flags: Int32 = 0
if self.includesHidden {
if self.isHidden {
flags |= 1 << 2
}
@ -270,8 +270,8 @@ public final class StorySubscriptionsContext {
let accountPeerId = self.accountPeerId
let includesHidden = self.includesHidden
let subscriptionsKey: PostboxStorySubscriptionsKey = self.includesHidden ? .all : .filtered
let isHidden = self.isHidden
let subscriptionsKey: PostboxStorySubscriptionsKey = self.isHidden ? .hidden : .filtered
self.loadMoreDisposable.set((self.network.request(Api.functions.stories.getAllStories(flags: flags, state: state))
|> deliverOn(self.queue)).start(next: { [weak self] result in
@ -343,7 +343,7 @@ public final class StorySubscriptionsContext {
}
if isRefresh {
if !includesHidden {
if !isHidden {
if !peerEntries.contains(where: { $0 == accountPeerId }) {
transaction.setStoryItems(peerId: accountPeerId, items: [])
}
@ -396,10 +396,10 @@ public final class StorySubscriptionsContext {
private let queue = Queue(name: "StorySubscriptionsContext")
private let impl: QueueLocalObject<Impl>
init(accountPeerId: PeerId, postbox: Postbox, network: Network, includesHidden: Bool) {
init(accountPeerId: PeerId, postbox: Postbox, network: Network, isHidden: Bool) {
let queue = self.queue
self.impl = QueueLocalObject(queue: queue, generate: {
Impl(queue: queue, accountPeerId: accountPeerId, postbox: postbox, network: network, includesHidden: includesHidden)
Impl(queue: queue, accountPeerId: accountPeerId, postbox: postbox, network: network, isHidden: isHidden)
})
}

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

@ -592,7 +592,7 @@ public extension TelegramEngine {
}).start()
}
public func storySubscriptions(includeHidden: Bool) -> Signal<EngineStorySubscriptions, NoError> {
public func storySubscriptions(isHidden: Bool) -> Signal<EngineStorySubscriptions, NoError> {
let debugTimerSignal: Signal<Bool, NoError>
#if DEBUG && false
debugTimerSignal = Signal<Bool, NoError>.single(true)
@ -609,7 +609,7 @@ public extension TelegramEngine {
debugTimerSignal = .single(true)
#endif
let subscriptionsKey: PostboxStorySubscriptionsKey = includeHidden ? .all : .filtered
let subscriptionsKey: PostboxStorySubscriptionsKey = isHidden ? .hidden : .filtered
let basicPeerKey = PostboxViewKey.basicPeer(self.account.peerId)
let storySubscriptionsKey = PostboxViewKey.storySubscriptions(key: subscriptionsKey)
@ -759,9 +759,9 @@ public extension TelegramEngine {
}
}
public func preloadStorySubscriptions(includeHidden: Bool) -> Signal<[EngineMediaResource.Id: StoryPreloadInfo], NoError> {
public func preloadStorySubscriptions(isHidden: Bool) -> Signal<[EngineMediaResource.Id: StoryPreloadInfo], NoError> {
let basicPeerKey = PostboxViewKey.basicPeer(self.account.peerId)
let subscriptionsKey: PostboxStorySubscriptionsKey = includeHidden ? .all : .filtered
let subscriptionsKey: PostboxStorySubscriptionsKey = isHidden ? .hidden : .filtered
let storySubscriptionsKey = PostboxViewKey.storySubscriptions(key: subscriptionsKey)
return self.account.postbox.combinedView(keys: [
basicPeerKey,

21
submodules/TelegramCore/Sources/UpdatePeers.swift
View File

@ -60,12 +60,25 @@ public func updatePeers(transaction: Transaction, peers: [Peer], update: (Peer?,
peerIds.removeAll(where: { $0 == updated.id })
transaction.replaceAllStorySubscriptions(key: .filtered, state: state, peerIds: peerIds)
}
if transaction.storySubscriptionsContains(key: .hidden, peerId: updated.id) {
var (state, peerIds) = transaction.getAllStorySubscriptions(key: .filtered)
if !peerIds.contains(updated.id) {
peerIds.append(updated.id)
transaction.replaceAllStorySubscriptions(key: .hidden, state: state, peerIds: peerIds)
}
}
} else {
if transaction.storySubscriptionsContains(key: .all, peerId: updated.id) && !transaction.storySubscriptionsContains(key: .filtered, peerId: updated.id) {
var (state, peerIds) = transaction.getAllStorySubscriptions(key: .all)
if transaction.storySubscriptionsContains(key: .hidden, peerId: updated.id) {
var (state, peerIds) = transaction.getAllStorySubscriptions(key: .filtered)
peerIds.removeAll(where: { $0 == updated.id })
peerIds.append(updated.id)
transaction.replaceAllStorySubscriptions(key: .filtered, state: state, peerIds: peerIds)
transaction.replaceAllStorySubscriptions(key: .hidden, state: state, peerIds: peerIds)
}
if transaction.storySubscriptionsContains(key: .filtered, peerId: updated.id) {
var (state, peerIds) = transaction.getAllStorySubscriptions(key: .filtered)
if !peerIds.contains(updated.id) {
peerIds.append(updated.id)
transaction.replaceAllStorySubscriptions(key: .filtered, state: state, peerIds: peerIds)
}
}
}
}

2
submodules/TelegramUI/Components/ChatListHeaderComponent/Sources/ChatListHeaderComponent.swift
View File

@ -829,7 +829,7 @@ public final class ChatListHeaderComponent: Component {
theme: component.theme,
strings: component.strings,
sideInset: component.sideInset,
includesHidden: component.storiesIncludeHidden,
useHiddenList: component.storiesIncludeHidden,
storySubscriptions: storySubscriptions,
collapseFraction: 1.0 - component.storiesFraction,
unlockedFraction: 1.0 - component.storiesUnlockedFraction,

8
submodules/TelegramUI/Components/Stories/StoryContentComponent/Sources/StoryChatContent.swift
View File

@ -358,7 +358,7 @@ public final class StoryContentContextImpl: StoryContentContext {
}
private let context: AccountContext
private let includeHidden: Bool
private let isHidden: Bool
public private(set) var stateValue: StoryContentContextState?
public var state: Signal<StoryContentContextState, NoError> {
@ -394,12 +394,12 @@ public final class StoryContentContextImpl: StoryContentContext {
public init(
context: AccountContext,
includeHidden: Bool,
isHidden: Bool,
focusedPeerId: EnginePeer.Id?,
singlePeer: Bool
) {
self.context = context
self.includeHidden = includeHidden
self.isHidden = isHidden
if let focusedPeerId {
self.focusedItem = (focusedPeerId, nil)
}
@ -493,7 +493,7 @@ public final class StoryContentContextImpl: StoryContentContext {
self.updatePeerContexts()
})
} else {
self.storySubscriptionsDisposable = (context.engine.messages.storySubscriptions(includeHidden: includeHidden)
self.storySubscriptionsDisposable = (context.engine.messages.storySubscriptions(isHidden: isHidden)
|> deliverOnMainQueue).start(next: { [weak self] storySubscriptions in
guard let self else {
return

16
submodules/TelegramUI/Components/Stories/StoryPeerListComponent/Sources/StoryPeerListComponent.swift
View File

@ -24,7 +24,7 @@ public final class StoryPeerListComponent: Component {
public let theme: PresentationTheme
public let strings: PresentationStrings
public let sideInset: CGFloat
public let includesHidden: Bool
public let useHiddenList: Bool
public let storySubscriptions: EngineStorySubscriptions?
public let collapseFraction: CGFloat
public let unlockedFraction: CGFloat
@ -38,7 +38,7 @@ public final class StoryPeerListComponent: Component {
theme: PresentationTheme,
strings: PresentationStrings,
sideInset: CGFloat,
includesHidden: Bool,
useHiddenList: Bool,
storySubscriptions: EngineStorySubscriptions?,
collapseFraction: CGFloat,
unlockedFraction: CGFloat,
@ -51,7 +51,7 @@ public final class StoryPeerListComponent: Component {
self.theme = theme
self.strings = strings
self.sideInset = sideInset
self.includesHidden = includesHidden
self.useHiddenList = useHiddenList
self.storySubscriptions = storySubscriptions
self.collapseFraction = collapseFraction
self.unlockedFraction = unlockedFraction
@ -73,7 +73,7 @@ public final class StoryPeerListComponent: Component {
if lhs.sideInset != rhs.sideInset {
return false
}
if lhs.includesHidden != rhs.includesHidden {
if lhs.useHiddenList != rhs.useHiddenList {
return false
}
if lhs.storySubscriptions != rhs.storySubscriptions {
@ -269,7 +269,7 @@ public final class StoryPeerListComponent: Component {
}
let _ = hasStories
let collapseStartIndex = component.includesHidden ? 0 : 1
let collapseStartIndex = component.useHiddenList ? 0 : 1
let collapsedItemWidth: CGFloat = 24.0
let collapsedItemDistance: CGFloat = 14.0
@ -510,8 +510,8 @@ public final class StoryPeerListComponent: Component {
if self.requestedLoadMoreToken != hasMoreToken {
self.requestedLoadMoreToken = hasMoreToken
if component.includesHidden {
if let storySubscriptionsContext = component.context.account.allStorySubscriptionsContext {
if component.useHiddenList {
if let storySubscriptionsContext = component.context.account.hiddenStorySubscriptionsContext {
storySubscriptionsContext.loadMore()
}
} else {
@ -526,7 +526,7 @@ public final class StoryPeerListComponent: Component {
self.sortedItems.removeAll(keepingCapacity: true)
if let storySubscriptions = component.storySubscriptions {
if !component.includesHidden, let accountItem = storySubscriptions.accountItem {
if !component.useHiddenList, let accountItem = storySubscriptions.accountItem {
self.sortedItems.append(accountItem)
}

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

@ -1686,6 +1686,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
}
}
var isStory: Bool = false
var game: TelegramMediaGame?
var webpage: TelegramMediaWebpage?
var invoice: TelegramMediaInvoice?
@ -1696,6 +1698,9 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
invoice = media
} else if let media = media as? TelegramMediaGame {
game = media
} else if let _ = media as? TelegramMediaStory {
isStory = true
automaticPlayback = false
}
}
@ -1717,6 +1722,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
} else if let file = content.file, file.isVideo, !file.isAnimated && !file.isVideoSticker {
progressRequired = true
}
} else if isStory {
progressRequired = true
}
case .Remote, .Fetching, .Paused:
if let webpage = webpage, let automaticDownload = self.automaticDownload, case .full = automaticDownload, case let .Loaded(content) = webpage.content {
@ -1953,7 +1960,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
state = .customIcon(secretProgressIcon)
} else if let file = media as? TelegramMediaFile, !file.isVideoSticker {
let isInlinePlayableVideo = file.isVideo && !isSecretMedia && (self.automaticPlayback ?? false)
if !isInlinePlayableVideo && file.isVideo {
if (!isInlinePlayableVideo || isStory) && file.isVideo {
state = .play(messageTheme.mediaOverlayControlColors.foregroundColor)
} else {
state = .none

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

@ -326,7 +326,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode {
case "telegram_chatlist":
actionTitle = item.presentationData.strings.Conversation_OpenChatFolder
case "telegram_story":
actionTitle = "Open Story"
actionTitle = "OPEN STORY"
default:
break
}

2
submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
View File

@ -4094,7 +4094,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
private func openStories(fromAvatar: Bool) {
if let expiringStoryList = self.expiringStoryList, let expiringStoryListState = self.expiringStoryListState, !expiringStoryListState.items.isEmpty {
let _ = expiringStoryList
let storyContent = StoryContentContextImpl(context: self.context, includeHidden: false, focusedPeerId: self.peerId, singlePeer: true)
let storyContent = StoryContentContextImpl(context: self.context, isHidden: false, focusedPeerId: self.peerId, singlePeer: true)
let _ = (storyContent.state
|> take(1)
|> deliverOnMainQueue).start(next: { [weak self] storyContentState in