Merge tdesktop v6.3.9

Author: Burhanverse

Telegram/Resources/langs/lang.strings

@@ -796,6 +796,7 @@ https://github.com/fajox1/fagramdesktop/blob/master/LEGAL
 "lng_settings_channel_label" = "Personal channel";
 "lng_settings_channel_add" = "Add";
 "lng_settings_channel_remove" = "Remove";
+"lng_settings_channel_menu_remove" = "Remove Personal Channel";
 "lng_settings_channel_no_yet" = "You don't have any public channels yet.";
 "lng_settings_channel_start" = "Start a Channel";
 "lng_settings_channel_saved" = "Your personal channel was updated.";
@@ -5178,6 +5179,7 @@ https://github.com/fajox1/fagramdesktop/blob/master/LEGAL
 "lng_edit_channel_status_about" = "Choose a status that will be shown next to the channel's name.";
 "lng_edit_channel_status_group" = "Set Group Emoji Status";
 "lng_edit_channel_status_about_group" = "Choose a status that will be shown next to the group's name.";
+"lng_edit_channel_personal_channel" = "Set as Personal Channel";
 "lng_edit_self_title" = "Edit your name";
 "lng_confirm_contact_data" = "New Contact";
 "lng_add_contact" = "Create";

Telegram/SourceFiles/api/api_bot.cpp

@@ -218,7 +218,7 @@ void SendBotCallbackDataWithPassword(
 			session,
 			tr::lng_bots_password_confirm_check_about(
 				tr::now,
-				Ui::Text::WithEntities));
+				tr::marked));
 		if (box) {
 			show->showBox(std::move(box), Ui::LayerOption::CloseOther);
 		} else {

Telegram/SourceFiles/api/api_chat_filters.cpp

@@ -116,24 +116,24 @@ class ToggleChatsController final
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (type == Type::AddingChats)
 		? tr::lng_filters_by_link_more_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: (type == Type::AllAdded)
 		? tr::lng_filters_by_link_already_about(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities)
+			tr::marked)
 		: tr::lng_filters_by_link_remove_sure(
 			tr::now,
 			lt_folder,
 			std::move(boldTitle),
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 void InitFilterLinkHeader(
@@ -547,7 +547,7 @@ void ShowImportToast(
 		? tr::lng_filters_added_title
 		: tr::lng_filters_updated_title;
 	auto text = Ui::Text::Wrapped(
-		phrase(tr::now, lt_folder, title.text, Ui::Text::WithEntities),
+		phrase(tr::now, lt_folder, title.text, tr::marked),
 		EntityType::Bold);
 	if (added > 0) {
 		const auto phrase = created

Telegram/SourceFiles/api/api_chat_invite.cpp

@@ -224,13 +224,13 @@ void ConfirmSubscriptionBox(
 			box,
 			tr::lng_channel_invite_subscription_about(
 				lt_channel,
-				rpl::single(Ui::Text::Bold(name)),
+				rpl::single(tr::bold(name)),
 				lt_price,
 				tr::lng_credits_summary_options_credits(
 					lt_count,
 					rpl::single(amount) | tr::to_count(),
-					Ui::Text::Bold),
-				Ui::Text::WithEntities),
+					tr::bold),
+				tr::marked),
 			st::inviteLinkSubscribeBoxAbout),
 		style::al_top);
 	Ui::AddSkip(content);
@@ -243,9 +243,9 @@ void ConfirmSubscriptionBox(
 					tr::lng_paid_react_agree_link(),
 					tr::lng_group_invite_subscription_about_url()
 				) | rpl::map([](const QString &text, const QString &url) {
-					return Ui::Text::Link(text, url);
+					return tr::link(text, url);
 				}),
-				Ui::Text::RichLangValue),
+				tr::rich),
 			st::inviteLinkSubscribeBoxTerms),
 		style::al_top);
 

Telegram/SourceFiles/api/api_suggest_post.cpp

