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

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

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-07-05 16:37:41 +02:00
commit a480df3ed6
4 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift
View File

@ -1035,7 +1035,7 @@ public final class StoryItemSetContainerComponent: Component {
guard let visibleItem else {
return
}
if visibleItem.currentProgress != progress || visibleItem.isBuffering != isBuffering {
if visibleItem.currentProgress != progress || visibleItem.isBuffering != isBuffering || canSwitch {
visibleItem.currentProgress = progress
visibleItem.isBuffering = isBuffering

BIN
submodules/TelegramUI/Resources/Animations/story_expired.tgs Normal file
View File

Binary file not shown.

48
submodules/TelegramUI/Sources/OpenResolvedUrl.swift
View File

@ -805,23 +805,39 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
dismissInput()
}
case let .story(peerId, id):
let storyContent = SingleStoryContentContextImpl(context: context, storyId: StoryId(peerId: peerId, id: id))
let _ = (storyContent.state
|> take(1)
|> deliverOnMainQueue).start(next: { [weak navigationController] _ in
let transitionIn: StoryContainerScreen.TransitionIn? = nil
let storyContainerScreen = StoryContainerScreen(
context: context,
content: storyContent,
transitionIn: transitionIn,
transitionOut: { _, _ in
let transitionOut: StoryContainerScreen.TransitionOut? = nil
let _ = (context.account.postbox.transaction { transaction -> Bool in
if let value = transaction.getStory(id: StoryId(peerId: peerId, id: id)), !value.data.isEmpty {
return true
} else {
return false
}
}
|> deliverOnMainQueue).start(next: { exists in
if exists {
let storyContent = SingleStoryContentContextImpl(context: context, storyId: StoryId(peerId: peerId, id: id))
let _ = (storyContent.state
|> take(1)
|> deliverOnMainQueue).start(next: { [weak navigationController] _ in
let transitionIn: StoryContainerScreen.TransitionIn? = nil
return transitionOut
}
)
navigationController?.pushViewController(storyContainerScreen)
let storyContainerScreen = StoryContainerScreen(
context: context,
content: storyContent,
transitionIn: transitionIn,
transitionOut: { _, _ in
let transitionOut: StoryContainerScreen.TransitionOut? = nil
return transitionOut
}
)
navigationController?.pushViewController(storyContainerScreen)
})
} else {
//TODO:localize
present(UndoOverlayController(presentationData: presentationData, content: .universal(animation: "story_expired", scale: 0.066, colors: [:], title: nil, text: "This story does not exist", customUndoText: nil, timeout: nil), elevatedLayout: true, animateInAsReplacement: false, action: { _ in
return true
}), nil)
}
})
}
}

5
submodules/UrlHandling/Sources/UrlHandling.swift
View File

@ -709,7 +709,10 @@ private func resolveInternalUrl(context: AccountContext, url: ParsedInternalUrl)
case let .voiceChat(invite):
return .single(.joinVoiceChat(peer.id, invite))
case let .story(id):
return .single(.story(peerId: peer.id, id: id))
return context.engine.messages.refreshStories(peerId: peer.id, ids: [id])
|> map { _ -> ResolvedUrl? in
}
|> then(.single(.story(peerId: peer.id, id: id)))
}
} else {
return .single(.peer(peer, .chat(textInputState: nil, subject: nil, peekData: nil)))