Improve revoke phrases.

Telegram/Resources/langs/lang.strings

@@ -1390,6 +1390,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
 "lng_delete_for_me_chat_hint#other" = "This will delete them just for you, not for other participants of the chat.";
 "lng_delete_for_me_hint#one" = "This will delete it just for you.";
 "lng_delete_for_me_hint#other" = "This will delete them just for you.";
+"lng_selected_unsend_about_user_one" = "You can also delete the message you sent from {user}'s inbox by checking \"Unsend my messages\".";
+"lng_selected_unsend_about_user#one" = "You can also delete the {count} message you sent from {user}'s inbox by checking \"Unsend my messages\".";
+"lng_selected_unsend_about_user#other" = "You can also delete the {count} messages you sent from {user}'s inbox by checking \"Unsend my messages\".";
+"lng_selected_unsend_about_group_one" = "You can also delete the message you sent from the inboxes of other group members by checking \"Unsend my messages\".";
+"lng_selected_unsend_about_group#one" = "You can also delete the {count} message you sent from the inboxes of other group members by checking \"Unsend my messages\".";
+"lng_selected_unsend_about_group#other" = "You can also delete the {count} messages you sent from the inboxes of other group members by checking \"Unsend my messages\".";
 "lng_delete_for_everyone_check" = "Delete for everyone";
 "lng_delete_for_other_check" = "Also delete for {user}";
 "lng_delete_for_other_my" = "Unsend my messages";

Telegram/SourceFiles/boxes/confirm_box.cpp

