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

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-04-06 15:04:29 +04:00
parent 6ae44df975
commit 2242097992
4 changed files with 78 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/BUILD
View File

@ -1811,6 +1811,7 @@ plist_fragment(
<string>ucbrowser</string> <string>ucbrowser</string>
<string>dolphin</string> <string>dolphin</string>
<string>instagram-stories</string> <string>instagram-stories</string>
<string>yangomaps</string>
</array> </array>
<key>LSRequiresIPhoneOS</key> <key>LSRequiresIPhoneOS</key>
<true/> <true/>

157
submodules/TelegramUI/Sources/Chat/ChatControllerOpenWebApp.swift
View File

@ -243,9 +243,6 @@ func openWebAppImpl(
return navigationController ?? (context.sharedContext.mainWindow?.viewController as? NavigationController) return navigationController ?? (context.sharedContext.mainWindow?.viewController as? NavigationController)
}) })
controller.navigationPresentation = .flatModal controller.navigationPresentation = .flatModal
if let parentController = parentController as? ChatControllerImpl {
parentController.currentWebAppController = controller
}
parentController.push(controller) parentController.push(controller)
presentImpl = { [weak controller] c, a in presentImpl = { [weak controller] c, a in
@ -297,9 +294,6 @@ func openWebAppImpl(
return navigationController ?? (context.sharedContext.mainWindow?.viewController as? NavigationController) return navigationController ?? (context.sharedContext.mainWindow?.viewController as? NavigationController)
}) })
controller.navigationPresentation = .flatModal controller.navigationPresentation = .flatModal
if let parentController = parentController as? ChatControllerImpl {
parentController.currentWebAppController = controller
}
parentController.push(controller) parentController.push(controller)
presentImpl = { [weak controller] c, a in presentImpl = { [weak controller] c, a in
@ -355,7 +349,7 @@ public extension ChatControllerImpl {
self.context.sharedContext.openWebApp(context: self.context, parentController: self, updatedPresentationData: self.updatedPresentationData, botPeer: EnginePeer(peer), chatPeer: EnginePeer(peer), threadId: self.chatLocation.threadId, buttonText: buttonText, url: url, simple: simple, source: source, skipTermsOfService: false, payload: nil) self.context.sharedContext.openWebApp(context: self.context, parentController: self, updatedPresentationData: self.updatedPresentationData, botPeer: EnginePeer(peer), chatPeer: EnginePeer(peer), threadId: self.chatLocation.threadId, buttonText: buttonText, url: url, simple: simple, source: source, skipTermsOfService: false, payload: nil)
} }
static func botRequestSwitchInline(context: AccountContext, controller: ChatControllerImpl?, peerId: EnginePeer.Id, botAddress: String, query: String, chatTypes: [ReplyMarkupButtonRequestPeerType]?, completion: @escaping () -> Void) -> Void { fileprivate static func botRequestSwitchInline(context: AccountContext, controller: ChatControllerImpl?, peerId: EnginePeer.Id, botAddress: String, query: String, chatTypes: [ReplyMarkupButtonRequestPeerType]?, completion: @escaping () -> Void) -> Void {
let activateSwitchInline: (EnginePeer?) -> Void = { selectedPeer in let activateSwitchInline: (EnginePeer?) -> Void = { selectedPeer in
var chatController: ChatControllerImpl? var chatController: ChatControllerImpl?
if let current = controller { if let current = controller {
@ -429,7 +423,7 @@ public extension ChatControllerImpl {
}) })
} }
static func botOpenUrl(context: AccountContext, peerId: EnginePeer.Id, controller: ChatControllerImpl?, url: String, concealed: Bool, forceUpdate: Bool, present: @escaping (ViewController, Any?) -> Void, commit: @escaping () -> Void = {}) { fileprivate static func botOpenUrl(context: AccountContext, peerId: EnginePeer.Id, controller: ChatControllerImpl?, url: String, concealed: Bool, forceUpdate: Bool, present: @escaping (ViewController, Any?) -> Void, commit: @escaping () -> Void = {}) {
if let controller { if let controller {
controller.openUrl(url, concealed: concealed, forceExternal: true, commit: commit) controller.openUrl(url, concealed: concealed, forceExternal: true, commit: commit)
} else { } else {
@ -437,41 +431,52 @@ public extension ChatControllerImpl {
present(c, nil) present(c, nil)
}, openResolved: { result in }, openResolved: { result in
var navigationController: NavigationController? var navigationController: NavigationController?
if let current = controller?.navigationController as? NavigationController { if let main = context.sharedContext.mainWindow?.viewController as? NavigationController {
navigationController = current
} else if let main = context.sharedContext.mainWindow?.viewController as? NavigationController {
navigationController = main navigationController = main
} }
context.sharedContext.openResolvedUrl(result, context: context, urlContext: .generic, navigationController: navigationController, forceExternal: false, forceUpdate: forceUpdate, openPeer: { peer, navigation in if case let .peer(peer, navigation) = result, case let .withBotApp(botApp) = navigation, let botPeer = peer.flatMap(EnginePeer.init), let parentController = navigationController?.viewControllers.last as? ViewController {
if let navigationController { self.presentBotApp(context: context, parentController: parentController, botApp: botApp.botApp, botPeer: botPeer, payload: botApp.payload, mode: botApp.mode)
ChatControllerImpl.botOpenPeer(context: context, peerId: peer.id, navigation: navigation, navigationController: navigationController) } else {
} context.sharedContext.openResolvedUrl(result, context: context, urlContext: .generic, navigationController: navigationController, forceExternal: false, forceUpdate: forceUpdate, openPeer: { peer, navigation in
commit() if let navigationController {
}, sendFile: nil, sendSticker: nil, sendEmoji: nil, requestMessageActionUrlAuth: nil, joinVoiceChat: { peerId, invite, call in ChatControllerImpl.botOpenPeer(context: context, peerId: peer.id, navigation: navigation, navigationController: navigationController)
}, }
present: { c, a in commit()
present(c, a) }, sendFile: nil, sendSticker: nil, sendEmoji: nil, requestMessageActionUrlAuth: nil, joinVoiceChat: { peerId, invite, call in
}, dismissInput: { }, present: { c, a in
context.sharedContext.mainWindow?.viewController?.view.endEditing(false) present(c, a)
}, contentContext: nil, progress: nil, completion: nil) }, dismissInput: {
context.sharedContext.mainWindow?.viewController?.view.endEditing(false)
}, contentContext: nil, progress: nil, completion: nil)
}
}) })
} }
} }
func presentBotApp(botApp: BotApp?, botPeer: EnginePeer, payload: String?, mode: ResolvedStartAppMode, concealed: Bool = false, commit: @escaping () -> Void = {}) { func presentBotApp(botApp: BotApp?, botPeer: EnginePeer, payload: String?, mode: ResolvedStartAppMode, concealed: Bool = false, commit: @escaping () -> Void = {}) {
guard let peerId = self.chatLocation.peerId else { ChatControllerImpl.presentBotApp(context: self.context, parentController: self, botApp: botApp, botPeer: botPeer, payload: payload, mode: mode, concealed: concealed, commit: commit)
return }
fileprivate static func presentBotApp(context: AccountContext, parentController: ViewController, botApp: BotApp?, botPeer: EnginePeer, payload: String?, mode: ResolvedStartAppMode, concealed: Bool = false, commit: @escaping () -> Void = {}) {
let chatController = parentController as? ChatControllerImpl
let peerId: EnginePeer.Id
let threadId = chatController?.chatLocation.threadId
if let chatPeerId = chatController?.chatLocation.peerId {
peerId = chatPeerId
} else {
peerId = botPeer.id
} }
self.attachmentController?.dismiss(animated: true, completion: nil)
chatController?.attachmentController?.dismiss(animated: true, completion: nil)
let updatedPresentationData = chatController?.updatedPresentationData
let presentationData = updatedPresentationData?.0 ?? context.sharedContext.currentPresentationData.with { $0 }
if let botApp { if let botApp {
let openBotApp: (Bool, Bool, BotAppSettings?) -> Void = { [weak self] allowWrite, justInstalled, appSettings in let openBotApp: (Bool, Bool, BotAppSettings?) -> Void = { [weak parentController, weak chatController] allowWrite, justInstalled, appSettings in
guard let strongSelf = self else {
return
}
commit() commit()
strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { chatController?.updateChatPresentationInterfaceState(animated: true, interactive: true, {
return $0.updatedTitlePanelContext { return $0.updatedTitlePanelContext {
if !$0.contains(where: { if !$0.contains(where: {
switch $0 { switch $0 {
@ -489,10 +494,10 @@ public extension ChatControllerImpl {
} }
}) })
let updateProgress = { [weak self] in let updateProgress = { [weak chatController] in
Queue.mainQueue().async { Queue.mainQueue().async {
if let strongSelf = self { if let chatController {
strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { chatController.updateChatPresentationInterfaceState(animated: true, interactive: true, {
return $0.updatedTitlePanelContext { return $0.updatedTitlePanelContext {
if let index = $0.firstIndex(where: { if let index = $0.firstIndex(where: {
switch $0 { switch $0 {
@ -514,63 +519,56 @@ public extension ChatControllerImpl {
} }
let botAddress = botPeer.addressName ?? "" let botAddress = botPeer.addressName ?? ""
strongSelf.messageActionCallbackDisposable.set(((strongSelf.context.engine.messages.requestAppWebView(peerId: peerId, appReference: .id(id: botApp.id, accessHash: botApp.accessHash), payload: payload, themeParams: generateWebAppThemeParams(strongSelf.presentationData.theme), compact: mode == .compact, fullscreen: mode == .fullscreen, allowWrite: allowWrite) let _ = ((context.engine.messages.requestAppWebView(peerId: peerId, appReference: .id(id: botApp.id, accessHash: botApp.accessHash), payload: payload, themeParams: generateWebAppThemeParams(presentationData.theme), compact: mode == .compact, fullscreen: mode == .fullscreen, allowWrite: allowWrite)
|> afterDisposed { |> afterDisposed {
updateProgress() updateProgress()
}) })
|> deliverOnMainQueue).startStrict(next: { [weak self] result in |> deliverOnMainQueue).startStandalone(next: { [weak parentController, weak chatController] result in
guard let strongSelf = self else {
return
}
let context = strongSelf.context
let params = WebAppParameters(source: .generic, peerId: peerId, botId: botPeer.id, botName: botApp.title, botVerified: botPeer.isVerified, botAddress: botPeer.addressName ?? "", appName: botApp.shortName, url: result.url, queryId: 0, payload: payload, buttonText: "", keepAliveSignal: nil, forceHasSettings: botApp.flags.contains(.hasSettings), fullSize: result.flags.contains(.fullSize), isFullscreen: result.flags.contains(.fullScreen), appSettings: appSettings) let params = WebAppParameters(source: .generic, peerId: peerId, botId: botPeer.id, botName: botApp.title, botVerified: botPeer.isVerified, botAddress: botPeer.addressName ?? "", appName: botApp.shortName, url: result.url, queryId: 0, payload: payload, buttonText: "", keepAliveSignal: nil, forceHasSettings: botApp.flags.contains(.hasSettings), fullSize: result.flags.contains(.fullSize), isFullscreen: result.flags.contains(.fullScreen), appSettings: appSettings)
var presentImpl: ((ViewController, Any?) -> Void)? var presentImpl: ((ViewController, Any?) -> Void)?
let controller = standaloneWebAppController(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, params: params, threadId: strongSelf.chatLocation.threadId, openUrl: { [weak self] url, concealed, forceUpdate, commit in let controller = standaloneWebAppController(context: context, updatedPresentationData: updatedPresentationData, params: params, threadId: threadId, openUrl: { url, concealed, forceUpdate, commit in
ChatControllerImpl.botOpenUrl(context: context, peerId: peerId, controller: self, url: url, concealed: concealed, forceUpdate: forceUpdate, present: { c, a in ChatControllerImpl.botOpenUrl(context: context, peerId: peerId, controller: chatController, url: url, concealed: concealed, forceUpdate: forceUpdate, present: { c, a in
presentImpl?(c, a) presentImpl?(c, a)
}, commit: commit) }, commit: commit)
}, requestSwitchInline: { [weak self] query, chatTypes, completion in }, requestSwitchInline: { query, chatTypes, completion in
ChatControllerImpl.botRequestSwitchInline(context: context, controller: self, peerId: peerId, botAddress: botAddress, query: query, chatTypes: chatTypes, completion: completion) ChatControllerImpl.botRequestSwitchInline(context: context, controller: chatController, peerId: peerId, botAddress: botAddress, query: query, chatTypes: chatTypes, completion: completion)
}, completion: { [weak self] in }, completion: {
self?.chatDisplayNode.historyNode.scrollToEndOfHistory() chatController?.chatDisplayNode.historyNode.scrollToEndOfHistory()
}, getNavigationController: { [weak self] in }, getNavigationController: {
return self?.effectiveNavigationController ?? context.sharedContext.mainWindow?.viewController as? NavigationController if let navigationController = parentController?.navigationController as? NavigationController {
return navigationController
} else {
return context.sharedContext.mainWindow?.viewController as? NavigationController
}
}) })
controller.navigationPresentation = .flatModal controller.navigationPresentation = .flatModal
strongSelf.currentWebAppController = controller parentController?.push(controller)
strongSelf.push(controller)
presentImpl = { [weak controller] c, a in presentImpl = { [weak controller] c, a in
controller?.present(c, in: .window(.root), with: a) controller?.present(c, in: .window(.root), with: a)
} }
if justInstalled { if justInstalled {
let content: UndoOverlayContent = .succeed(text: strongSelf.presentationData.strings.WebApp_ShortcutsSettingsAdded(botPeer.compactDisplayTitle).string, timeout: 5.0, customUndoText: nil) let content: UndoOverlayContent = .succeed(text: presentationData.strings.WebApp_ShortcutsSettingsAdded(botPeer.compactDisplayTitle).string, timeout: 5.0, customUndoText: nil)
controller.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: content, elevatedLayout: false, position: .top, action: { _ in return false }), in: .current) controller.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, position: .top, action: { _ in return false }), in: .current)
} }
}, error: { [weak self] error in }, error: { [weak parentController] error in
if let strongSelf = self { parentController?.present(textAlertController(context: context, updatedPresentationData: updatedPresentationData, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {
strongSelf.present(textAlertController(context: strongSelf.context, updatedPresentationData: strongSelf.updatedPresentationData, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {
})]), in: .window(.root)) })]), in: .window(.root))
} })
}))
} }
let _ = combineLatest( let _ = combineLatest(
queue: Queue.mainQueue(), queue: Queue.mainQueue(),
ApplicationSpecificNotice.getBotGameNotice(accountManager: self.context.sharedContext.accountManager, peerId: botPeer.id), ApplicationSpecificNotice.getBotGameNotice(accountManager: context.sharedContext.accountManager, peerId: botPeer.id),
self.context.engine.messages.attachMenuBots(), context.engine.messages.attachMenuBots(),
self.context.engine.messages.getAttachMenuBot(botId: botPeer.id, cached: true) context.engine.messages.getAttachMenuBot(botId: botPeer.id, cached: true)
|> map(Optional.init) |> map(Optional.init)
|> `catch` { _ -> Signal<AttachMenuBot?, NoError> in |> `catch` { _ -> Signal<AttachMenuBot?, NoError> in
return .single(nil) return .single(nil)
}, },
self.context.engine.data.get(TelegramEngine.EngineData.Item.Peer.BotAppSettings(id: botPeer.id)) context.engine.data.get(TelegramEngine.EngineData.Item.Peer.BotAppSettings(id: botPeer.id))
).startStandalone(next: { [weak self] noticed, attachMenuBots, attachMenuBot, appSettings in ).startStandalone(next: { [weak parentController, weak chatController] noticed, attachMenuBots, attachMenuBot, appSettings in
guard let self else {
return
}
var isAttachMenuBotInstalled: Bool? var isAttachMenuBotInstalled: Bool?
if let _ = attachMenuBot { if let _ = attachMenuBot {
if let _ = attachMenuBots.first(where: { $0.peer.id == botPeer.id && !$0.flags.contains(.notActivated) }) { if let _ = attachMenuBots.first(where: { $0.peer.id == botPeer.id && !$0.flags.contains(.notActivated) }) {
@ -580,43 +578,40 @@ public extension ChatControllerImpl {
} }
} }
let context = self.context
if !noticed || botApp.flags.contains(.notActivated) || isAttachMenuBotInstalled == false { if !noticed || botApp.flags.contains(.notActivated) || isAttachMenuBotInstalled == false {
if let isAttachMenuBotInstalled, let attachMenuBot { if let isAttachMenuBotInstalled, let attachMenuBot {
if !isAttachMenuBotInstalled { if !isAttachMenuBotInstalled {
let controller = webAppTermsAlertController(context: context, updatedPresentationData: self.updatedPresentationData, bot: attachMenuBot, completion: { allowWrite in let controller = webAppTermsAlertController(context: context, updatedPresentationData: updatedPresentationData, bot: attachMenuBot, completion: { allowWrite in
let _ = ApplicationSpecificNotice.setBotGameNotice(accountManager: context.sharedContext.accountManager, peerId: botPeer.id).startStandalone() let _ = ApplicationSpecificNotice.setBotGameNotice(accountManager: context.sharedContext.accountManager, peerId: botPeer.id).startStandalone()
let _ = (context.engine.messages.addBotToAttachMenu(botId: botPeer.id, allowWrite: allowWrite) let _ = (context.engine.messages.addBotToAttachMenu(botId: botPeer.id, allowWrite: allowWrite)
|> deliverOnMainQueue).startStandalone(error: { _ in |> deliverOnMainQueue).startStandalone(error: { _ in
}, completed: { }, completed: {
openBotApp(allowWrite, true, appSettings) openBotApp(allowWrite, true, appSettings)
}) })
}) })
self.present(controller, in: .window(.root)) parentController?.present(controller, in: .window(.root))
} else { } else {
openBotApp(false, false, appSettings) openBotApp(false, false, appSettings)
} }
} else { } else {
let controller = webAppLaunchConfirmationController(context: context, updatedPresentationData: self.updatedPresentationData, peer: botPeer, requestWriteAccess: botApp.flags.contains(.notActivated) && botApp.flags.contains(.requiresWriteAccess), completion: { allowWrite in let controller = webAppLaunchConfirmationController(context: context, updatedPresentationData: updatedPresentationData, peer: botPeer, requestWriteAccess: botApp.flags.contains(.notActivated) && botApp.flags.contains(.requiresWriteAccess), completion: { allowWrite in
let _ = ApplicationSpecificNotice.setBotGameNotice(accountManager: context.sharedContext.accountManager, peerId: botPeer.id).startStandalone() let _ = ApplicationSpecificNotice.setBotGameNotice(accountManager: context.sharedContext.accountManager, peerId: botPeer.id).startStandalone()
openBotApp(allowWrite, false, appSettings) openBotApp(allowWrite, false, appSettings)
}, showMore: { [weak self] in }, showMore: chatController == nil ? nil : { [weak chatController] in
if let self { if let chatController {
self.openResolved(result: .peer(botPeer._asPeer(), .info(nil)), sourceMessageId: nil) chatController.openResolved(result: .peer(botPeer._asPeer(), .info(nil)), sourceMessageId: nil)
}
}, openTerms: { [weak self] in
if let self {
self.context.sharedContext.openExternalUrl(context: self.context, urlContext: .generic, url: self.presentationData.strings.WebApp_LaunchTermsConfirmation_URL, forceExternal: false, presentationData: self.presentationData, navigationController: self.effectiveNavigationController, dismissInput: {})
} }
}, openTerms: {
context.sharedContext.openExternalUrl(context: context, urlContext: .generic, url: presentationData.strings.WebApp_LaunchTermsConfirmation_URL, forceExternal: false, presentationData: presentationData, navigationController: parentController?.navigationController as? NavigationController, dismissInput: {})
}) })
self.present(controller, in: .window(.root)) parentController?.present(controller, in: .window(.root))
} }
} else { } else {
openBotApp(false, false, appSettings) openBotApp(false, false, appSettings)
} }
}) })
} else { } else {
self.context.sharedContext.openWebApp(context: self.context, parentController: self, updatedPresentationData: self.updatedPresentationData, botPeer: botPeer, chatPeer: nil, threadId: nil, buttonText: "", url: "", simple: true, source: .generic, skipTermsOfService: false, payload: payload) context.sharedContext.openWebApp(context: context, parentController: parentController, updatedPresentationData: updatedPresentationData, botPeer: botPeer, chatPeer: nil, threadId: nil, buttonText: "", url: "", simple: true, source: .generic, skipTermsOfService: false, payload: payload)
} }
} }
} }

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

@ -545,7 +545,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
let chatLocationContextHolder: Atomic<ChatLocationContextHolder?> let chatLocationContextHolder: Atomic<ChatLocationContextHolder?>
weak var attachmentController: AttachmentController? weak var attachmentController: AttachmentController?
weak var currentWebAppController: ViewController?
weak var currentImportMessageTooltip: UndoOverlayController? weak var currentImportMessageTooltip: UndoOverlayController?

4
submodules/WebUI/Sources/WebAppController.swift
View File

@ -1062,9 +1062,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
case "web_app_open_tg_link": case "web_app_open_tg_link":
if let json = json, let path = json["path_full"] as? String { if let json = json, let path = json["path_full"] as? String {
let forceRequest = json["force_request"] as? Bool ?? false let forceRequest = json["force_request"] as? Bool ?? false
controller.openUrl("https://t.me\(path)", false, forceRequest, { [weak controller] in controller.openUrl("https://t.me\(path)", false, forceRequest, {
let _ = controller
// controller?.dismiss()
}) })
} }
case "web_app_open_invoice": case "web_app_open_invoice":