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 fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-03-01 19:38:31 +04:00
parent 3f8152d0b1
commit e351bbfd42
13 changed files with 207 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraController.h
View File

@ -45,6 +45,8 @@ typedef enum {
@property (nonatomic, strong) id<TGPhotoPaintStickersContext> stickersContext; @property (nonatomic, strong) id<TGPhotoPaintStickersContext> stickersContext;
@property (nonatomic, assign) bool shortcut; @property (nonatomic, assign) bool shortcut;
@property (nonatomic, assign) int64_t sendPaidMessageStars;
@property (nonatomic, strong) NSAttributedString *forcedCaption; @property (nonatomic, strong) NSAttributedString *forcedCaption;
@property (nonatomic, strong) NSString *recipientName; @property (nonatomic, strong) NSString *recipientName;

1
submodules/LegacyComponents/Sources/TGCameraController.m
View File

@ -1446,6 +1446,7 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
if (editingContext == nil) if (editingContext == nil)
{ {
editingContext = [[TGMediaEditingContext alloc] init]; editingContext = [[TGMediaEditingContext alloc] init];
editingContext.sendPaidMessageStars = self.sendPaidMessageStars;
if (self.forcedCaption != nil) if (self.forcedCaption != nil)
[editingContext setForcedCaption:self.forcedCaption]; [editingContext setForcedCaption:self.forcedCaption];
_editingContext = editingContext; _editingContext = editingContext;

72
submodules/LegacyComponents/Sources/TGPhotoToolbarView.m
View File

@ -673,57 +673,71 @@
CGFloat offset = 8.0f; CGFloat offset = 8.0f;
if (self.frame.size.width > self.frame.size.height) if (self.frame.size.width > self.frame.size.height)
{ {
if (buttons.count == 1) _cancelButton.frame = CGRectMake(0, 0, 49, 49);
{
UIView *button = buttons.firstObject; CGFloat leftEdge = _cancelButton.frame.size.width;
button.frame = CGRectMake(CGFloor(self.frame.size.width / 2 - button.frame.size.width / 2), offset, button.frame.size.width, button.frame.size.height); CGFloat rightEdge = 0.0f;
if (_starsDoneButton != nil) {
CGSize buttonSize = [_starsDoneButton updateCount:_sendPaidMessageStars];
rightEdge = buttonSize.width + 2.0f;
[_starsDoneButton updateFrame:CGRectMake(self.frame.size.width - rightEdge, 2.0f, buttonSize.width, buttonSize.height)];
} else {
rightEdge = _cancelButton.frame.size.width;
} }
else if (buttons.count == 2)
{ CGFloat availableWidth = self.frame.size.width - leftEdge - rightEdge;
CGFloat startX = leftEdge;
CGFloat sideOffset = 5.0f;
if (buttons.count == 1) {
UIView *button = buttons.firstObject;
CGFloat buttonX = startX + (availableWidth - button.frame.size.width) / 2;
button.frame = CGRectMake(buttonX, offset, button.frame.size.width, button.frame.size.height);
}
else if (buttons.count == 2) {
UIView *leftButton = buttons.firstObject; UIView *leftButton = buttons.firstObject;
UIView *rightButton = buttons.lastObject; UIView *rightButton = buttons.lastObject;
leftButton.frame = CGRectMake(CGFloor(self.frame.size.width / 5 * 2 - 5 - leftButton.frame.size.width / 2), offset, leftButton.frame.size.width, leftButton.frame.size.height); CGFloat leftButtonX = startX + availableWidth / 3 - leftButton.frame.size.width / 2 - sideOffset;
rightButton.frame = CGRectMake(CGCeil(self.frame.size.width - leftButton.frame.origin.x - rightButton.frame.size.width), offset, rightButton.frame.size.width, rightButton.frame.size.height); CGFloat rightButtonX = startX + 2 * availableWidth / 3 - rightButton.frame.size.width / 2 + sideOffset;
leftButton.frame = CGRectMake(leftButtonX, offset, leftButton.frame.size.width, leftButton.frame.size.height);
rightButton.frame = CGRectMake(rightButtonX, offset, rightButton.frame.size.width, rightButton.frame.size.height);
} }
else if (buttons.count == 3) else if (buttons.count == 3) {
{
UIView *leftButton = buttons.firstObject; UIView *leftButton = buttons.firstObject;
UIView *centerButton = [buttons objectAtIndex:1]; UIView *centerButton = [buttons objectAtIndex:1];
UIView *rightButton = buttons.lastObject; UIView *rightButton = buttons.lastObject;
centerButton.frame = CGRectMake(CGFloor(self.frame.size.width / 2 - centerButton.frame.size.width / 2), offset, centerButton.frame.size.width, centerButton.frame.size.height); CGFloat leftButtonX = startX + availableWidth / 4 - leftButton.frame.size.width / 2 - sideOffset;
CGFloat centerButtonX = startX + availableWidth / 2 - centerButton.frame.size.width / 2;
leftButton.frame = CGRectMake(CGFloor(self.frame.size.width / 6 * 2 - 10 - leftButton.frame.size.width / 2), offset, leftButton.frame.size.width, leftButton.frame.size.height); CGFloat rightButtonX = startX + 3 * availableWidth / 4 - rightButton.frame.size.width / 2 + sideOffset;
rightButton.frame = CGRectMake(CGCeil(self.frame.size.width - leftButton.frame.origin.x - rightButton.frame.size.width), offset, rightButton.frame.size.width, rightButton.frame.size.height); leftButton.frame = CGRectMake(leftButtonX, offset, leftButton.frame.size.width, leftButton.frame.size.height);
centerButton.frame = CGRectMake(centerButtonX, offset, centerButton.frame.size.width, centerButton.frame.size.height);
rightButton.frame = CGRectMake(rightButtonX, offset, rightButton.frame.size.width, rightButton.frame.size.height);
} }
else if (buttons.count == 4) else if (buttons.count == 4) {
{
UIView *leftButton = buttons.firstObject; UIView *leftButton = buttons.firstObject;
UIView *centerLeftButton = [buttons objectAtIndex:1]; UIView *centerLeftButton = [buttons objectAtIndex:1];
UIView *centerRightButton = [buttons objectAtIndex:2]; UIView *centerRightButton = [buttons objectAtIndex:2];
UIView *rightButton = buttons.lastObject; UIView *rightButton = buttons.lastObject;
leftButton.frame = CGRectMake(CGFloor(self.frame.size.width / 8 * 2 - 3 - leftButton.frame.size.width / 2), offset, leftButton.frame.size.width, leftButton.frame.size.height); CGFloat leftButtonX = startX + availableWidth / 5 - leftButton.frame.size.width / 2 - sideOffset;
CGFloat centerLeftButtonX = startX + 2 * availableWidth / 5 - centerLeftButton.frame.size.width / 2 - TGScreenPixelFloor(sideOffset / 2.0);
CGFloat centerRightButtonX = startX + 3 * availableWidth / 5 - centerRightButton.frame.size.width / 2 + TGScreenPixelFloor(sideOffset / 2.0);
CGFloat rightButtonX = startX + 4 * availableWidth / 5 - rightButton.frame.size.width / 2 + sideOffset;
centerLeftButton.frame = CGRectMake(CGFloor(self.frame.size.width / 10 * 4 + 5 - centerLeftButton.frame.size.width / 2), offset, centerLeftButton.frame.size.width, centerLeftButton.frame.size.height); leftButton.frame = CGRectMake(leftButtonX, offset, leftButton.frame.size.width, leftButton.frame.size.height);
centerLeftButton.frame = CGRectMake(centerLeftButtonX, offset, centerLeftButton.frame.size.width, centerLeftButton.frame.size.height);
centerRightButton.frame = CGRectMake(CGCeil(self.frame.size.width - centerLeftButton.frame.origin.x - centerRightButton.frame.size.width), offset, centerRightButton.frame.size.width, centerRightButton.frame.size.height); centerRightButton.frame = CGRectMake(centerRightButtonX, offset, centerRightButton.frame.size.width, centerRightButton.frame.size.height);
rightButton.frame = CGRectMake(rightButtonX, offset, rightButton.frame.size.width, rightButton.frame.size.height);
rightButton.frame = CGRectMake(CGCeil(self.frame.size.width - leftButton.frame.origin.x - rightButton.frame.size.width), offset, rightButton.frame.size.width, rightButton.frame.size.height);
} }
_cancelButton.frame = CGRectMake(0, 0, 49, 49);
CGFloat offset = 49.0f; CGFloat offset = 49.0f;
if (_doneButton.frame.size.width > 49.0f) if (_doneButton.frame.size.width > 49.0f)
offset = 60.0f; offset = 60.0f;
if (_starsDoneButton != nil) {
CGSize buttonSize = [_starsDoneButton updateCount:_sendPaidMessageStars];
[_starsDoneButton updateFrame:CGRectMake(self.frame.size.width - buttonSize.width - 2.0, 49.0f - offset + 2.0f, buttonSize.width, buttonSize.height)];
}
_doneButton.frame = CGRectMake(self.frame.size.width - offset, 49.0f - offset, _doneButton.frame.size.width, _doneButton.frame.size.height); _doneButton.frame = CGRectMake(self.frame.size.width - offset, 49.0f - offset, _doneButton.frame.size.width, _doneButton.frame.size.height);
_infoLabel.frame = CGRectMake(49.0f + 10.0f, 0.0f, self.frame.size.width - (49.0f + 10.0f) * 2.0f, 49.0f); _infoLabel.frame = CGRectMake(49.0f + 10.0f, 0.0f, self.frame.size.width - (49.0f + 10.0f) * 2.0f, 49.0f);

4
submodules/ShareController/Sources/ShareController.swift
View File

@ -674,8 +674,8 @@ public final class ShareController: ViewController {
if case let .messages(messages) = self.subject { if case let .messages(messages) = self.subject {
messageCount = messages.count messageCount = messages.count
} else if case let .image(images) = self.subject { } else if case .image = self.subject {
messageCount = images.count messageCount = 1
} else if case let .fromExternal(count, _) = self.subject { } else if case let .fromExternal(count, _) = self.subject {
messageCount = count messageCount = count
} }

38
submodules/TelegramUI/Components/ChatEntityKeyboardInputNode/Sources/ChatEntityKeyboardInputNode.swift
View File

@ -2153,7 +2153,7 @@ public final class ChatEntityKeyboardInputNode: ChatInputNode {
}))) })))
} }
if isSaved { if isSaved && interfaceState.sendPaidMessageStars == nil {
items.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in items.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor) return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor)
}, action: { [weak self] _, f in }, action: { [weak self] _, f in
@ -2764,6 +2764,13 @@ public final class EmojiContentPeekBehaviorImpl: EmojiContentPeekBehavior {
})) }))
} }
} else { } else {
let sendPaidMessageStars: Signal<StarsAmount?, NoError>
if let chatPeerId = strongSelf.chatPeerId {
sendPaidMessageStars = context.engine.data.get(TelegramEngine.EngineData.Item.Peer.SendPaidMessageStars(id: chatPeerId))
} else {
sendPaidMessageStars = .single(nil)
}
return combineLatest( return combineLatest(
context.engine.stickers.isStickerSaved(id: file.fileId), context.engine.stickers.isStickerSaved(id: file.fileId),
context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: accountPeerId)) |> map { peer -> Bool in context.engine.data.get(TelegramEngine.EngineData.Item.Peer.Peer(id: accountPeerId)) |> map { peer -> Bool in
@ -2772,10 +2779,11 @@ public final class EmojiContentPeekBehaviorImpl: EmojiContentPeekBehavior {
hasPremium = true hasPremium = true
} }
return hasPremium return hasPremium
} },
sendPaidMessageStars
) )
|> deliverOnMainQueue |> deliverOnMainQueue
|> map { [weak itemLayer] isStarred, hasPremium -> (UIView, CGRect, PeekControllerContent)? in |> map { [weak itemLayer] isStarred, hasPremium, sendPaidMessageStars -> (UIView, CGRect, PeekControllerContent)? in
guard let strongSelf = self, let itemLayer = itemLayer else { guard let strongSelf = self, let itemLayer = itemLayer else {
return nil return nil
} }
@ -2805,18 +2813,20 @@ public final class EmojiContentPeekBehaviorImpl: EmojiContentPeekBehavior {
}))) })))
} }
menuItems.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in if sendPaidMessageStars == nil {
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor) menuItems.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in
}, action: { _, f in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor)
if let strongSelf = self, let peekController = strongSelf.peekController { }, action: { _, f in
if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode { if let strongSelf = self, let peekController = strongSelf.peekController {
let _ = sendSticker(.standalone(media: file), false, true, nil, false, animationNode.view, animationNode.bounds, nil) if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
} else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode { let _ = sendSticker(.standalone(media: file), false, true, nil, false, animationNode.view, animationNode.bounds, nil)
let _ = sendSticker(.standalone(media: file), false, true, nil, false, imageNode.view, imageNode.bounds, nil) } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
let _ = sendSticker(.standalone(media: file), false, true, nil, false, imageNode.view, imageNode.bounds, nil)
}
} }
} f(.default)
f(.default) })))
}))) }
} }
menuItems.append( menuItems.append(

3
submodules/TelegramUI/Components/LegacyCamera/Sources/LegacyCamera.swift
View File

@ -10,7 +10,7 @@ import ShareController
import LegacyUI import LegacyUI
import LegacyMediaPickerUI import LegacyMediaPickerUI
public func presentedLegacyCamera(context: AccountContext, peer: Peer?, chatLocation: ChatLocation, cameraView: TGAttachmentCameraView?, menuController: TGMenuSheetController?, parentController: ViewController, attachmentController: ViewController? = nil, editingMedia: Bool, saveCapturedPhotos: Bool, mediaGrouping: Bool, initialCaption: NSAttributedString, hasSchedule: Bool, enablePhoto: Bool, enableVideo: Bool, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32, ChatSendMessageActionSheetController.SendParameters?) -> Void, recognizedQRCode: @escaping (String) -> Void = { _ in }, presentSchedulePicker: @escaping (Bool, @escaping (Int32) -> Void) -> Void, presentTimerPicker: @escaping (@escaping (Int32) -> Void) -> Void, getCaptionPanelView: @escaping () -> TGCaptionPanelView?, dismissedWithResult: @escaping () -> Void = {}, finishedTransitionIn: @escaping () -> Void = {}) { public func presentedLegacyCamera(context: AccountContext, peer: Peer?, chatLocation: ChatLocation, cameraView: TGAttachmentCameraView?, menuController: TGMenuSheetController?, parentController: ViewController, attachmentController: ViewController? = nil, editingMedia: Bool, saveCapturedPhotos: Bool, mediaGrouping: Bool, initialCaption: NSAttributedString, hasSchedule: Bool, enablePhoto: Bool, enableVideo: Bool, sendPaidMessageStars: Int64 = 0, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32, ChatSendMessageActionSheetController.SendParameters?) -> Void, recognizedQRCode: @escaping (String) -> Void = { _ in }, presentSchedulePicker: @escaping (Bool, @escaping (Int32) -> Void) -> Void, presentTimerPicker: @escaping (@escaping (Int32) -> Void) -> Void, getCaptionPanelView: @escaping () -> TGCaptionPanelView?, dismissedWithResult: @escaping () -> Void = {}, finishedTransitionIn: @escaping () -> Void = {}) {
let presentationData = context.sharedContext.currentPresentationData.with { $0 } let presentationData = context.sharedContext.currentPresentationData.with { $0 }
let legacyController = LegacyController(presentation: .custom, theme: presentationData.theme) let legacyController = LegacyController(presentation: .custom, theme: presentationData.theme)
legacyController.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .portrait, compactSize: .portrait) legacyController.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .portrait, compactSize: .portrait)
@ -35,6 +35,7 @@ public func presentedLegacyCamera(context: AccountContext, peer: Peer?, chatLoca
} else { } else {
controller = TGCameraController(context: legacyController.context, saveEditedPhotos: saveCapturedPhotos && !isSecretChat, saveCapturedMedia: saveCapturedPhotos && !isSecretChat) controller = TGCameraController(context: legacyController.context, saveEditedPhotos: saveCapturedPhotos && !isSecretChat, saveCapturedMedia: saveCapturedPhotos && !isSecretChat)
} }
controller.sendPaidMessageStars = sendPaidMessageStars
controller.modalPresentationStyle = .fullScreen controller.modalPresentationStyle = .fullScreen
controller.inhibitMultipleCapture = editingMedia controller.inhibitMultipleCapture = editingMedia