@@ -474,10 +474,14 @@ DeleteMessagesBox::DeleteMessagesBox(
 }
 
 void DeleteMessagesBox::prepare() {
-	auto text = QString();
+	auto details = TextWithEntities();
+	const auto appendDetails = [&](TextWithEntities &&text) {
+		TextUtilities::Append(details, { "\n\n" });
+		TextUtilities::Append(details, std::move(text));
+	};
 	if (_moderateFrom) {
 		Assert(_moderateInChannel != nullptr);
-		text = lang(lng_selected_delete_sure_this);
+		details.text = lang(lng_selected_delete_sure_this);
 		if (_moderateBan) {
 			_banUser.create(this, lang(lng_ban_user), false, st::defaultBoxCheckbox);
 		}
@@ -486,25 +490,26 @@ void DeleteMessagesBox::prepare() {
 			_deleteAll.create(this, lang(lng_delete_all_from), false, st::defaultBoxCheckbox);
 		}
 	} else {
-		text = (_ids.size() == 1)
+		details.text = (_ids.size() == 1)
 			? lang(lng_selected_delete_sure_this)
 			: lng_selected_delete_sure(lt_count, _ids.size());
 		if (const auto peer = checkFromSinglePeer()) {
 			auto count = int(_ids.size());
-			if (const auto revoke = revokeText(peer); !revoke.isEmpty()) {
+			if (auto revoke = revokeText(peer)) {
-				_revoke.create(this, revoke, false, st::defaultBoxCheckbox);
+				_revoke.create(this, revoke->checkbox, false, st::defaultBoxCheckbox);
+				appendDetails(std::move(revoke->description));
 			} else if (peer && peer->isChannel()) {
 				if (peer->isMegagroup()) {
-					text += qsl("\n\n") + lng_delete_for_everyone_hint(lt_count, count);
+					appendDetails({ lng_delete_for_everyone_hint(lt_count, count) });
 				}
 			} else if (peer->isChat()) {
-				text += qsl("\n\n") + lng_delete_for_me_chat_hint(lt_count, count);
+				appendDetails({ lng_delete_for_me_chat_hint(lt_count, count) });
 			} else if (!peer->isSelf()) {
-				text += qsl("\n\n") + lng_delete_for_me_hint(lt_count, count);
+				appendDetails({ lng_delete_for_me_hint(lt_count, count) });
 			}
 		}
 	}
-	_text.create(this, text, Ui::FlatLabel::InitType::Simple, st::boxLabel);
+	_text.create(this, rpl::single(std::move(details)), st::boxLabel);
 
 	addButton(langFactory(lng_box_delete), [this] { deleteAndClear(); });
 	addButton(langFactory(lng_cancel), [this] { closeBox(); });
@@ -540,7 +545,8 @@ PeerData *DeleteMessagesBox::checkFromSinglePeer() const {
 	return result;
 }
 
-QString DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const {
+auto DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const
+-> std::optional<RevokeConfig> {
 	const auto items = ranges::view::all(
 		_ids
 	) | ranges::view::transform([](FullMsgId id) {
@@ -550,10 +556,13 @@ QString DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const {
 	}) | ranges::to_vector;
 	if (items.size() != _ids.size()) {
 		// We don't have information about all messages.
-		return QString();
+		return std::nullopt;
 	}
 
 	const auto now = unixtime();
+	const auto canRevoke = [&](HistoryItem * item) {
+		return item->canDeleteForEveryone(now);
+	};
 	const auto cannotRevoke = [&](HistoryItem *item) {
 		return !item->canDeleteForEveryone(now);
 	};
@@ -562,20 +571,47 @@ QString DeleteMessagesBox::revokeText(not_null<PeerData*> peer) const {
 		cannotRevoke
 	) == end(items);
 	auto outgoing = items | ranges::view::filter(&HistoryItem::out);
-	const auto canRevokeAllOutgoing = canRevokeAll ? true : ranges::find_if(
+	const auto canRevokeOutgoingCount = canRevokeAll
-		outgoing,
+		? -1
-		cannotRevoke
+		: ranges::count_if(outgoing, canRevoke);
-	) == end(outgoing);
 
-	return canRevokeAll
+	auto result = RevokeConfig();
-		? (peer->isUser()
+	if (canRevokeAll) {
+		result.checkbox = peer->isUser()
 			? lng_delete_for_other_check(
 				lt_user,
 				peer->asUser()->firstName)
-			: lang(lng_delete_for_everyone_check))
+			: lang(lng_delete_for_everyone_check);
-		: (canRevokeAllOutgoing && (begin(outgoing) != end(outgoing)))
+		return result;
-		? lang(lng_delete_for_other_my)
+	} else if (canRevokeOutgoingCount > 0) {
-		: QString();
+		result.checkbox = lang(lng_delete_for_other_my);
+		if (const auto user = peer->asUser()) {
+			auto boldName = TextWithEntities{ user->firstName };
+			boldName.entities.push_back(
+				EntityInText(EntityInTextBold, 0, boldName.text.size()));
+			if (canRevokeOutgoingCount == 1) {
+				result.description = lng_selected_unsend_about_user_one__generic<TextWithEntities>(
+					lt_user,
+					boldName);
+			} else {
+				result.description = lng_selected_unsend_about_user__generic<TextWithEntities>(
+					lt_count,
+					canRevokeOutgoingCount,
+					lt_user,
+					boldName);
+			}
+		} else if (canRevokeOutgoingCount == 1) {
+			result.description = TextWithEntities{
+				lang(lng_selected_unsend_about_group_one) };
+		} else {
+			result.description = TextWithEntities{
+				lng_selected_unsend_about_group(
+					lt_count,
+					canRevokeOutgoingCount) };
+		}
+		return result;
+	}
+	return std::nullopt;
 }
 
 void DeleteMessagesBox::resizeEvent(QResizeEvent *e) {

Telegram/SourceFiles/boxes/confirm_box.h

@@ -164,9 +164,13 @@ protected:
 	void keyPressEvent(QKeyEvent *e) override;
 
 private:
+	struct RevokeConfig {
+		QString checkbox;
+		TextWithEntities description;
+	};
 	void deleteAndClear();
 	PeerData *checkFromSinglePeer() const;
-	QString revokeText(not_null<PeerData*> peer) const;
+	std::optional<RevokeConfig> revokeText(not_null<PeerData*> peer) const;
 
 	const MessageIdsList _ids;
 	UserData *_moderateFrom = nullptr;