Simplify paid stars check.

Telegram/SourceFiles/api/api_sending.cpp

@@ -634,6 +634,7 @@ void SendConfirmedFile(
 			.replyTo = file->to.replyTo,
 			.date = NewMessageDate(file->to.options),
 			.shortcutId = file->to.options.shortcutId,
+			.starsPaid = file->to.options.starsApproved,
 			.postAuthor = NewMessagePostAuthor(action),
 			.groupedId = groupId,
 			.effectId = file->to.options.effectId,

Telegram/SourceFiles/apiwrap.cpp

@@ -3532,6 +3532,7 @@ void ApiWrap::sendSharedContact(
 		.replyTo = action.replyTo,
 		.date = NewMessageDate(action.options),
 		.shortcutId = action.options.shortcutId,
+		.starsPaid = action.options.starsApproved,
 		.postAuthor = NewMessagePostAuthor(action),
 		.effectId = action.options.effectId,
 	}, TextWithEntities(), MTP_messageMediaContact(

Telegram/SourceFiles/data/data_chat_participant_status.h

@@ -189,26 +189,17 @@ struct SendError {
 
 	struct Args {
 		QString text;
-		int paidStars = 0;
-		int paidMessages = 0;
 		int boostsToLift = 0;
-		bool resolving = false;
 		bool premiumToLift = false;
 	};
 	SendError(Args &&args)
 	: text(std::move(args.text))
-	, paidStars(args.paidStars)
-	, paidMessages(args.paidMessages)
 	, boostsToLift(args.boostsToLift)
-	, resolving(args.resolving)
 	, premiumToLift(args.premiumToLift) {
 	}
 
 	QString text;
-	int paidStars = 0;
-	int paidMessages = 0;
 	int boostsToLift = 0;
-	bool resolving = false;
 	bool premiumToLift = false;
 
 	[[nodiscard]] SendError value_or(SendError other) const {

Telegram/SourceFiles/history/history_item_helpers.cpp

@@ -60,6 +60,33 @@ bool PeerCallKnown(not_null<PeerData*> peer) {
 
 } // namespace
 
+int ComputeSendingMessagesCount(
+		not_null<History*> history,
+		const SendingErrorRequest &request) {
+	auto result = 0;
+	if (request.text && !request.text->empty()) {
+		auto sending = TextWithEntities();
+		auto left = TextWithEntities{
+			request.text->text,
+			TextUtilities::ConvertTextTagsToEntities(request.text->tags)
+		};
+		auto prepareFlags = Ui::ItemTextOptions(
+			history,
+			history->session().user()).flags;
+		TextUtilities::PrepareForSending(left, prepareFlags);
+
+		while (TextUtilities::CutPart(sending, left, MaxMessageSize)) {
+			++result;
+		}
+		if (!result) {
+			++result;
+		}
+	}
+	return result
+		+ (request.story ? 1 : 0)
+		+ (request.forward ? int(request.forward->size()) : 0);
+}
+
 Data::SendError GetErrorForSending(
 		not_null<PeerData*> peer,
 		SendingErrorRequest request) {
@@ -93,33 +120,10 @@ Data::SendError GetErrorForSending(
 			return tr::lng_forward_cant(tr::now);
 		}
 	}
-	const auto countMessages = [&] {
-		auto result = 0;
-		if (hasText) {
-			auto sending = TextWithEntities();
-			auto left = TextWithEntities{
-				request.text->text,
-				TextUtilities::ConvertTextTagsToEntities(request.text->tags)
-			};
-			auto prepareFlags = Ui::ItemTextOptions(
-				thread->owningHistory(),
-				peer->session().user()).flags;
-			TextUtilities::PrepareForSending(left, prepareFlags);
-
-			while (TextUtilities::CutPart(sending, left, MaxMessageSize)) {
-				++result;
-			}
-			if (!result) {
-				++result;
-			}
-		}
-		return result
-			+ (request.story ? 1 : 0)
-			+ (request.mediaMessage ? 1 : 0)
-			+ (request.forward ? int(request.forward->size()) : 0);
-	};
 	if (peer->slowmodeApplied()) {
-		const auto count = countMessages();
+		const auto count = request.messagesCount
+			? request.messagesCount
+			: ComputeSendingMessagesCount(thread->owningHistory(), request);
 		if (const auto history = peer->owner().historyLoaded(peer)) {
 			if (!request.ignoreSlowmodeCountdown
 				&& (history->latestSendingMessage() != nullptr)
@@ -157,29 +161,6 @@ Data::SendError GetErrorForSending(
 				Ui::FormatDurationWordsSlowmode(left));
 		}
 	}
-
-	if (const auto user = peer->asUser()) {
-		if (user->hasStarsPerMessage()
-			&& !user->messageMoneyRestrictionsKnown()) {
-			user->updateFull();
-			return Data::SendError({ .resolving = true });
-		}
-	} else if (const auto channel = peer->asChannel()) {
-		if (!channel->isFullLoaded()) {
-			channel->updateFull();
-			return Data::SendError({ .resolving = true });
-		}
-	}
-	if (!peer->session().credits().loaded()) {
-		peer->session().credits().load();
-		return Data::SendError({ .resolving = true });
-	} else if (const auto perMessage = peer->starsPerMessageChecked()) {
-		const auto count = countMessages();
-		return Data::SendError({
-			.paidStars = count * perMessage,
-			.paidMessages = count,
-		});
-	}
 	return {};
 }
 
@@ -201,6 +182,34 @@ Data::SendErrorWithThread GetErrorForSending(
 	}
 	return {};
 }
+
+std::optional<SendPaymentDetails> ComputePaymentDetails(
+		not_null<PeerData*> peer,
+		int messagesCount) {
+	if (const auto user = peer->asUser()) {
+		if (user->hasStarsPerMessage()
+			&& !user->messageMoneyRestrictionsKnown()) {
+			user->updateFull();
+			return {};
+		}
+	} else if (const auto channel = peer->asChannel()) {
+		if (!channel->isFullLoaded()) {
+			channel->updateFull();
+			return {};
+		}
+	}
+	if (!peer->session().credits().loaded()) {
+		peer->session().credits().load();
+		return {};
+	} else if (const auto perMessage = peer->starsPerMessageChecked()) {
+		return SendPaymentDetails{
+			.messages = messagesCount,
+			.stars = messagesCount * perMessage,
+		};
+	}
+	return SendPaymentDetails();
+}
+
 object_ptr<Ui::BoxContent> MakeSendErrorBox(
 		const Data::SendErrorWithThread &error,
 		bool withTitle) {

Telegram/SourceFiles/history/history_item_helpers.h

@@ -114,9 +114,12 @@ struct SendingErrorRequest {
 	const HistoryItemsList *forward = nullptr;
 	const Data::Story *story = nullptr;
 	const TextWithTags *text = nullptr;
+	int messagesCount = 0;
 	bool ignoreSlowmodeCountdown = false;
-	bool mediaMessage = false;
 };
+[[nodiscard]] int ComputeSendingMessagesCount(
+	not_null<History*> history,
+	const SendingErrorRequest &request);
 [[nodiscard]] Data::SendError GetErrorForSending(
 	not_null<PeerData*> peer,
 	SendingErrorRequest request);
@@ -124,6 +127,14 @@ struct SendingErrorRequest {
 	not_null<Data::Thread*> thread,
 	SendingErrorRequest request);
 
+struct SendPaymentDetails {
+	int messages = 0;
+	int stars = 0;
+};
+[[nodiscard]] std::optional<SendPaymentDetails> ComputePaymentDetails(
+	not_null<PeerData*> peer,
+	int messagesCount);
+
 [[nodiscard]] Data::SendErrorWithThread GetErrorForSending(
 	const std::vector<not_null<Data::Thread*>> &threads,
 	SendingErrorRequest request);

Telegram/SourceFiles/history/history_widget.cpp

@@ -4351,13 +4351,11 @@ void HistoryWidget::sendVoice(const VoiceToSend &data) {
 		copy.options.starsApproved = approved;
 		sendVoice(copy);
 	};
-	const auto ignoreSlowmodeCountdown = data.options.scheduled != 0;
+	const auto checked = checkSendPayment(
-	if (showSendMessageError(
+		1 + int(_forwardPanel->items().size()),
-			{},
+		data.options.starsApproved,
-			ignoreSlowmodeCountdown,
+		withPaymentApproved);
-			crl::guard(this, withPaymentApproved),
+	if (!checked) {
-			data.options.starsApproved,
-			true)) {
 		return;
 	}
 
@@ -5904,28 +5902,38 @@ bool HistoryWidget::showSendMessageError(
 		return false;
 	}
 	const auto topicRootId = resolveReplyToTopicRootId();
-	const auto error = GetErrorForSending(
+	auto request = SendingErrorRequest{
-		_peer,
+		.topicRootId = topicRootId,
-		{
+		.forward = &_forwardPanel->items(),
-			.topicRootId = topicRootId,
+		.text = &textWithTags,
-			.forward = &_forwardPanel->items(),
+		.ignoreSlowmodeCountdown = ignoreSlowmodeCountdown,
-			.text = &textWithTags,
+	};
-			.ignoreSlowmodeCountdown = ignoreSlowmodeCountdown,
+	request.messagesCount = ComputeSendingMessagesCount(_history, request)
-			.mediaMessage = mediaMessage,
+		+ (mediaMessage ? 1 : 0);
-		});
+	const auto error = GetErrorForSending(_peer, request);
-	if (resend && error.resolving) {
+	if (error) {
+		Data::ShowSendErrorToast(controller(), _peer, error);
+		return true;
+	}
+	return resend
+		&& !checkSendPayment(request.messagesCount, starsApproved, resend);
+}
+
+bool HistoryWidget::checkSendPayment(
+		int messagesCount,
+		int starsApproved,
+		Fn<void(int starsApproved)> resend) {
+	const auto details = ComputePaymentDetails(_peer, messagesCount);
+	if (!details) {
 		_resendOnFullUpdated = [=] { resend(starsApproved); };
 		return true;
-	} else if (resend && error.paidStars > starsApproved) {
+	} else if (const auto stars = details->stars) {
 		Data::ShowSendPaidConfirm(controller(), _peer, error, [=] {
-			resend(error.paidStars);
+			resend(stars);
 		});
 		return true;
-	} else if (!error) {
-		return false;
 	}
-	Data::ShowSendErrorToast(controller(), _peer, error);
+	return false;
-	return true;
 }
 
 bool HistoryWidget::confirmSendingFiles(const QStringList &files) {

Telegram/SourceFiles/history/history_widget.h

@@ -474,6 +474,10 @@ private:
 		Fn<void(int starsApproved)> resend = nullptr,
 		int starsApproved = 0,
 		bool mediaMessage = false);
+	bool checkSendPayment(
+		int messagesCount,
+		int starsApproved,
+		Fn<void(int starsApproved)> resend);
 
 	void sendingFilesConfirmed(
 		Ui::PreparedList &&list,