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

Demo video processing

Browse Source
This commit is contained in:
Isaac 2024-10-15 17:23:24 +04:00
parent 25251fc9d4
commit 71b035e6d1
7 changed files with 448 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
submodules/ContextUI/Sources/ContextActionsContainerNode.swift
View File

@ -442,6 +442,12 @@ final class InnerTextSelectionTipContainerNode: ASDisplayNode {
self.targetSelectionIndex = nil
icon = nil
isUserInteractionEnabled = action != nil
case .videoProcessing:
self.action = nil
self.text = "The video will be published once converted and optimized."
self.targetSelectionIndex = nil
icon = nil
isUserInteractionEnabled = action != nil
}
self.iconNode = ASImageNode()

7
submodules/ContextUI/Sources/ContextController.swift
View File

@ -2350,6 +2350,7 @@ public final class ContextController: ViewController, StandalonePresentableContr
case animatedEmoji(text: String?, arguments: TextNodeWithEntities.Arguments?, file: TelegramMediaFile?, action: (() -> Void)?)
case notificationTopicExceptions(text: String, action: (() -> Void)?)
case starsReactions(topCount: Int)
case videoProcessing
public static func ==(lhs: Tip, rhs: Tip) -> Bool {
switch lhs {
@ -2401,6 +2402,12 @@ public final class ContextController: ViewController, StandalonePresentableContr
} else {
return false
}
case .videoProcessing:
if case .videoProcessing = rhs {
return true
} else {
return false
}
}
}
}

14
submodules/TelegramUI/Components/Chat/ChatMessageDateAndStatusNode/Sources/StringForMessageTimestampStatus.swift
View File

