ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +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-12-20 14:20:45 +04:00
parent 7c435bf03e b13b0aa35c
commit 46e203137a
11 changed files with 140 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryChatContent.swift
View File

@@ -236,6 +236,7 @@ public final class StoryContentContextImpl: StoryContentContext {
timestamp: item.timestamp,
expirationTimestamp: item.expirationTimestamp,
media: EngineMedia(media),
alternativeMedia: item.alternativeMedia.flatMap(EngineMedia.init),
mediaAreas: item.mediaAreas,
text: item.text,
entities: item.entities,
@@ -282,6 +283,7 @@ public final class StoryContentContextImpl: StoryContentContext {
timestamp: item.timestamp,
expirationTimestamp: Int32.max,
media: EngineMedia(item.media),
alternativeMedia: nil,
mediaAreas: item.mediaAreas,
text: item.text,
entities: item.entities,
@@ -944,6 +946,7 @@ public final class StoryContentContextImpl: StoryContentContext {
peer: peerReference,
storyId: item.id,
media: item.media,
alternativeMedia: item.alternativeMedia,
reactions: reactions,
priority: .top(position: nextPriority)
)
@@ -955,7 +958,7 @@ public final class StoryContentContextImpl: StoryContentContext {
for (id, info) in resultResources.sorted(by: { $0.value.priority < $1.value.priority }) {
validIds.append(id)
if self.preloadStoryResourceDisposables[id] == nil {
self.preloadStoryResourceDisposables[id] = preloadStoryMedia(context: context, peer: info.peer, storyId: info.storyId, media: info.media, reactions: info.reactions).startStrict()
self.preloadStoryResourceDisposables[id] = preloadStoryMedia(context: context, info: info).startStrict()
}
}
@@ -1220,6 +1223,7 @@ public final class SingleStoryContentContextImpl: StoryContentContext {
timestamp: itemValue.timestamp,
expirationTimestamp: itemValue.expirationTimestamp,
media: EngineMedia(media),
alternativeMedia: itemValue.alternativeMedia.flatMap(EngineMedia.init),
mediaAreas: itemValue.mediaAreas,
text: itemValue.text,
entities: itemValue.entities,
@@ -1530,6 +1534,7 @@ public final class PeerStoryListContentContextImpl: StoryContentContext {
peer: peerReference,
storyId: item.id,
media: item.media,
alternativeMedia: item.alternativeMedia,
reactions: reactions,
priority: .top(position: nextPriority)
)
@@ -1543,7 +1548,7 @@ public final class PeerStoryListContentContextImpl: StoryContentContext {
if let mediaId = info.media.id {
validIds.append(mediaId)
if self.preloadStoryResourceDisposables[mediaId] == nil {
self.preloadStoryResourceDisposables[mediaId] = preloadStoryMedia(context: context, peer: info.peer, storyId: info.storyId, media: info.media, reactions: info.reactions).startStrict()
self.preloadStoryResourceDisposables[mediaId] = preloadStoryMedia(context: context, info: info).startStrict()
}
}
}
@@ -1629,13 +1634,20 @@ public final class PeerStoryListContentContextImpl: StoryContentContext {
}
}
public func preloadStoryMedia(context: AccountContext, peer: PeerReference, storyId: Int32, media: EngineMedia, reactions: [MessageReaction.Reaction]) -> Signal<Never, NoError> {
public func preloadStoryMedia(context: AccountContext, info: StoryPreloadInfo) -> Signal<Never, NoError> {
var signals: [Signal<Never, NoError>] = []
switch media {
let selectedMedia: EngineMedia
if context.sharedContext.immediateExperimentalUISettings.alternativeStoryMedia, let alternativeMedia = info.alternativeMedia {
selectedMedia = alternativeMedia
} else {
selectedMedia = info.media
}
switch selectedMedia {
case let .image(image):
if let representation = largestImageRepresentation(image.representations) {
signals.append(fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, userLocation: .peer(peer.id), userContentType: .story, reference: .media(media: .story(peer: peer, id: storyId, media: media._asMedia()), resource: representation.resource), range: nil)
signals.append(fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, userLocation: .peer(info.peer.id), userContentType: .story, reference: .media(media: .story(peer: info.peer, id: info.storyId, media: selectedMedia._asMedia()), resource: representation.resource), range: nil)
|> ignoreValues
|> `catch` { _ -> Signal<Never, NoError> in
return .complete()
@@ -1652,7 +1664,7 @@ public func preloadStoryMedia(context: AccountContext, peer: PeerReference, stor
}
}
signals.append(fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, userLocation: .peer(peer.id), userContentType: .story, reference: .media(media: .story(peer: peer, id: storyId, media: media._asMedia()), resource: file.resource), range: fetchRange)
signals.append(fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, userLocation: .peer(info.peer.id), userContentType: .story, reference: .media(media: .story(peer: info.peer, id: info.storyId, media: selectedMedia._asMedia()), resource: file.resource), range: fetchRange)
|> ignoreValues
|> `catch` { _ -> Signal<Never, NoError> in
return .complete()
@@ -1665,7 +1677,7 @@ public func preloadStoryMedia(context: AccountContext, peer: PeerReference, stor
var builtinReactions: [String] = []
var customReactions: [Int64] = []
for reaction in reactions {
for reaction in info.reactions {
switch reaction {
case let .builtin(value):
if !builtinReactions.contains(value) {
@@ -1716,8 +1728,6 @@ public func preloadStoryMedia(context: AccountContext, peer: PeerReference, stor
return Void()
}
//let fileFetchPriorityDisposable = context.engine.resources.pushPriorityDownload(resourceId: file.resource.id.stringRepresentation, priority: 1)
let statusDisposable = statusSignal.start(completed: {
subscriber.putCompletion()
})
@@ -1726,7 +1736,6 @@ public func preloadStoryMedia(context: AccountContext, peer: PeerReference, stor
return ActionDisposable {
statusDisposable.dispose()
loadDisposable.dispose()
//fileFetchPriorityDisposable.dispose()
}
}
})
@@ -1771,12 +1780,9 @@ public func preloadStoryMedia(context: AccountContext, peer: PeerReference, stor
})
let loadDisposable = loadSignal.start()
//let fileFetchPriorityDisposable = context.engine.resources.pushPriorityDownload(resourceId: file.resource.id.stringRepresentation, priority: 1)
return ActionDisposable {
statusDisposable.dispose()
loadDisposable.dispose()
//fileFetchPriorityDisposable.dispose()
}
}
})
@@ -2038,6 +2044,7 @@ private func getCachedStory(storyId: StoryId, transaction: Transaction) -> Engin
timestamp: item.timestamp,
expirationTimestamp: item.expirationTimestamp,
media: EngineMedia(media),
alternativeMedia: item.alternativeMedia.flatMap(EngineMedia.init),
mediaAreas: item.mediaAreas,
text: item.text,
entities: item.entities,
@@ -2686,6 +2693,7 @@ public final class RepostStoriesContentContextImpl: StoryContentContext {
peer: peerReference,
storyId: item.id,
media: item.media,
alternativeMedia: item.alternativeMedia,
reactions: reactions,
priority: .top(position: nextPriority)
)
@@ -2697,7 +2705,7 @@ public final class RepostStoriesContentContextImpl: StoryContentContext {
for (id, info) in resultResources.sorted(by: { $0.value.priority < $1.value.priority }) {
validIds.append(id)
if self.preloadStoryResourceDisposables[id] == nil {
self.preloadStoryResourceDisposables[id] = preloadStoryMedia(context: context, peer: info.peer, storyId: info.storyId, media: info.media, reactions: info.reactions).startStrict()
self.preloadStoryResourceDisposables[id] = preloadStoryMedia(context: context, info: info).startStrict()
}
}

40
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemContentComponent.swift
View File

@@ -574,16 +574,34 @@ final class StoryItemContentComponent: Component {
let peerReference = PeerReference(component.peer._asPeer())
let selectedMedia: EngineMedia
var messageMedia: EngineMedia?
switch component.item.media {
case let .image(image):
messageMedia = .image(image)
case let .file(file):
messageMedia = .file(file)
case .unsupported:
self.contentLoaded = true
default:
break
if component.context.sharedContext.immediateExperimentalUISettings.alternativeStoryMedia, let alternativeMedia = component.item.alternativeMedia {
selectedMedia = alternativeMedia
switch alternativeMedia {
case let .image(image):
messageMedia = .image(image)
case let .file(file):
messageMedia = .file(file)
case .unsupported:
self.contentLoaded = true
default:
break
}
} else {
selectedMedia = component.item.media
switch component.item.media {
case let .image(image):
messageMedia = .image(image)
case let .file(file):
messageMedia = .file(file)
case .unsupported:
self.contentLoaded = true
default:
break
}
}
var reloadMedia = false
@@ -678,7 +696,7 @@ final class StoryItemContentComponent: Component {
strings: component.strings,
peer: component.peer,
storyId: component.item.id,
media: component.item.media,
media: messageMedia,
size: availableSize,
isCaptureProtected: component.item.isForwardingDisabled,
attemptSynchronous: synchronousLoad,
@@ -720,7 +738,7 @@ final class StoryItemContentComponent: Component {
}
}
switch component.item.media {
switch selectedMedia {
case .image, .file:
if let unsupportedText = self.unsupportedText {
self.unsupportedText = nil