Use getters in MTP classes.

2025-08-31 14:45:14 +00:00 · 2019-07-05 15:38:38 +02:00
parent 3ca28c0cf9
commit 567bf60644
100 changed files with 2807 additions and 2672 deletions
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@@ -25,9 +25,9 @@ namespace {
 QString GetContentUrl(const MTPWebDocument &document) {
 	switch (document.type()) {
 	case mtpc_webDocument:
-		return qs(document.c_webDocument().vurl);
+		return qs(document.c_webDocument().vurl());
 	case mtpc_webDocumentNoProxy:
-		return qs(document.c_webDocumentNoProxy().vurl);
+		return qs(document.c_webDocumentNoProxy().vurl());
 	}
 	Unexpected("Type in GetContentUrl.");
 }
@@ -59,8 +59,8 @@ std::unique_ptr<Result> Result::create(uint64 queryId, const MTPBotInlineResult
 	auto getInlineResultType = [](const MTPBotInlineResult &inlineResult) -> Type {
 		QString type;
 		switch (inlineResult.type()) {
-		case mtpc_botInlineResult: type = qs(inlineResult.c_botInlineResult().vtype); break;
-		case mtpc_botInlineMediaResult: type = qs(inlineResult.c_botInlineMediaResult().vtype); break;
+		case mtpc_botInlineResult: type = qs(inlineResult.c_botInlineResult().vtype()); break;
+		case mtpc_botInlineMediaResult: type = qs(inlineResult.c_botInlineMediaResult().vtype()); break;
 		}
 		return stringToTypeMap->value(type, Type::Unknown);
 	};
@@ -74,40 +74,40 @@ std::unique_ptr<Result> Result::create(uint64 queryId, const MTPBotInlineResult
 	switch (mtpData.type()) {
 	case mtpc_botInlineResult: {
 		const auto &r = mtpData.c_botInlineResult();
-		result->_id = qs(r.vid);
-		if (r.has_title()) result->_title = qs(r.vtitle);
-		if (r.has_description()) result->_description = qs(r.vdescription);
-		if (r.has_url()) result->_url = qs(r.vurl);
-		if (r.has_thumb()) {
-			result->_thumb = Images::Create(r.vthumb, result->thumbBox());
+		result->_id = qs(r.vid());
+		result->_title = qs(r.vtitle().value_or_empty());
+		result->_description = qs(r.vdescription().value_or_empty());
+		result->_url = qs(r.vurl().value_or_empty());
+		if (const auto thumb = r.vthumb()) {
+			result->_thumb = Images::Create(*thumb, result->thumbBox());
 		}
-		if (r.has_content()) {
-			result->_content_url = GetContentUrl(r.vcontent);
+		if (const auto content = r.vcontent()) {
+			result->_content_url = GetContentUrl(*content);
 			if (result->_type == Type::Photo) {
 				result->_photo = Auth().data().photoFromWeb(
-					r.vcontent,
+					*content,
 					result->_thumb,
 					true);
 			} else {
 				result->_document = Auth().data().documentFromWeb(
-					result->adjustAttributes(r.vcontent),
+					result->adjustAttributes(*content),
 					result->_thumb);
 			}
 		}
-		message = &r.vsend_message;
+		message = &r.vsend_message();
 	} break;
 	case mtpc_botInlineMediaResult: {
 		const auto &r = mtpData.c_botInlineMediaResult();
-		result->_id = qs(r.vid);
-		if (r.has_title()) result->_title = qs(r.vtitle);
-		if (r.has_description()) result->_description = qs(r.vdescription);
-		if (r.has_photo()) {
-			result->_photo = Auth().data().processPhoto(r.vphoto);
+		result->_id = qs(r.vid());
+		result->_title = qs(r.vtitle().value_or_empty());
+		result->_description = qs(r.vdescription().value_or_empty());
+		if (const auto photo = r.vphoto()) {
+			result->_photo = Auth().data().processPhoto(*photo);
 		}
-		if (r.has_document()) {
-			result->_document = Auth().data().processDocument(r.vdocument);
+		if (const auto document = r.vdocument()) {
+			result->_document = Auth().data().processDocument(*document);
 		}
-		message = &r.vsend_message;
+		message = &r.vsend_message();
 	} break;
 	}
 	auto badAttachment = (result->_photo && result->_photo->isNull())
@@ -134,35 +134,42 @@ std::unique_ptr<Result> Result::create(uint64 queryId, const MTPBotInlineResult

 	switch (message->type()) {
 	case mtpc_botInlineMessageMediaAuto: {
-		auto &r = message->c_botInlineMessageMediaAuto();
-		auto entities = r.has_entities()
-			? TextUtilities::EntitiesFromMTP(r.ventities.v)
-			: EntitiesInText();
+		const auto &r = message->c_botInlineMessageMediaAuto();
+		const auto message = qs(r.vmessage());
+		const auto entities = TextUtilities::EntitiesFromMTP(
+			r.ventities().value_or_empty());
 		if (result->_type == Type::Photo) {
 			if (!result->_photo) {
 				return nullptr;
 			}
-			result->sendData = std::make_unique<internal::SendPhoto>(result->_photo, qs(r.vmessage), entities);
+			result->sendData = std::make_unique<internal::SendPhoto>(
+				result->_photo,
+				message,
+				entities);
 		} else if (result->_type == Type::Game) {
 			result->createGame();
-			result->sendData = std::make_unique<internal::SendGame>(result->_game);
+			result->sendData = std::make_unique<internal::SendGame>(
+				result->_game);
 		} else {
 			if (!result->_document) {
 				return nullptr;
 			}
-			result->sendData = std::make_unique<internal::SendFile>(result->_document, qs(r.vmessage), entities);
+			result->sendData = std::make_unique<internal::SendFile>(
+				result->_document,
+				message,
+				entities);
 		}
-		if (r.has_reply_markup()) {
-			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(r.vreply_markup);
+		if (const auto markup = r.vreply_markup()) {
+			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(*markup);
 		}
 	} break;

 	case mtpc_botInlineMessageText: {
-		auto &r = message->c_botInlineMessageText();
-		auto entities = r.has_entities()
-			? TextUtilities::EntitiesFromMTP(r.ventities.v)
-			: EntitiesInText();
-		result->sendData = std::make_unique<internal::SendText>(qs(r.vmessage), entities, r.is_no_webpage());
+		const auto &r = message->c_botInlineMessageText();
+		result->sendData = std::make_unique<internal::SendText>(
+			qs(r.vmessage()),
+			TextUtilities::EntitiesFromMTP(r.ventities().value_or_empty()),
+			r.is_no_webpage());
 		if (result->_type == Type::Photo) {
 			if (!result->_photo) {
 				return nullptr;
@@ -176,41 +183,41 @@ std::unique_ptr<Result> Result::create(uint64 queryId, const MTPBotInlineResult
 				return nullptr;
 			}
 		}
-		if (r.has_reply_markup()) {
-			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(r.vreply_markup);
+		if (const auto markup = r.vreply_markup()) {
+			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(*markup);
 		}
 	} break;

 	case mtpc_botInlineMessageMediaGeo: {
 		// #TODO layer 72 save period and send live location?..
 		auto &r = message->c_botInlineMessageMediaGeo();
-		if (r.vgeo.type() == mtpc_geoPoint) {
-			result->sendData = std::make_unique<internal::SendGeo>(r.vgeo.c_geoPoint());
+		if (r.vgeo().type() == mtpc_geoPoint) {
+			result->sendData = std::make_unique<internal::SendGeo>(r.vgeo().c_geoPoint());
 		} else {
 			badAttachment = true;
 		}
-		if (r.has_reply_markup()) {
-			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(r.vreply_markup);
+		if (const auto markup = r.vreply_markup()) {
+			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(*markup);
 		}
 	} break;

 	case mtpc_botInlineMessageMediaVenue: {
 		auto &r = message->c_botInlineMessageMediaVenue();
-		if (r.vgeo.type() == mtpc_geoPoint) {
-			result->sendData = std::make_unique<internal::SendVenue>(r.vgeo.c_geoPoint(), qs(r.vvenue_id), qs(r.vprovider), qs(r.vtitle), qs(r.vaddress));
+		if (r.vgeo().type() == mtpc_geoPoint) {
+			result->sendData = std::make_unique<internal::SendVenue>(r.vgeo().c_geoPoint(), qs(r.vvenue_id()), qs(r.vprovider()), qs(r.vtitle()), qs(r.vaddress()));
 		} else {
 			badAttachment = true;
 		}
-		if (r.has_reply_markup()) {
-			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(r.vreply_markup);
+		if (const auto markup = r.vreply_markup()) {
+			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(*markup);
 		}
 	} break;

 	case mtpc_botInlineMessageMediaContact: {
 		auto &r = message->c_botInlineMessageMediaContact();
-		result->sendData = std::make_unique<internal::SendContact>(qs(r.vfirst_name), qs(r.vlast_name), qs(r.vphone_number));
-		if (r.has_reply_markup()) {
-			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(r.vreply_markup);
+		result->sendData = std::make_unique<internal::SendContact>(qs(r.vfirst_name()), qs(r.vlast_name()), qs(r.vphone_number()));
+		if (const auto markup = r.vreply_markup()) {
+			result->_mtpKeyboard = std::make_unique<MTPReplyMarkup>(*markup);
 		}
 	} break;

@@ -367,20 +374,20 @@ MTPWebDocument Result::adjustAttributes(const MTPWebDocument &document) {
 	case mtpc_webDocument: {
 		const auto &data = document.c_webDocument();
 		return MTP_webDocument(
-			data.vurl,
-			data.vaccess_hash,
-			data.vsize,
-			data.vmime_type,
-			adjustAttributes(data.vattributes, data.vmime_type));
+			data.vurl(),
+			data.vaccess_hash(),
+			data.vsize(),
+			data.vmime_type(),
+			adjustAttributes(data.vattributes(), data.vmime_type()));
 	} break;

 	case mtpc_webDocumentNoProxy: {
 		const auto &data = document.c_webDocumentNoProxy();
 		return MTP_webDocumentNoProxy(
-			data.vurl,
-			data.vsize,
-			data.vmime_type,
-			adjustAttributes(data.vattributes, data.vmime_type));
+			data.vurl(),
+			data.vsize(),
+			data.vmime_type(),
+			adjustAttributes(data.vattributes(), data.vmime_type()));
 	} break;
 	}
 	Unexpected("Type in InlineBots::Result::adjustAttributes.");
@@ -419,19 +426,19 @@ MTPVector<MTPDocumentAttribute> Result::adjustAttributes(
 				// We always treat audio/ogg as a voice message.
 				// It was that way before we started to get attributes here.
 				const auto &fields = audio->c_documentAttributeAudio();
-				if (!(fields.vflags.v & Flag::f_voice)) {
+				if (!(fields.vflags().v & Flag::f_voice)) {
 					*audio = MTP_documentAttributeAudio(
-						MTP_flags(fields.vflags.v | Flag::f_voice),
-						fields.vduration,
-						fields.vtitle,
-						fields.vperformer,
-						fields.vwaveform);
+						MTP_flags(fields.vflags().v | Flag::f_voice),
+						fields.vduration(),
+						MTP_bytes(fields.vtitle().value_or_empty()),
+						MTP_bytes(fields.vperformer().value_or_empty()),
+						MTP_bytes(fields.vwaveform().value_or_empty()));
 				}
 			}

 			const auto &fields = audio->c_documentAttributeAudio();
 			if (!exists(mtpc_documentAttributeFilename)
-				&& !(fields.vflags.v & Flag::f_voice)) {
+				&& !(fields.vflags().v & Flag::f_voice)) {
 				const auto p = Core::MimeTypeForName(mime).globPatterns();
 				auto pattern = p.isEmpty() ? QString() : p.front();
 				const auto extension = pattern.isEmpty()