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

Web app improvements

Browse Source
This commit is contained in:
Ilya Laktyushin 2023-09-01 13:36:36 +04:00
parent 40cdc47aab
commit c0868f1581
1 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1121,7 +1121,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
} }
fileprivate func shareAccountContact() { fileprivate func shareAccountContact() {
guard let controller = self.controller else { guard let controller = self.controller, let botId = self.controller?.botId else {
return return
} }
@ -1135,21 +1135,60 @@ public final class WebAppController: ViewController, AttachmentContainable {
self.webView?.sendEvent(name: "phone_requested", data: paramsString) self.webView?.sendEvent(name: "phone_requested", data: paramsString)
} }
let context = self.context
let _ = (self.context.engine.data.get(
TelegramEngine.EngineData.Item.Peer.Peer(id: self.context.account.peerId),
TelegramEngine.EngineData.Item.Peer.IsBlocked(id: botId)
)
|> deliverOnMainQueue).start(next: { [weak self, weak controller] accountPeer, isBlocked in
guard let self, let controller, let accountPeer else {
return
}
var requiresUnblock = false
if case let .known(value) = isBlocked, value {
requiresUnblock = true
}
let alertController = textAlertController(context: self.context, updatedPresentationData: controller.updatedPresentationData, title: self.presentationData.strings.Conversation_ShareBotContactConfirmationTitle, text: self.presentationData.strings.Conversation_ShareBotContactConfirmation, actions: [TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_Cancel, action: { let alertController = textAlertController(context: self.context, updatedPresentationData: controller.updatedPresentationData, title: self.presentationData.strings.Conversation_ShareBotContactConfirmationTitle, text: self.presentationData.strings.Conversation_ShareBotContactConfirmation, actions: [TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_Cancel, action: {
sendEvent(false) sendEvent(false)
}), TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: { [weak self] in }), TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: { [weak self] in
guard let self else { guard let self, case let .user(user) = accountPeer, let phone = user.phone, !phone.isEmpty else {
return return
} }
let _ = (self.context.account.postbox.loadedPeerWithId(self.context.account.peerId)
|> deliverOnMainQueue).start(next: { [weak self] peer in let sendMessageSignal = enqueueMessages(account: self.context.account, peerId: botId, messages: [
if let self, let botId = self.controller?.botId, let peer = peer as? TelegramUser, let phone = peer.phone, !phone.isEmpty { .message(text: "", attributes: [], inlineStickers: [:], mediaReference: .standalone(media: TelegramMediaContact(firstName: user.firstName ?? "", lastName: user.lastName ?? "", phoneNumber: phone, peerId: user.id, vCardData: nil)), replyToMessageId: nil, replyToStoryId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: [])
let _ = enqueueMessages(account: self.context.account, peerId: botId, messages: [ ])
.message(text: "", attributes: [], inlineStickers: [:], mediaReference: .standalone(media: TelegramMediaContact(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phoneNumber: phone, peerId: peer.id, vCardData: nil)), replyToMessageId: nil, replyToStoryId: nil, localGroupingKey: nil, correlationId: nil, bubbleUpEmojiOrStickersets: []) |> mapToSignal { messageIds in
]).start() if let maybeMessageId = messageIds.first, let messageId = maybeMessageId {
sendEvent(true) return context.account.pendingMessageManager.pendingMessageStatus(messageId)
|> mapToSignal { status, _ -> Signal<Bool, NoError> in
if status != nil {
return .never()
} else {
return .single(true)
} }
}
|> take(1)
} else {
return .complete()
}
}
let sendMessage = {
let _ = sendMessageSignal.start(completed: {
sendEvent(true)
}) })
}
if requiresUnblock {
let _ = (context.engine.privacy.requestUpdatePeerIsBlocked(peerId: botId, isBlocked: false)
|> deliverOnMainQueue).start(completed: {
sendMessage()
})
} else {
sendMessage()
}
})]) })])
alertController.dismissed = { byOutsideTap in alertController.dismissed = { byOutsideTap in
if byOutsideTap { if byOutsideTap {
@ -1157,6 +1196,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
} }
} }
controller.present(alertController, in: .window(.root)) controller.present(alertController, in: .window(.root))
})
} }
fileprivate func invokeCustomMethod(requestId: String, method: String, params: String) { fileprivate func invokeCustomMethod(requestId: String, method: String, params: String) {