@@ -154,13 +154,13 @@ void ConfirmApproval(
 			? tr::lng_suggest_accept_text(
 				tr::now,
 				lt_from,
-				Ui::Text::Bold(item->from()->shortName()),
-				Ui::Text::WithEntities)
+				tr::bold(item->from()->shortName()),
+				tr::marked)
 			: tr::lng_suggest_accept_text_to(
 				tr::now,
 				lt_channel,
-				Ui::Text::Bold(channelName),
-				Ui::Text::WithEntities);
+				tr::bold(channelName),
+				tr::marked);
 		if (price) {
 			text.append("\n\n").append(admin
 				? (scheduleDate
@@ -171,23 +171,23 @@ void ConfirmApproval(
 							lt_count_decimal,
 							amount.value(),
 							lt_channel,
-							Ui::Text::Bold(channelName),
+							tr::bold(channelName),
 							lt_percent,
 							TextWithEntities{ commission },
 							lt_date,
-							Ui::Text::Bold(date),
-							Ui::Text::RichLangValue)
+							tr::bold(date),
+							tr::rich)
 					: (amount.stars()
 						? tr::lng_suggest_accept_receive_now_stars
 						: tr::lng_suggest_accept_receive_now_ton)(
 							tr::now,
 							lt_count_decimal,
 							amount.value(),
 							lt_channel,
-							Ui::Text::Bold(channelName),
+							tr::bold(channelName),
 							lt_percent,
 							TextWithEntities{ commission },
-							Ui::Text::RichLangValue))
+							tr::rich))
 				: (scheduleDate
 					? (amount.stars()
 						? tr::lng_suggest_accept_pay_stars
@@ -196,25 +196,25 @@ void ConfirmApproval(
 							lt_count_decimal,
 							amount.value(),
 							lt_date,
-							Ui::Text::Bold(date),
-							Ui::Text::RichLangValue)
+							tr::bold(date),
+							tr::rich)
 					: (amount.stars()
 						? tr::lng_suggest_accept_pay_now_stars
 						: tr::lng_suggest_accept_pay_now_ton)(
 							tr::now,
 							lt_count_decimal,
 							amount.value(),
-							Ui::Text::RichLangValue)));
+							tr::rich)));
 			if (admin) {
 				text.append(' ').append(
 					tr::lng_suggest_accept_receive_if(
 						tr::now,
-						Ui::Text::RichLangValue));
+						tr::rich));
 				if (price.stars()) {
 					text.append("\n\n").append(
 						tr::lng_suggest_options_stars_warning(
 							tr::now,
-							Ui::Text::RichLangValue));
+							tr::rich));
 				}
 			}
 		}
@@ -321,12 +321,12 @@ void RequestDeclineComment(
 			.text = (admin
 				? tr::lng_suggest_decline_text(
 					lt_from,
-					rpl::single(Ui::Text::Bold(item->from()->shortName())),
-					Ui::Text::WithEntities)
+					rpl::single(tr::bold(item->from()->shortName())),
+					tr::marked)
 				: tr::lng_suggest_decline_text_to(
 					lt_channel,
-					rpl::single(Ui::Text::Bold(channelName)),
-					Ui::Text::WithEntities)),
+					rpl::single(tr::bold(channelName)),
+					tr::marked)),
 			.confirmed = [=](Fn<void()> close) { (*callback)(); close(); },
 			.confirmText = tr::lng_suggest_action_decline(),
 			.confirmStyle = &st::attentionBoxButton,

Telegram/SourceFiles/apiwrap.cpp

