Bundle silent and scheduled to Api::SendOptions.

Telegram/SourceFiles/api/api_common.h

@@ -0,0 +1,39 @@
+/*
+This file is part of Telegram Desktop,
+the official desktop application for the Telegram messaging service.
+
+For license and copyright information please follow this link:
+https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
+*/
+#pragma once
+
+namespace Api {
+
+struct SendOptions {
+	TimeId scheduled = 0;
+	bool silent = false;
+	bool handleSupportSwitch = false;
+	bool removeWebPageId = false;
+};
+
+struct SendAction {
+	explicit SendAction(not_null<History*> history) : history(history) {
+	}
+
+	not_null<History*> history;
+	SendOptions options;
+	MsgId replyTo = 0;
+	bool clearDraft = false;
+	bool generateLocal = true;
+};
+
+struct MessageToSend {
+	explicit MessageToSend(not_null<History*> history) : action(history) {
+	}
+
+	SendAction action;
+	TextWithTags textWithTags;
+	WebPageId webPageId = 0;
+};
+
+} // namespace Api

Telegram/SourceFiles/api/api_sending.cpp

@@ -16,6 +16,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 #include "data/data_file_origin.h"
 #include "history/history.h"
 #include "history/history_message.h" // NewMessageFlags.
+#include "chat_helpers/message_field.h" // ConvertTextTagsToEntities.
 #include "ui/text/text_entity.h" // TextWithEntities.
 #include "main/main_session.h"
 #include "mainwidget.h"
@@ -26,24 +27,18 @@ namespace {
 
 template <typename MediaData>
 void SendExistingMedia(
-		not_null<History*> history,
+		Api::MessageToSend &&message,
 		not_null<MediaData*> media,
 		const MTPInputMedia &inputMedia,
-		Data::FileOrigin origin,
-		TextWithEntities caption,
-		MsgId replyToId,
-		bool silent) {
+		Data::FileOrigin origin) {
+	const auto history = message.action.history;
 	const auto peer = history->peer;
 	const auto session = &history->session();
 	const auto api = &session->api();
 
-	auto options = ApiWrap::SendOptions(history);
-	options.clearDraft = false;
-	options.replyTo = replyToId;
-	options.generateLocal = true;
-	options.silent = silent;
-
-	api->sendAction(options);
+	message.action.clearDraft = false;
+	message.action.generateLocal = true;
+	api->sendAction(message.action);
 
 	const auto newId = FullMsgId(peerToChannel(peer->id), clientMsgId());
 	const auto randomId = rand_value<uint64>();
@@ -51,12 +46,12 @@ void SendExistingMedia(
 	auto flags = NewMessageFlags(peer) | MTPDmessage::Flag::f_media;
 	auto clientFlags = NewMessageClientFlags();
 	auto sendFlags = MTPmessages_SendMedia::Flags(0);
-	if (options.replyTo) {
+	if (message.action.replyTo) {
 		flags |= MTPDmessage::Flag::f_reply_to_msg_id;
 		sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to_msg_id;
 	}
 	const auto channelPost = peer->isChannel() && !peer->isMegagroup();
-	const auto silentPost = options.silent
+	const auto silentPost = message.action.options.silent
 		|| (channelPost && session->data().notifySilentPosts(peer));
 	if (channelPost) {
 		flags |= MTPDmessage::Flag::f_views;
@@ -75,6 +70,10 @@ void SendExistingMedia(
 		? App::peerName(session->user())
 		: QString();
 
+	auto caption = TextWithEntities{
+		message.textWithTags.text,
+		ConvertTextTagsToEntities(message.textWithTags.tags)
+	};
 	TextUtilities::Trim(caption);
 	auto sentEntities = TextUtilities::EntitiesToMTP(
 		caption.entities,
@@ -82,7 +81,7 @@ void SendExistingMedia(
 	if (!sentEntities.v.isEmpty()) {
 		sendFlags |= MTPmessages_SendMedia::Flag::f_entities;
 	}
-	const auto replyTo = options.replyTo;
+	const auto replyTo = message.action.replyTo;
 	const auto captionText = caption.text;
 
 	session->data().registerMessageRandomId(randomId, newId);
@@ -137,36 +136,23 @@ void SendExistingMedia(
 	performRequest();
 
 	if (const auto main = App::main()) {
-		main->finishForwarding(history, options.silent);
+		main->finishForwarding(message.action);
 	}
 }
 
 } // namespace
 
 void SendExistingDocument(
-		not_null<History*> history,
-		not_null<DocumentData*> document,
-		bool silent) {
-	SendExistingDocument(history, document, {}, 0, silent);
-}
-
-void SendExistingDocument(
-		not_null<History*> history,
-		not_null<DocumentData*> document,
-		TextWithEntities caption,
-		MsgId replyToId,
-		bool silent) {
+		Api::MessageToSend &&message,
+		not_null<DocumentData*> document) {
 	SendExistingMedia(
-		history,
+		std::move(message),
 		document,
 		MTP_inputMediaDocument(
 			MTP_flags(0),
 			document->mtpInput(),
 			MTPint()),
-		document->stickerOrGifOrigin(),
-		caption,
-		replyToId,
-		silent);
+		document->stickerOrGifOrigin());
 
 	if (document->sticker()) {
 		if (const auto main = App::main()) {
@@ -177,29 +163,16 @@ void SendExistingDocument(
 }
 
 void SendExistingPhoto(
-		not_null<History*> history,
-		not_null<PhotoData*> photo,
-		bool silent) {
-	SendExistingPhoto(history, photo, {}, 0, silent);
-}
-
-void SendExistingPhoto(
-		not_null<History*> history,
-		not_null<PhotoData*> photo,
-		TextWithEntities caption,
-		MsgId replyToId,
-		bool silent) {
+		Api::MessageToSend &&message,
+		not_null<PhotoData*> photo) {
 	SendExistingMedia(
-		history,
+		std::move(message),
 		photo,
 		MTP_inputMediaPhoto(
 			MTP_flags(0),
 			photo->mtpInput(),
 			MTPint()),
-		Data::FileOrigin(),
-		caption,
-		replyToId,
-		silent);
+		Data::FileOrigin());
 }
 
 } // namespace Api

Telegram/SourceFiles/api/api_sending.h

@@ -9,32 +9,17 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 
 class History;
 class DocumentData;
-struct TextWithEntities;
 
 namespace Api {
 
-void SendExistingDocument(
-	not_null<History*> history,
-	not_null<DocumentData*> document,
-	bool silent = false);
+struct MessageToSend;
 
 void SendExistingDocument(
-	not_null<History*> history,
-	not_null<DocumentData*> document,
-	TextWithEntities caption,
-	MsgId replyToId = 0,
-	bool silent = false);
+	Api::MessageToSend &&message,
+	not_null<DocumentData*> document);
 
 void SendExistingPhoto(
-	not_null<History*> history,
-	not_null<PhotoData*> photo,
-	bool silent = false);
-
-void SendExistingPhoto(
-	not_null<History*> history,
-	not_null<PhotoData*> photo,
-	TextWithEntities caption,
-	MsgId replyToId = 0,
-	bool silent = false);
+	Api::MessageToSend &&message,
+	not_null<PhotoData*> photo);
 
 } // namespace Api