Forward grouped items. Fast share grouped items.

Telegram/SourceFiles/apiwrap.cpp

@@ -2455,6 +2455,7 @@ void ApiWrap::forwardMessages(
 	}
 
 	auto forwardFrom = items.front()->history()->peer;
+	auto currentGroupId = items.front()->groupId();
 	auto ids = QVector<MTPint>();
 	auto randomIds = QVector<MTPlong>();
 
@@ -2462,8 +2463,12 @@ void ApiWrap::forwardMessages(
 		if (shared) {
 			++shared->requestsLeft;
 		}
+		const auto finalFlags = sendFlags
+			| (currentGroupId == MessageGroupId()
+				? MTPmessages_ForwardMessages::Flag(0)
+				: MTPmessages_ForwardMessages::Flag::f_grouped);
 		history->sendRequestId = request(MTPmessages_ForwardMessages(
-			MTP_flags(sendFlags),
+			MTP_flags(finalFlags),
 			forwardFrom->input,
 			MTP_vector<MTPint>(ids),
 			MTP_vector<MTPlong>(randomIds),
@@ -2508,9 +2513,13 @@ void ApiWrap::forwardMessages(
 				App::historyRegRandom(randomId, newId);
 			}
 		}
-		if (forwardFrom != item->history()->peer) {
+		const auto newFrom = item->history()->peer;
+		const auto newGroupId = item->groupId();
+		if (forwardFrom != newFrom
+			|| currentGroupId != newGroupId) {
 			sendAccumulated();
-			forwardFrom = item->history()->peer;
+			forwardFrom = newFrom;
+			currentGroupId = newGroupId;
 		}
 		ids.push_back(MTP_int(item->id));
 		randomIds.push_back(MTP_long(randomId));

Telegram/SourceFiles/auth_session.cpp

@@ -378,6 +378,13 @@ MessageIdsList AuthSessionData::itemsToIds(
 	}) | ranges::to_vector;
 }
 
+MessageIdsList AuthSessionData::groupToIds(
+		not_null<HistoryMessageGroup*> group) const {
+	auto result = itemsToIds(group->others);
+	result.push_back(group->leader->fullId());
+	return result;
+}
+
 AuthSession &Auth() {
 	auto result = Messenger::Instance().authSession();
 	Assert(result != nullptr);

Telegram/SourceFiles/auth_session.h

@@ -263,6 +263,7 @@ public:
 
 	HistoryItemsList idsToItems(const MessageIdsList &ids) const;
 	MessageIdsList itemsToIds(const HistoryItemsList &items) const;
+	MessageIdsList groupToIds(not_null<HistoryMessageGroup*> group) const;
 
 private:
 	struct Variables {

Telegram/SourceFiles/history/history_inner_widget.cpp

@@ -2465,17 +2465,6 @@ void HistoryInner::applyDragSelection() {
 	applyDragSelection(&_selected);
 }
 
-HistoryMessageGroup *HistoryInner::itemGroup(
-		not_null<HistoryItem*> item) const {
-	if (const auto group = item->Get<HistoryMessageGroup>()) {
-		if (group->leader == item) {
-			return group;
-		}
-		return group->leader->Get<HistoryMessageGroup>();
-	}
-	return nullptr;
-}
-
 bool HistoryInner::isSelected(
 		not_null<SelectedItems*> toItems,
 		not_null<HistoryItem*> item) const {
@@ -2486,7 +2475,7 @@ bool HistoryInner::isSelected(
 bool HistoryInner::isSelectedAsGroup(
 		not_null<SelectedItems*> toItems,
 		not_null<HistoryItem*> item) const {
-	if (const auto group = itemGroup(item)) {
+	if (const auto group = item->getFullGroup()) {
 		if (!isSelected(toItems, group->leader)) {
 			return false;
 		}
@@ -2557,7 +2546,7 @@ void HistoryInner::changeSelectionAsGroup(
 		not_null<SelectedItems*> toItems,
 		not_null<HistoryItem*> item,
 		SelectAction action) const {
-	const auto group = itemGroup(item);
+	const auto group = item->getFullGroup();
 	if (!group) {
 		return changeSelection(toItems, item, action);
 	}
@@ -2598,7 +2587,7 @@ void HistoryInner::forwardItem(not_null<HistoryItem*> item) {
 }
 
 void HistoryInner::forwardAsGroup(not_null<HistoryItem*> item) {
-	if (const auto group = itemGroup(item)) {
+	if (const auto group = item->getFullGroup()) {
 		auto items = Auth().data().itemsToIds(group->others);
 		items.push_back(group->leader->fullId());
 		Window::ShowForwardMessagesBox(std::move(items));
@@ -2619,13 +2608,13 @@ void HistoryInner::deleteItem(not_null<HistoryItem*> item) {
 }
 
 void HistoryInner::deleteAsGroup(not_null<HistoryItem*> item) {
-	const auto group = itemGroup(item);
+	const auto group = item->getFullGroup();
 	if (!group || group->others.empty()) {
 		return deleteItem(item);
 	}
 	auto items = Auth().data().itemsToIds(group->others);
 	items.push_back(group->leader->fullId());
-	Ui::show(Box<DeleteMessagesBox>(std::move(items)));
+	Ui::show(Box<DeleteMessagesBox>(Auth().data().groupToIds(group)));
 }
 
 void HistoryInner::addSelectionRange(

Telegram/SourceFiles/history/history_inner_widget.h

@@ -227,7 +227,6 @@ private:
 	using SelectedItems = std::map<HistoryItem*, TextSelection, std::less<>>;
 	SelectedItems _selected;
 
-	HistoryMessageGroup *itemGroup(not_null<HistoryItem*> item) const;
 	void applyDragSelection();
 	void applyDragSelection(not_null<SelectedItems*> toItems) const;
 	void addSelectionRange(

Telegram/SourceFiles/history/history_item.cpp

@@ -1198,6 +1198,16 @@ void HistoryItem::makeGroupLeader(
 	Ensures(!isHiddenByGroup());
 }
 
+HistoryMessageGroup *HistoryItem::getFullGroup() {
+	if (const auto group = Get<HistoryMessageGroup>()) {
+		if (group->leader == this) {
+			return group;
+		}
+		return group->leader->Get<HistoryMessageGroup>();
+	}
+	return nullptr;
+}
+
 void HistoryItem::resetGroupMedia(
 		const std::vector<not_null<HistoryItem*>> &others) {
 	if (!others.empty()) {

Telegram/SourceFiles/history/history_item.h

@@ -972,6 +972,7 @@ public:
 	}
 	void makeGroupMember(not_null<HistoryItem*> leader);
 	void makeGroupLeader(std::vector<not_null<HistoryItem*>> &&others);
+	HistoryMessageGroup *getFullGroup();
 
 	int width() const {
 		return _width;

Telegram/SourceFiles/history/history_message.cpp

@@ -181,27 +181,28 @@ bool HasInlineItems(const HistoryItemsList &items) {
 
 void FastShareMessage(not_null<HistoryItem*> item) {
 	struct ShareData {
-		ShareData(const FullMsgId &msgId) : msgId(msgId) {
+		ShareData(not_null<PeerData*> peer, MessageIdsList &&ids)
+		: peer(peer)
+		, msgIds(std::move(ids)) {
 		}
-		FullMsgId msgId;
+		not_null<PeerData*> peer;
-		OrderedSet<mtpRequestId> requests;
+		MessageIdsList msgIds;
+		base::flat_set<mtpRequestId> requests;
 	};
-	auto data = MakeShared<ShareData>(item->fullId());
+	const auto data = MakeShared<ShareData>(item->history()->peer, [&] {
-	auto isGame = item->getMessageBot()
+		if (const auto group = item->getFullGroup()) {
+			return Auth().data().groupToIds(group);
+		}
+		return MessageIdsList(1, item->fullId());
+	}());
+	const auto isGame = item->getMessageBot()
 		&& item->getMedia()
 		&& (item->getMedia()->type() == MediaTypeGame);
+	const auto canCopyLink = item->hasDirectLink() || isGame;
 
-	auto canCopyLink = item->hasDirectLink();
-	if (!canCopyLink) {
-		if (auto bot = item->getMessageBot()) {
-			if (auto media = item->getMedia()) {
-				canCopyLink = (media->type() == MediaTypeGame);
-			}
-		}
-	}
 	auto copyCallback = [data]() {
 		if (auto main = App::main()) {
-			if (auto item = App::histItemById(data->msgId)) {
+			if (auto item = App::histItemById(data->msgIds[0])) {
 				if (item->hasDirectLink()) {
 					QApplication::clipboard()->setText(item->directLink());
 
@@ -224,12 +225,11 @@ void FastShareMessage(not_null<HistoryItem*> item) {
 		if (!data->requests.empty()) {
 			return; // Share clicked already.
 		}
-		auto item = App::histItemById(data->msgId);
+		auto items = Auth().data().idsToItems(data->msgIds);
-		if (!item || result.empty()) {
+		if (items.empty() || result.empty()) {
 			return;
 		}
 
-		auto items = HistoryItemsList(1, item);
 		auto restrictedSomewhere = false;
 		auto restrictedEverywhere = true;
 		auto firstError = QString();
@@ -262,16 +262,32 @@ void FastShareMessage(not_null<HistoryItem*> item) {
 			}
 		};
 
-		auto sendFlags = MTPmessages_ForwardMessages::Flag::f_with_my_score;
+		auto sendFlags = MTPmessages_ForwardMessages::Flag::f_with_my_score
-		MTPVector<MTPint> msgIds = MTP_vector<MTPint>(1, MTP_int(data->msgId.msg));
+			| MTPmessages_ForwardMessages::Flag::f_grouped;
+		auto msgIds = QVector<MTPint>();
+		msgIds.reserve(data->msgIds.size());
+		for (const auto fullId : data->msgIds) {
+			msgIds.push_back(MTP_int(fullId.msg));
+		}
+		auto generateRandom = [&] {
+			auto result = QVector<MTPlong>(data->msgIds.size());
+			for (auto &value : result) {
+				value = rand_value<MTPlong>();
+			}
+			return result;
+		};
 		if (auto main = App::main()) {
 			for (const auto peer : result) {
 				if (!GetErrorTextForForward(peer, items).isEmpty()) {
 					continue;
 				}
 
-				MTPVector<MTPlong> random = MTP_vector<MTPlong>(1, rand_value<MTPlong>());
+				auto request = MTPmessages_ForwardMessages(
-				auto request = MTPmessages_ForwardMessages(MTP_flags(sendFlags), item->history()->peer->input, msgIds, random, peer->input);
+					MTP_flags(sendFlags),
+					data->peer->input,
+					MTP_vector<MTPint>(msgIds),
+					MTP_vector<MTPlong>(generateRandom()),
+					peer->input);
 				auto callback = doneCallback;
 				auto requestId = MTP::send(request, rpcDone(std::move(callback)));
 				data->requests.insert(requestId);
@@ -2361,7 +2377,7 @@ ClickHandlerPtr HistoryMessage::rightActionLink() const {
 						Window::SectionShow::Way::Forward,
 						savedFromMsgId);
 				} else {
-					FastShareMessage(item->toHistoryMessage());
+					FastShareMessage(item);
 				}
 			}
 		});

Telegram/SourceFiles/mainwidget.cpp

@@ -610,6 +610,11 @@ bool MainWidget::setForwardDraft(PeerId peerId, ForwardWhatMessages what) {
 			item = App::contextItem();
 		} else if (what == ForwardPressedMessage) {
 			item = App::pressedItem();
+			if (const auto group = item ? item->getFullGroup() : nullptr) {
+				if (item->id > 0) {
+					return Auth().data().groupToIds(group);
+				}
+			}
 		} else if (what == ForwardPressedLinkMessage) {
 			item = App::pressedLinkItem();
 		}