@@ -490,7 +490,7 @@ void ApiWrap::sendMessageFail(
 				PeerFloodErrorText(&session(), PeerFloodType::Send)),
 			Ui::LayerOption::CloseOther);
 	} else if (show && error == u"USER_BANNED_IN_CHANNEL"_q) {
-		const auto link = Ui::Text::Link(
+		const auto link = tr::link(
 			tr::lng_cant_more_info(tr::now),
 			session().createInternalLinkFull(u"spambot"_q));
 		show->showBox(
@@ -499,7 +499,7 @@ void ApiWrap::sendMessageFail(
 					tr::now,
 					lt_more_info,
 					link,
-					Ui::Text::WithEntities)),
+					tr::marked)),
 			Ui::LayerOption::CloseOther);
 	} else if (error.startsWith(u"SLOWMODE_WAIT_"_q)) {
 		const auto chop = u"SLOWMODE_WAIT_"_q.size();

Telegram/SourceFiles/boxes/about_box.cpp

@@ -43,29 +43,28 @@ namespace {
 rpl::producer<TextWithEntities> Text1() {
 	return tr::lng_fa_about_text1(
 		lt_api_link,
-		tr::lng_fa_about_text1_api(
-		) | Ui::Text::ToLink("https://core.telegram.org/api"),
-		Ui::Text::WithEntities);
+		tr::lng_fa_about_text1_api(tr::url(u"https://core.telegram.org/api"_q)),
+		tr::marked);
 }
 
 rpl::producer<TextWithEntities> Text2() {
 	return tr::lng_fa_about_text2(
 		lt_gpl_link,
-		rpl::single(Ui::Text::Link(
+		rpl::single(tr::link(
 			"GNU GPL",
 			"https://github.com/burhancodes/fagramdesktop/blob/master/LICENSE")),
 		lt_github_link,
-		rpl::single(Ui::Text::Link(
+		rpl::single(tr::link(
 			"GitHub",
 			"https://github.com/burhancodes/fagramdesktop")),
-		Ui::Text::WithEntities);
+		tr::marked);
 }
 
 rpl::producer<TextWithEntities> Text3() {
 	return tr::lng_fa_about_text3(
 		lt_faq_link,
-		tr::lng_about_text3_faq() | Ui::Text::ToLink(telegramFaqLink()),
-		Ui::Text::WithEntities);
+		tr::lng_about_text3_faq(tr::url(telegramFaqLink())),
+		tr::marked);
 }
 
 } // namespace
@@ -226,11 +225,11 @@ void ArchiveHintBox(
 						lt_emoji,
 						rpl::single(
 							Ui::Text::IconEmoji(&st::textMoreIconEmoji)),
-						Ui::Text::RichLangValue
+						tr::rich
 					) | rpl::map([](TextWithEntities text) {
-						return Ui::Text::Link(std::move(text), 1);
+						return tr::link(std::move(text), 1);
 					}),
-					Ui::Text::RichLangValue),
+					tr::rich),
 				st::channelEarnHistoryRecipientLabel));
 		label->resizeToWidth(box->width()
 			- rect::m::sum::h(st::boxRowPadding));

Telegram/SourceFiles/boxes/about_sponsored_box.cpp

@@ -61,9 +61,9 @@ void AboutSponsoredBox(not_null<Ui::GenericBox*> box) {
 			tr::lng_sponsored_info_description1_link(),
 			tr::lng_sponsored_info_description1_url()
 		) | rpl::map([](const QString &text, const QString &url) {
-			return Ui::Text::Link(text, url);
+			return tr::link(text, url);
 		}),
-		Ui::Text::RichLangValue);
+		tr::rich);
 	box->addRow(object_ptr<FlatLabel>(box, std::move(text1), stLabel));
 
 	box->addSkip(st::sponsoredUrlButtonSkip);

Telegram/SourceFiles/boxes/add_contact_box.cpp

@@ -160,7 +160,7 @@ void MustBePublicFailed(
 TextWithEntities PeerFloodErrorText(
 		not_null<Main::Session*> session,
 		PeerFloodType type) {
-	const auto link = Ui::Text::Link(
+	const auto link = tr::link(
 		tr::lng_cant_more_info(tr::now),
 		session->createInternalLinkFull(u"spambot"_q));
 	return ((type == PeerFloodType::InviteGroup)
@@ -169,7 +169,7 @@ TextWithEntities PeerFloodErrorText(
 			tr::now,
 			lt_more_info,
 			link,
-			Ui::Text::WithEntities);
+			tr::marked);
 }
 
 void ShowAddParticipantsError(

Telegram/SourceFiles/boxes/choose_filter_box.cpp

@@ -22,7 +22,7 @@ For license and copyright information please follow this link:
 #include "ui/filter_icons.h"
 #include "ui/painter.h"
 #include "ui/rect.h"
-#include "ui/text/text_utilities.h" // Ui::Text::Bold
+#include "ui/text/text_utilities.h" // tr::bold
 #include "ui/toast/toast.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/menu/menu_action.h"
@@ -179,10 +179,10 @@ void ChangeFilterById(
 						: tr::lng_filters_toast_remove)(
 							tr::now,
 							lt_chat,
-							Ui::Text::Bold(chat),
+							tr::bold(chat),
 							lt_folder,
 							Ui::Text::Wrapped(name.text, EntityType::Bold),
-							Ui::Text::WithEntities),
+							tr::marked),
 					.textContext = Core::TextContext({
 						.session = &history->session(),
 						.customEmojiLoopLimit = isStatic ? -1 : 0,