20
submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerViewSendMessage.swift
View File

@ -429,15 +429,17 @@ final class StoryItemSetContainerSendMessage {
}))) })))
} }
items.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.contextMenu.primaryColor) if component.slice.additionalPeerData.sendPaidMessageStars == nil {
}, action: { [weak self, weak view] _, a in items.append(.action(ContextMenuActionItem(text: presentationData.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.contextMenu.primaryColor)
a(.default) }, action: { [weak self, weak view] _, a in
a(.default)
guard let self, let view else {
return guard let self, let view else {
} return
self.presentScheduleTimePicker(view: view) }
}))) self.presentScheduleTimePicker(view: view)
})))
}
let contextItems = ContextController.Items(content: .list(items)) let contextItems = ContextController.Items(content: .list(items))

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

@ -28,9 +28,13 @@ extension ChatControllerImpl {
guard let self, let starsContext = self.context.starsContext else { guard let self, let starsContext = self.context.starsContext else {
return return
} }
if let dismissedAmount, dismissedAmount == sendPaidMessageStars.value, let currentState = starsContext.currentState, currentState.balance.value > totalAmount, count < 3 && totalAmount < 100 { if let dismissedAmount, dismissedAmount == sendPaidMessageStars.value, let currentState = starsContext.currentState, currentState.balance.value > totalAmount {
completion(true) if count < 3 && totalAmount < 100 {
self.displayPaidMessageUndo(count: count, amount: sendPaidMessageStars) completion(false)
} else {
completion(true)
self.displayPaidMessageUndo(count: count, amount: sendPaidMessageStars)
}
} else { } else {
var presentationData = self.presentationData var presentationData = self.presentationData
if forceDark { if forceDark {

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

@ -9288,12 +9288,14 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
var attributes = attributes var attributes = attributes
if let sendPaidMessageStars = self.presentationInterfaceState.sendPaidMessageStars { if let sendPaidMessageStars = self.presentationInterfaceState.sendPaidMessageStars {
var effectivePostpone = postpone
for i in (0 ..< attributes.count).reversed() { for i in (0 ..< attributes.count).reversed() {
if attributes[i] is PaidStarsMessageAttribute { if let paidStarsMessageAttribute = attributes[i] as? PaidStarsMessageAttribute {
effectivePostpone = effectivePostpone || paidStarsMessageAttribute.postponeSending
attributes.remove(at: i) attributes.remove(at: i)
} }
} }
attributes.append(PaidStarsMessageAttribute(stars: sendPaidMessageStars, postponeSending: postpone)) attributes.append(PaidStarsMessageAttribute(stars: sendPaidMessageStars, postponeSending: effectivePostpone))
} }
if silentPosting || scheduleTime != nil { if silentPosting || scheduleTime != nil {

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

@ -111,9 +111,11 @@ extension ChatControllerImpl {
count += 1 count += 1
} }
var totalAmount: StarsAmount = .zero var totalAmount: StarsAmount = .zero
var chargingPeers: [EnginePeer] = []
for peer in peers { for peer in peers {
if let maybeAmount = sendPaidMessageStars[peer.id], let amount = maybeAmount { if let maybeAmount = sendPaidMessageStars[peer.id], let amount = maybeAmount {
totalAmount = totalAmount + amount totalAmount = totalAmount + amount
chargingPeers.append(peer)
} }
} }
@ -320,7 +322,7 @@ extension ChatControllerImpl {
context: nil, context: nil,
presentationData: strongSelf.presentationData, presentationData: strongSelf.presentationData,
updatedPresentationData: nil, updatedPresentationData: nil,
peers: peers, peers: chargingPeers,
count: count, count: count,
amount: totalAmount, amount: totalAmount,
totalAmount: totalAmount, totalAmount: totalAmount,

2
submodules/TelegramUI/Sources/ChatControllerOpenAttachmentMenu.swift
View File

@ -1834,7 +1834,7 @@ extension ChatControllerImpl {
} }
let inputText = strongSelf.presentationInterfaceState.interfaceState.effectiveInputState.inputText let inputText = strongSelf.presentationInterfaceState.interfaceState.effectiveInputState.inputText
presentedLegacyCamera(context: strongSelf.context, peer: strongSelf.presentationInterfaceState.renderedPeer?.peer, chatLocation: strongSelf.chatLocation, cameraView: cameraView, menuController: nil, parentController: strongSelf, attachmentController: self?.attachmentController, editingMedia: false, saveCapturedPhotos: storeCapturedMedia, mediaGrouping: true, initialCaption: inputText, hasSchedule: hasSchedule, enablePhoto: enablePhoto, enableVideo: enableVideo, sendMessagesWithSignals: { [weak self] signals, silentPosting, scheduleTime, parameters in presentedLegacyCamera(context: strongSelf.context, peer: strongSelf.presentationInterfaceState.renderedPeer?.peer, chatLocation: strongSelf.chatLocation, cameraView: cameraView, menuController: nil, parentController: strongSelf, attachmentController: self?.attachmentController, editingMedia: false, saveCapturedPhotos: storeCapturedMedia, mediaGrouping: true, initialCaption: inputText, hasSchedule: hasSchedule, enablePhoto: enablePhoto, enableVideo: enableVideo, sendPaidMessageStars: strongSelf.presentationInterfaceState.sendPaidMessageStars?.value ?? 0, sendMessagesWithSignals: { [weak self] signals, silentPosting, scheduleTime, parameters in
if let strongSelf = self { if let strongSelf = self {
strongSelf.enqueueMediaMessages(signals: signals, silentPosting: silentPosting, scheduleTime: scheduleTime > 0 ? scheduleTime : nil, parameters: parameters) strongSelf.enqueueMediaMessages(signals: signals, silentPosting: silentPosting, scheduleTime: scheduleTime > 0 ? scheduleTime : nil, parameters: parameters)
if !inputText.string.isEmpty { if !inputText.string.isEmpty {

26
submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift
View File

@ -40,6 +40,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, ASScrollVie
private var itemNodes: [MediaId: HorizontalStickerGridItemNode] = [:] private var itemNodes: [MediaId: HorizontalStickerGridItemNode] = [:]
private var validLayout: CGSize? private var validLayout: CGSize?
fileprivate weak var currentInterfaceState: ChatPresentationInterfaceState?
private var ignoreScrolling: Bool = false private var ignoreScrolling: Bool = false
private var animateInOnLayout: Bool = false private var animateInOnLayout: Bool = false
@ -123,18 +124,20 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, ASScrollVie
}))) })))
} }
menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in if strongSelf.currentInterfaceState?.sendPaidMessageStars == nil {
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor) menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in
}, action: { _, f in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor)
if let strongSelf = self, let peekController = strongSelf.peekController { }, action: { _, f in
if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode { if let strongSelf = self, let peekController = strongSelf.peekController {
let _ = controllerInteraction.sendSticker(.standalone(media: item.file._parse()), false, true, nil, true, animationNode.view, animationNode.bounds, nil, []) if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
} else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode { let _ = controllerInteraction.sendSticker(.standalone(media: item.file._parse()), false, true, nil, true, animationNode.view, animationNode.bounds, nil, [])
let _ = controllerInteraction.sendSticker(.standalone(media: item.file._parse()), false, true, nil, true, imageNode.view, imageNode.bounds, nil, []) } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
let _ = controllerInteraction.sendSticker(.standalone(media: item.file._parse()), false, true, nil, true, imageNode.view, imageNode.bounds, nil, [])
}
} }
} f(.default)
f(.default) })))
}))) }
menuItems.append( menuItems.append(
.action(ContextMenuActionItem(text: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unfave") : UIImage(bundleImageName: "Chat/Context Menu/Fave"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in .action(ContextMenuActionItem(text: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unfave") : UIImage(bundleImageName: "Chat/Context Menu/Fave"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
@ -604,6 +607,7 @@ final class InlineReactionSearchPanel: ChatInputContextPanelNode {
override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) { override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) {
self.validLayout = (size, leftInset) self.validLayout = (size, leftInset)
self.stickersNode.currentInterfaceState = interfaceState
transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(), size: size)) transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(), size: size))

129
submodules/WebUI/Sources/WebAppMessagePreviewScreen.swift
View File

@ -22,6 +22,7 @@ import ListSectionComponent
import ListItemComponentAdaptor import ListItemComponentAdaptor
import TelegramStringFormatting import TelegramStringFormatting
import UndoUI import UndoUI
import ChatMessagePaymentAlertController
private final class SheetContent: CombinedComponent { private final class SheetContent: CombinedComponent {
typealias EnvironmentType = ViewControllerComponentContainer.Environment typealias EnvironmentType = ViewControllerComponentContainer.Environment
@ -410,45 +411,100 @@ public final class WebAppMessagePreviewScreen: ViewControllerComponentContainer
fatalError("init(coder:) has not been implemented") fatalError("init(coder:) has not been implemented")
} }
fileprivate func complete(peers: [EnginePeer]) { private func presentPaidMessageAlertIfNeeded(peers: [EnginePeer], requiresStars: [EnginePeer.Id: Int64], completion: @escaping () -> Void) {
for peer in peers {
let _ = self.context.engine.messages.enqueueOutgoingMessage(
to: peer.id,
replyTo: nil,
storyId: nil,
content: .preparedInlineMessage(self.preparedMessage)
).start()
}
let text: String }
let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
if peers.count == 1, let peer = peers.first { fileprivate func complete(peers: [EnginePeer], controller: ViewController?) {
let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) let _ = (self.context.engine.data.get(
text = presentationData.strings.Conversation_ForwardTooltip_Chat_One(peerName).string EngineDataMap(
} else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last { peers.map { TelegramEngine.EngineData.Item.Peer.SendPaidMessageStars.init(id: $0.id) }
let firstPeerName = firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) )
let secondPeerName = secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) )
text = presentationData.strings.Conversation_ForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).string |> deliverOnMainQueue).start(next: { [weak self] sendPaidMessageStars in
} else if let peer = peers.first { guard let self else {
let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) return
text = presentationData.strings.Conversation_ForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").string }
} else { var totalAmount: StarsAmount = .zero
text = "" var chargingPeers: [EnginePeer] = []
} for peer in peers {
if let maybeAmount = sendPaidMessageStars[peer.id], let amount = maybeAmount {
if let navigationController = self.navigationController as? NavigationController { totalAmount = totalAmount + amount
Queue.mainQueue().after(1.0) { chargingPeers.append(peer)
guard let lastController = navigationController.viewControllers.last as? ViewController else { }
}
let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
let proceed = { [weak self] in
guard let self else {
return return
} }
lastController.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: false, text: text), elevatedLayout: false, position: .top, animateInAsReplacement: true, action: { action in
return false for peer in peers {
}), in: .window(.root)) var starsAmount: StarsAmount?
if let maybeAmount = sendPaidMessageStars[peer.id], let amount = maybeAmount {
starsAmount = amount
}
let _ = self.context.engine.messages.enqueueOutgoingMessage(
to: peer.id,
replyTo: nil,
storyId: nil,
content: .preparedInlineMessage(self.preparedMessage),
sendPaidMessageStars: starsAmount
).start()
}
let text: String
if peers.count == 1, let peer = peers.first {
let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
text = presentationData.strings.Conversation_ForwardTooltip_Chat_One(peerName).string
} else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
let firstPeerName = firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
let secondPeerName = secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
text = presentationData.strings.Conversation_ForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).string
} else if let peer = peers.first {
let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
text = presentationData.strings.Conversation_ForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").string
} else {
text = ""
}
if let navigationController = self.navigationController as? NavigationController {
Queue.mainQueue().after(1.0) {
guard let lastController = navigationController.viewControllers.last as? ViewController else {
return
}
lastController.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: false, text: text), elevatedLayout: false, position: .top, animateInAsReplacement: true, action: { action in
return false
}), in: .window(.root))
}
}
self.completeWithResult(true)
self.dismiss()
controller?.dismiss()
} }
}
if totalAmount.value > 0 {
self.completeWithResult(true) let controller = chatMessagePaymentAlertController(
self.dismiss() context: nil,
presentationData: presentationData,
updatedPresentationData: nil,
peers: chargingPeers,
count: 1,
amount: totalAmount,
totalAmount: totalAmount,
hasCheck: false,
navigationController: self.navigationController as? NavigationController,
completion: { _ in
proceed()
}
)
self.present(controller, in: .window(.root))
} else {
proceed()
}
})
} }
private var completed = false private var completed = false
@ -468,8 +524,7 @@ public final class WebAppMessagePreviewScreen: ViewControllerComponentContainer
guard let self else { guard let self else {
return return
} }
self.complete(peers: peers) self.complete(peers: peers, controller: controller)
controller?.dismiss()
} }
self.push(controller) self.push(controller)