Hide MTPInputFile in Api::RemoteFileInfo.

Telegram/SourceFiles/api/api_common.h

@@ -45,4 +45,10 @@ struct MessageToSend {
 	WebPageId webPageId = 0;
 };
 
+struct RemoteFileInfo {
+	MTPInputFile file;
+	std::optional<MTPInputFile> thumb;
+	std::vector<MTPInputDocument> attachedStickers;
+};
+
 } // namespace Api

Telegram/SourceFiles/api/api_editing.cpp

@@ -172,33 +172,28 @@ void RescheduleMessage(
 
 void EditMessageWithUploadedDocument(
 		HistoryItem *item,
-		const MTPInputFile &file,
+		RemoteFileInfo info,
-		const std::optional<MTPInputFile> &thumb,
+		SendOptions options) {
-		SendOptions options,
-		std::vector<MTPInputDocument> attachedStickers) {
 	if (!item || !item->media() || !item->media()->document()) {
 		return;
 	}
-	const auto media = PrepareUploadedDocument(
+	EditMessageWithUploadedMedia(
 		item,
-		file,
+		options,
-		thumb,
+		PrepareUploadedDocument(item, std::move(info)));
-		std::move(attachedStickers));
-	EditMessageWithUploadedMedia(item, options, media);
 }
 
 void EditMessageWithUploadedPhoto(
 		HistoryItem *item,
-		const MTPInputFile &file,
+		RemoteFileInfo info,
-		SendOptions options,
+		SendOptions options) {
-		std::vector<MTPInputDocument> attachedStickers) {
 	if (!item || !item->media() || !item->media()->photo()) {
 		return;
 	}
-	const auto media = PrepareUploadedPhoto(
+	EditMessageWithUploadedMedia(
-		file,
+		item,
-		std::move(attachedStickers));
+		options,
-	EditMessageWithUploadedMedia(item, options, media);
+		PrepareUploadedPhoto(std::move(info)));
 }
 
 mtpRequestId EditCaption(

Telegram/SourceFiles/api/api_editing.h

@@ -16,6 +16,7 @@ class Error;
 namespace Api {
 
 struct SendOptions;
+struct RemoteFileInfo;
 
 const auto kDefaultEditMessagesErrors = {
 	u"MESSAGE_ID_INVALID"_q,
@@ -29,16 +30,13 @@ void RescheduleMessage(
 
 void EditMessageWithUploadedDocument(
 	HistoryItem *item,
-	const MTPInputFile &file,
+	RemoteFileInfo info,
-	const std::optional<MTPInputFile> &thumb,
+	SendOptions options);
-	SendOptions options,
-	std::vector<MTPInputDocument> attachedStickers);
 
 void EditMessageWithUploadedPhoto(
 	HistoryItem *item,
-	const MTPInputFile &file,
+	RemoteFileInfo info,
-	SendOptions options,
+	SendOptions options);
-	std::vector<MTPInputDocument> attachedStickers);
 
 mtpRequestId EditCaption(
 	not_null<HistoryItem*> item,

Telegram/SourceFiles/api/api_media.cpp

@@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 */
 #include "api/api_media.h"
 
+#include "api/api_common.h"
 #include "data/data_document.h"
 #include "data/stickers/data_stickers_set.h"
 #include "history/history_item.h"
@@ -74,41 +75,39 @@ MTPVector<MTPDocumentAttribute> ComposeSendingDocumentAttributes(
 
 } // namespace
 
-MTPInputMedia PrepareUploadedPhoto(
+MTPInputMedia PrepareUploadedPhoto(RemoteFileInfo info) {
-		const MTPInputFile &file,
+	const auto flags = info.attachedStickers.empty()
-		std::vector<MTPInputDocument> attachedStickers) {
-	const auto flags = attachedStickers.empty()
 		? MTPDinputMediaUploadedPhoto::Flags(0)
 		: MTPDinputMediaUploadedPhoto::Flag::f_stickers;
 	return MTP_inputMediaUploadedPhoto(
 		MTP_flags(flags),
-		file,
+		info.file,
-		MTP_vector<MTPInputDocument>(ranges::to<QVector>(attachedStickers)),
+		MTP_vector<MTPInputDocument>(
+			ranges::to<QVector>(info.attachedStickers)),
 		MTP_int(0));
 }
 
 MTPInputMedia PrepareUploadedDocument(
 		not_null<HistoryItem*> item,
-		const MTPInputFile &file,
+		RemoteFileInfo info) {
-		const std::optional<MTPInputFile> &thumb,
-		std::vector<MTPInputDocument> attachedStickers) {
 	if (!item || !item->media() || !item->media()->document()) {
 		return MTP_inputMediaEmpty();
 	}
 	const auto emptyFlag = MTPDinputMediaUploadedDocument::Flags(0);
 	using DocFlags = MTPDinputMediaUploadedDocument::Flag;
 	const auto flags = emptyFlag
-		| (thumb ? DocFlags::f_thumb : emptyFlag)
+		| (info.thumb ? DocFlags::f_thumb : emptyFlag)
 		| (item->groupId() ? DocFlags::f_nosound_video : emptyFlag)
-		| (attachedStickers.empty() ? DocFlags::f_stickers : emptyFlag);
+		| (info.attachedStickers.empty() ? DocFlags::f_stickers : emptyFlag);
 	const auto document = item->media()->document();
 	return MTP_inputMediaUploadedDocument(
 		MTP_flags(flags),
-		file,
+		info.file,
-		thumb.value_or(MTPInputFile()),
+		info.thumb.value_or(MTPInputFile()),
 		MTP_string(document->mimeString()),
 		ComposeSendingDocumentAttributes(document),
-		MTP_vector<MTPInputDocument>(ranges::to<QVector>(attachedStickers)),
+		MTP_vector<MTPInputDocument>(
+			ranges::to<QVector>(info.attachedStickers)),
 		MTP_int(0));
 }
 

Telegram/SourceFiles/api/api_media.h

@@ -11,15 +11,13 @@ class HistoryItem;
 
 namespace Api {
 
-MTPInputMedia PrepareUploadedPhoto(
+struct RemoteFileInfo;
-	const MTPInputFile &file,
+
-	std::vector<MTPInputDocument> attachedStickers);
+MTPInputMedia PrepareUploadedPhoto(RemoteFileInfo info);
 
 MTPInputMedia PrepareUploadedDocument(
 	not_null<HistoryItem*> item,
-	const MTPInputFile &file,
+	RemoteFileInfo info);
-	const std::optional<MTPInputFile> &thumb,
-	std::vector<MTPInputDocument> attachedStickers);
 
 bool HasAttachedStickers(MTPInputMedia media);
 

Telegram/SourceFiles/api/api_peer_photo.cpp

@@ -104,8 +104,8 @@ PeerPhoto::PeerPhoto(not_null<ApiWrap*> api)
 		// You can't use _session->lifetime() in the constructor,
 		// only queued, because it is not constructed yet.
 		_session->uploader().photoReady(
-		) | rpl::start_with_next([=](const Storage::UploadedPhoto &data) {
+		) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
-			ready(data.fullId, data.file);
+			ready(data.fullId, data.info.file);
 		}, _session->lifetime());
 	});
 }

Telegram/SourceFiles/apiwrap.cpp

@@ -3963,13 +3963,10 @@ void ApiWrap::sendFile(
 
 void ApiWrap::sendUploadedPhoto(
 		FullMsgId localId,
-		const MTPInputFile &file,
+		Api::RemoteFileInfo info,
-		Api::SendOptions options,
+		Api::SendOptions options) {
-		std::vector<MTPInputDocument> attachedStickers) {
 	if (const auto item = _session->data().message(localId)) {
-		const auto media = Api::PrepareUploadedPhoto(
+		const auto media = Api::PrepareUploadedPhoto(std::move(info));
-			file,
-			std::move(attachedStickers));
 		if (const auto groupId = item->groupId()) {
 			uploadAlbumMedia(item, groupId, media);
 		} else {
@@ -3980,19 +3977,15 @@ void ApiWrap::sendUploadedPhoto(
 
 void ApiWrap::sendUploadedDocument(
 		FullMsgId localId,
-		const MTPInputFile &file,
+		Api::RemoteFileInfo info,
-		const std::optional<MTPInputFile> &thumb,
+		Api::SendOptions options) {
-		Api::SendOptions options,
-		std::vector<MTPInputDocument> attachedStickers) {
 	if (const auto item = _session->data().message(localId)) {
 		if (!item->media() || !item->media()->document()) {
 			return;
 		}
 		const auto media = Api::PrepareUploadedDocument(
 			item,
-			file,
+			std::move(info));
-			thumb,
-			std::move(attachedStickers));
 		const auto groupId = item->groupId();
 		if (groupId) {
 			uploadAlbumMedia(item, groupId, media);

Telegram/SourceFiles/apiwrap.h

@@ -357,15 +357,12 @@ public:
 
 	void sendUploadedPhoto(
 		FullMsgId localId,
-		const MTPInputFile &file,
+		Api::RemoteFileInfo info,
-		Api::SendOptions options,
+		Api::SendOptions options);
-		std::vector<MTPInputDocument> attachedStickers);
 	void sendUploadedDocument(
 		FullMsgId localId,
-		const MTPInputFile &file,
+		Api::RemoteFileInfo file,
-		const std::optional<MTPInputFile> &thumb,
+		Api::SendOptions options);
-		Api::SendOptions options,
-		std::vector<MTPInputDocument> attachedStickers);
 
 	void cancelLocalItem(not_null<HistoryItem*> item);
 

Telegram/SourceFiles/storage/file_upload.cpp

@@ -158,40 +158,34 @@ Uploader::Uploader(not_null<ApiWrap*> api)
 , _stopSessionsTimer([=] { stopSessions(); }) {
 	const auto session = &_api->session();
 	photoReady(
-	) | rpl::start_with_next([=](const UploadedPhoto &data) {
+	) | rpl::start_with_next([=](UploadedMedia &&data) {
 		if (data.edit) {
 			const auto item = session->data().message(data.fullId);
 			Api::EditMessageWithUploadedPhoto(
 				item,
-				data.file,
+				std::move(data.info),
-				data.options,
+				data.options);
-				data.attachedStickers);
 		} else {
 			_api->sendUploadedPhoto(
 				data.fullId,
-				data.file,
+				std::move(data.info),
-				data.options,
+				data.options);
-				data.attachedStickers);
 		}
 	}, _lifetime);
 
 	documentReady(
-	) | rpl::start_with_next([=](const UploadedDocument &data) {
+	) | rpl::start_with_next([=](UploadedMedia &&data) {
 		if (data.edit) {
 			const auto item = session->data().message(data.fullId);
 			Api::EditMessageWithUploadedDocument(
 				item,
-				data.file,
+				std::move(data.info),
-				data.thumb,
+				data.options);
-				data.options,
-				data.attachedStickers);
 		} else {
 			_api->sendUploadedDocument(
 				data.fullId,
-				data.file,
+				std::move(data.info),
-				data.thumb,
+				data.options);
-				data.options,
-				data.attachedStickers);
 		}
 	}, _lifetime);
 
@@ -472,11 +466,14 @@ void Uploader::sendNext() {
 						MTP_string(photoFilename),
 						MTP_bytes(md5));
 					_photoReady.fire({
-						uploadingId,
+						.fullId = uploadingId,
-						options,
+						.info = {
-						file,
+							.file = file,
-						edit,
+							.attachedStickers = attachedStickers,
-						attachedStickers });
+						},
+						.options = options,
+						.edit = edit,
+					});
 				} else if (uploadingData.type() == SendMediaType::File
 					|| uploadingData.type() == SendMediaType::ThemeFile
 					|| uploadingData.type() == SendMediaType::Audio) {
@@ -510,12 +507,15 @@ void Uploader::sendNext() {
 							MTP_bytes(thumbMd5));
 					}();
 					_documentReady.fire({
-						uploadingId,
+						.fullId = uploadingId,
-						options,
+						.info = {
-						file,
+							.file = file,
-						thumb,
+							.thumb = thumb,
-						edit,
+							.attachedStickers = attachedStickers,
-						attachedStickers });
+						},
+						.options = options,
+						.edit = edit,
+					});
 				} else if (uploadingData.type() == SendMediaType::Secure) {
 					_secureReady.fire({
 						uploadingId,

Telegram/SourceFiles/storage/file_upload.h

@@ -28,21 +28,11 @@ namespace Storage {
 // MTP big files methods used for files greater than 10mb.
 constexpr auto kUseBigFilesFrom = 10 * 1024 * 1024;
 
-struct UploadedPhoto {
+struct UploadedMedia {
 	FullMsgId fullId;
+	Api::RemoteFileInfo info;
 	Api::SendOptions options;
-	MTPInputFile file;
 	bool edit = false;
-	std::vector<MTPInputDocument> attachedStickers;
-};
-
-struct UploadedDocument {
-	FullMsgId fullId;
-	Api::SendOptions options;
-	MTPInputFile file;
-	std::optional<MTPInputFile> thumb;
-	bool edit = false;
-	std::vector<MTPInputDocument> attachedStickers;
 };
 
 struct UploadSecureProgress {
@@ -75,10 +65,10 @@ public:
 
 	void clear();
 
-	rpl::producer<UploadedPhoto> photoReady() const {
+	rpl::producer<UploadedMedia> photoReady() const {
 		return _photoReady.events();
 	}
-	rpl::producer<UploadedDocument> documentReady() const {
+	rpl::producer<UploadedMedia> documentReady() const {
 		return _documentReady.events();
 	}
 	rpl::producer<UploadSecureDone> secureReady() const {
@@ -138,8 +128,8 @@ private:
 	std::map<FullMsgId, File> uploaded;
 	base::Timer _nextTimer, _stopSessionsTimer;
 
-	rpl::event_stream<UploadedPhoto> _photoReady;
+	rpl::event_stream<UploadedMedia> _photoReady;
-	rpl::event_stream<UploadedDocument> _documentReady;
+	rpl::event_stream<UploadedMedia> _documentReady;
 	rpl::event_stream<UploadSecureDone> _secureReady;
 	rpl::event_stream<FullMsgId> _photoProgress;
 	rpl::event_stream<FullMsgId> _documentProgress;

Telegram/SourceFiles/window/themes/window_theme.cpp

@@ -608,14 +608,14 @@ void ChatBackground::checkUploadWallPaper() {
 		return;
 	}
 	_wallPaperUploadLifetime = _session->uploader().documentReady(
-	) | rpl::start_with_next([=](const Storage::UploadedDocument &data) {
+	) | rpl::start_with_next([=](const Storage::UploadedMedia &data) {
 		if (data.fullId != _wallPaperUploadId) {
 			return;
 		}
 		_wallPaperUploadId = FullMsgId();
 		_wallPaperRequestId = _session->api().request(
 			MTPaccount_UploadWallPaper(
-				data.file,
+				data.info.file,
 				MTP_string("image/jpeg"),
 				_paper.mtpSettings()
 			)

Telegram/SourceFiles/window/themes/window_theme_editor_box.cpp

@@ -465,7 +465,7 @@ Fn<void()> SavePreparedTheme(
 		Fn<void(SaveErrorType,QString)> fail) {
 	Expects(window->account().sessionExists());
 
-	using Storage::UploadedDocument;
+	using Storage::UploadedMedia;
 	struct State {
 		FullMsgId id;
 		bool generating = false;
@@ -548,11 +548,11 @@ Fn<void()> SavePreparedTheme(
 		}).send();
 	};
 
-	const auto uploadTheme = [=](const UploadedDocument &data) {
+	const auto uploadTheme = [=](const UploadedMedia &data) {
 		state->requestId = api->request(MTPaccount_UploadTheme(
 			MTP_flags(MTPaccount_UploadTheme::Flag::f_thumb),
-			data.file,
+			data.info.file,
-			*data.thumb,
+			*data.info.thumb,
 			MTP_string(state->filename),
 			MTP_string("application/x-tgtheme-tdesktop")
 		)).done([=](const MTPDocument &result) {
@@ -575,9 +575,9 @@ Fn<void()> SavePreparedTheme(
 		state->themeContent = theme;
 
 		session->uploader().documentReady(
-		) | rpl::filter([=](const UploadedDocument &data) {
+		) | rpl::filter([=](const UploadedMedia &data) {
-			return (data.fullId == state->id) && data.thumb.has_value();
+			return (data.fullId == state->id) && data.info.thumb.has_value();
-		}) | rpl::start_with_next([=](const UploadedDocument &data) {
+		}) | rpl::start_with_next([=](const UploadedMedia &data) {
 			uploadTheme(data);
 		}, state->lifetime);