@ -95,6 +95,20 @@ public func stringForMessageTimestampStatus(accountPeerId: PeerId, message: Mess
dateText = " "
}
//TODO:release
//TODO:localize
if "".isEmpty, let channel = message.peers[message.id.peerId] as? TelegramChannel, case .broadcast = channel.info {
for media in message.media {
if let file = media as? TelegramMediaFile, file.isVideo, !file.isInstantVideo, !file.isAnimated {
if message.id.namespace == Namespaces.Message.ScheduledCloud {
return "appx. \(dateText)"
} else if message.id.namespace == Namespaces.Message.ScheduledLocal {
return "processing"
}
}
}
}
if displayFullDate {
let dayText: String

103
submodules/TelegramUI/Sources/Chat/ChatControllerLoadDisplayNode.swift
View File

@ -1120,9 +1120,16 @@ extension ChatControllerImpl {
self.chatDisplayNode.setupSendActionOnViewUpdate = { [weak self] f, messageCorrelationId in
//print("setup layoutActionOnViewTransition")
self?.chatDisplayNode.historyNode.layoutActionOnViewTransition = ({ [weak self] transition in
guard let self else {
return
}
self.layoutActionOnViewTransitionAction = f
self.chatDisplayNode.historyNode.layoutActionOnViewTransition = ({ [weak self] transition in
f()
if let strongSelf = self, let validLayout = strongSelf.validLayout {
strongSelf.layoutActionOnViewTransitionAction = nil
var mappedTransition: (ChatHistoryListViewTransition, ListViewUpdateSizeAndInsets?)?
let isScheduledMessages: Bool
@ -1262,8 +1269,27 @@ extension ChatControllerImpl {
}
}
let _ = (strongSelf.shouldDivertMessagesToScheduled(messages: transformedMessages)
|> deliverOnMainQueue).start(next: { shouldDivert in
let signal: Signal<[MessageId?], NoError>
var stayInThisChat = false
var shouldOpenScheduledMessages = false
if forwardSourcePeerIds.count > 1 {
var forwardedMessages = forwardedMessages
if shouldDivert {
forwardedMessages = forwardedMessages.map { messageGroup -> [EnqueueMessage] in
return messageGroup.map { message -> EnqueueMessage in
return message.withUpdatedAttributes { attributes in
var attributes = attributes
attributes.removeAll(where: { $0 is OutgoingScheduleInfoMessageAttribute })
attributes.append(OutgoingScheduleInfoMessageAttribute(scheduleTime: Int32(Date().timeIntervalSince1970) + 10 * 24 * 60 * 60))
return attributes
}
}
}
shouldOpenScheduledMessages = true
}
var signals: [Signal<[MessageId?], NoError>] = []
for messagesGroup in forwardedMessages {
signals.append(enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messagesGroup))
@ -1276,21 +1302,94 @@ extension ChatControllerImpl {
}
return ids
}
stayInThisChat = true
} else {
var transformedMessages = transformedMessages
if shouldDivert {
transformedMessages = transformedMessages.map { message -> EnqueueMessage in
return message.withUpdatedAttributes { attributes in
var attributes = attributes
attributes.removeAll(where: { $0 is OutgoingScheduleInfoMessageAttribute })
attributes.append(OutgoingScheduleInfoMessageAttribute(scheduleTime: Int32(Date().timeIntervalSince1970) + 10 * 24 * 60 * 60))
return attributes
}
}
shouldOpenScheduledMessages = true
}
signal = enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: transformedMessages)
}
let _ = (signal
|> deliverOnMainQueue).startStandalone(next: { messageIds in
if let strongSelf = self {
guard let strongSelf = self else {
return
}
if case .scheduledMessages = strongSelf.presentationInterfaceState.subject {
} else {
strongSelf.chatDisplayNode.historyNode.scrollToEndOfHistory()
if shouldOpenScheduledMessages {
if let layoutActionOnViewTransitionAction = strongSelf.layoutActionOnViewTransitionAction {
strongSelf.layoutActionOnViewTransitionAction = nil
layoutActionOnViewTransitionAction()
}
if stayInThisChat {
strongSelf.dismissAllUndoControllers()
//TODO:localize
strongSelf.present(
UndoOverlayController(
presentationData: strongSelf.presentationData,
content: .info(
title: "Improving video...",
text: "The video will be published after it's optimized for the bese viewing experience.",
timeout: 8.0,
customUndoText: nil
),
elevatedLayout: false,
position: .top,
action: { _ in
return true
}
),
in: .current
)
} else {
strongSelf.openScheduledMessages(force: true, completion: { c in
guard let self else {
return
}
c.dismissAllUndoControllers()
//TODO:localize
c.present(
UndoOverlayController(
presentationData: self.presentationData,
content: .info(
title: "Improving video...",
text: "The video will be published after it's optimized for the bese viewing experience.",
timeout: 8.0,
customUndoText: nil
),
elevatedLayout: false,
position: .top,
action: { _ in
return true
}
),
in: .current
)
})
}
}
}
})
donateSendMessageIntent(account: strongSelf.context.account, sharedContext: strongSelf.context.sharedContext, intentContext: .chat, peerIds: [peerId])
})
} else if case let .customChatContents(customChatContents) = strongSelf.subject {
switch customChatContents.kind {
case .hashTagSearch:

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

@ -106,6 +106,16 @@ extension ChatControllerImpl {
}
}
//TODO:release
//TODO:localize
if "".isEmpty, let channel = message.peers[message.id.peerId] as? TelegramChannel, case .broadcast = channel.info {
for media in message.media {
if let file = media as? TelegramMediaFile, file.isVideo, !file.isInstantVideo, !file.isAnimated {
tip = .videoProcessing
}
}
}
if actions.tip == nil {
actions.tip = tip
}

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

@ -641,6 +641,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}
var layoutActionOnViewTransitionAction: (() -> Void)?
public init(
context: AccountContext,
chatLocation: ChatLocation,
@ -9114,6 +9116,55 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}
func shouldDivertMessagesToScheduled(targetPeer: EnginePeer? = nil, messages: [EnqueueMessage]) -> Signal<Bool, NoError> {
guard let peer = targetPeer?._asPeer() ?? self.presentationInterfaceState.renderedPeer?.peer else {
return .single(false)
}
if let channel = peer as? TelegramChannel, case .broadcast = channel.info {
} else {
return .single(false)
}
//TODO:release
if !"".isEmpty {
return .single(false)
}
var forwardMessageIds: [EngineMessage.Id] = []
for message in messages {
if case let .message(_, _, _, mediaReference, _, _, _, _, _, _) = message, let media = mediaReference?.media {
if let file = media as? TelegramMediaFile, file.isVideo && !file.isInstantVideo && !file.isAnimated {
return .single(true)
}
} else if case let .forward(sourceId, _, _, _, _) = message {
forwardMessageIds.append(sourceId)
}
}
if forwardMessageIds.isEmpty {
return .single(false)
} else {
return self.context.engine.data.get(
EngineDataList(forwardMessageIds.map(TelegramEngine.EngineData.Item.Messages.Message.init(id:)))
)
|> map { messages -> Bool in
for message in messages {
guard let message else {
continue
}
for media in message.media {
if let file = media as? TelegramMediaFile, file.isVideo && !file.isInstantVideo && !file.isAnimated {
return true
}
}
}
return false
}
}
}
func sendMessages(_ messages: [EnqueueMessage], media: Bool = false, commit: Bool = false) {
if case let .customChatContents(customChatContents) = self.subject {
customChatContents.enqueueMessages(messages: messages)
@ -9124,6 +9175,27 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
return
}
let _ = (self.shouldDivertMessagesToScheduled(messages: messages)
|> deliverOnMainQueue).startStandalone(next: { [weak self] shouldDivert in
guard let self else {
return
}
var messages = messages
var shouldOpenScheduledMessages = false
if shouldDivert {
messages = messages.map { message -> EnqueueMessage in
return message.withUpdatedAttributes { attributes in
var attributes = attributes
attributes.removeAll(where: { $0 is OutgoingScheduleInfoMessageAttribute })
attributes.append(OutgoingScheduleInfoMessageAttribute(scheduleTime: Int32(Date().timeIntervalSince1970) + 10 * 24 * 60 * 60))
return attributes
}
}
shouldOpenScheduledMessages = true
}
var isScheduledMessages = false
if case .scheduledMessages = self.presentationInterfaceState.subject {
isScheduledMessages = true
@ -9142,6 +9214,39 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
donateSendMessageIntent(account: self.context.account, sharedContext: self.context.sharedContext, intentContext: .chat, peerIds: [peerId])
self.updateChatPresentationInterfaceState(interactive: true, { $0.updatedShowCommands(false) })
if !isScheduledMessages && shouldOpenScheduledMessages {
if let layoutActionOnViewTransitionAction = self.layoutActionOnViewTransitionAction {
self.layoutActionOnViewTransitionAction = nil
layoutActionOnViewTransitionAction()
}
self.openScheduledMessages(force: true, completion: { [weak self] c in
guard let self else {
return
}
c.dismissAllUndoControllers()
//TODO:localize
c.present(
UndoOverlayController(
presentationData: self.presentationData,
content: .info(
title: "Improving video...",
text: "The video will be published after it's optimized for the bese viewing experience.",
timeout: 8.0,
customUndoText: nil
),
elevatedLayout: false,
position: .top,
action: { _ in
return true
}
),
in: .current
)
})
}
} else {
self.presentScheduleTimePicker(style: media ? .media : .default, dismissByTapOutside: false, completion: { [weak self] time in
if let strongSelf = self {
@ -9149,12 +9254,22 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
})
}
})
}
func enqueueMediaMessages(signals: [Any]?, silentPosting: Bool, scheduleTime: Int32? = nil, parameters: ChatSendMessageActionSheetController.SendParameters? = nil, getAnimatedTransitionSource: ((String) -> UIView?)? = nil, completion: @escaping () -> Void = {}) {
self.enqueueMediaMessageDisposable.set((legacyAssetPickerEnqueueMessages(context: self.context, account: self.context.account, signals: signals!)
|> deliverOnMainQueue).startStrict(next: { [weak self] items in
if let strongSelf = self {
guard let strongSelf = self else {
return
}
let _ = (strongSelf.shouldDivertMessagesToScheduled(messages: items.map(\.message))
|> deliverOnMainQueue).startStandalone(next: { shouldDivert in
guard let strongSelf = self else {
return
}
var completionImpl: (() -> Void)? = completion
var usedCorrelationId: Int64?
@ -9166,6 +9281,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
var skipAddingTransitions = false
if shouldDivert {
skipAddingTransitions = true
}
for item in items {
var message = item.message
if message.groupingKey != nil {
@ -9289,7 +9408,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
if let _ = scheduleTime {
completion()
}
}
})
}))
}
@ -10384,8 +10503,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
}
func openScheduledMessages() {
guard let navigationController = self.effectiveNavigationController, navigationController.topViewController == self else {
func openScheduledMessages(force: Bool = false, completion: @escaping (ChatControllerImpl) -> Void = { _ in }) {
guard let navigationController = self.effectiveNavigationController else {
return
}
if navigationController.topViewController == self || force {
} else {
return
}
@ -10396,7 +10519,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
let controller = ChatControllerImpl(context: self.context, chatLocation: mappedChatLocation, subject: .scheduledMessages)
controller.navigationPresentation = .modal
navigationController.pushViewController(controller)
navigationController.pushViewController(controller, completion: { [weak controller] in
if let controller {
completion(controller)
}
})
}
func openPinnedMessages(at messageId: MessageId?) {

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

@ -122,6 +122,9 @@ extension ChatControllerImpl {
})
let commit: ([EnqueueMessage]) -> Void = { result in
guard let strongSelf = self else {
return
}
var result = result
strongSelf.updateChatPresentationInterfaceState(animated: false, interactive: true, { $0.updatedInterfaceState({ $0.withoutSelectionState() }).updatedSearch(nil) })
@ -133,9 +136,37 @@ extension ChatControllerImpl {
result[i] = result[i].withUpdatedCorrelationId(correlationId)
}
let targetPeersShouldDivertSignals: [Signal<(EnginePeer, Bool), NoError>] = peers.map { peer -> Signal<(EnginePeer, Bool), NoError> in
return strongSelf.shouldDivertMessagesToScheduled(targetPeer: peer, messages: result)
|> map { shouldDivert -> (EnginePeer, Bool) in
return (peer, shouldDivert)
}
}
let targetPeersShouldDivert: Signal<[(EnginePeer, Bool)], NoError> = combineLatest(targetPeersShouldDivertSignals)
let _ = (targetPeersShouldDivert
|> deliverOnMainQueue).startStandalone(next: { targetPeersShouldDivert in
guard let strongSelf = self else {
return
}
var displayConvertingTooltip = false
var displayPeers: [EnginePeer] = []
for peer in peers {
let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: result)
for (peer, shouldDivert) in targetPeersShouldDivert {
var peerMessages = result
if shouldDivert {
displayConvertingTooltip = true
peerMessages = peerMessages.map { message -> EnqueueMessage in
return message.withUpdatedAttributes { attributes in
var attributes = attributes
attributes.removeAll(where: { $0 is OutgoingScheduleInfoMessageAttribute })
attributes.append(OutgoingScheduleInfoMessageAttribute(scheduleTime: Int32(Date().timeIntervalSince1970) + 10 * 24 * 60 * 60))
return attributes
}
}
}
let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: peerMessages)
|> deliverOnMainQueue).startStandalone(next: { messageIds in
if let strongSelf = self {
let signals: [Signal<Bool, NoError>] = messageIds.compactMap({ id -> Signal<Bool, NoError>? in
@ -224,6 +255,28 @@ extension ChatControllerImpl {
return false
}, additionalView: (savedMessages && messages.count > 0) ? chatShareToSavedMessagesAdditionalView(strongSelf, reactionItems: reactionItems, correlationIds: correlationIds) : nil), in: .current)
})
if displayConvertingTooltip {
//TODO:localize
strongSelf.present(
UndoOverlayController(
presentationData: strongSelf.presentationData,
content: .info(
title: "Improving video...",
text: "The video will be published after it's optimized for the bese viewing experience.",
timeout: 8.0,
customUndoText: nil
),
elevatedLayout: false,
position: .top,
action: { _ in
return true
}
),
in: .current
)
}
})
}
switch mode {