Fixed updating of parent id for file click handlers.

Fixed #16447.

Telegram/SourceFiles/data/data_file_click_handler.cpp

@@ -62,15 +62,15 @@ DocumentClickHandler::DocumentClickHandler(
 
 DocumentOpenClickHandler::DocumentOpenClickHandler(
 	not_null<DocumentData*> document,
-	Fn<void()> &&callback)
+	Fn<void(FullMsgId)> &&callback,
-: DocumentClickHandler(document)
+	FullMsgId context)
+: DocumentClickHandler(document, context)
 , _handler(std::move(callback)) {
+	Expects(_handler != nullptr);
 }
 
 void DocumentOpenClickHandler::onClickImpl() const {
-	if (_handler) {
+	_handler(context());
-		_handler();
-	}
 }
 
 void DocumentSaveClickHandler::Save(
@@ -170,15 +170,15 @@ PeerData *PhotoClickHandler::peer() const {
 
 PhotoOpenClickHandler::PhotoOpenClickHandler(
 	not_null<PhotoData*> photo,
-	Fn<void()> &&callback)
+	Fn<void(FullMsgId)> &&callback,
-: PhotoClickHandler(photo)
+	FullMsgId context)
+: PhotoClickHandler(photo, context)
 , _handler(std::move(callback)) {
+	Expects(_handler != nullptr);
 }
 
 void PhotoOpenClickHandler::onClickImpl() const {
-	if (_handler) {
+	_handler(context());
-		_handler();
-	}
 }
 
 void PhotoSaveClickHandler::onClickImpl() const {

Telegram/SourceFiles/data/data_file_click_handler.h

@@ -74,13 +74,14 @@ class DocumentOpenClickHandler : public DocumentClickHandler {
 public:
 	DocumentOpenClickHandler(
 		not_null<DocumentData*> document,
-		Fn<void()> &&callback);
+		Fn<void(FullMsgId)> &&callback,
+		FullMsgId context = FullMsgId());
 
 protected:
 	void onClickImpl() const override;
 
 private:
-	Fn<void()> _handler;
+	const Fn<void(FullMsgId)> _handler;
 
 };
 
@@ -148,13 +149,16 @@ private:
 
 class PhotoOpenClickHandler : public PhotoClickHandler {
 public:
-	PhotoOpenClickHandler(not_null<PhotoData*> photo, Fn<void()> &&callback);
+	PhotoOpenClickHandler(
+		not_null<PhotoData*> photo,
+		Fn<void(FullMsgId)> &&callback,
+		FullMsgId context = FullMsgId());
 
 protected:
 	void onClickImpl() const override;
 
 private:
-	Fn<void()> _handler;
+	const Fn<void(FullMsgId)> _handler;
 
 };
 

Telegram/SourceFiles/history/view/media/history_view_document.cpp

@@ -221,7 +221,9 @@ void Document::createComponents(bool caption) {
 			_realParent->fullId());
 	}
 	if (const auto voice = Get<HistoryDocumentVoice>()) {
-		voice->_seekl = std::make_shared<VoiceSeekClickHandler>(_data, [] {});
+		voice->_seekl = std::make_shared<VoiceSeekClickHandler>(
+			_data,
+			[](FullMsgId) {});
 	}
 }
 

Telegram/SourceFiles/history/view/media/history_view_file.cpp

@@ -48,7 +48,7 @@ void File::clickHandlerPressedChanged(
 }
 
 void File::setLinks(
-		ClickHandlerPtr &&openl,
+		FileClickHandlerPtr &&openl,
 		FileClickHandlerPtr &&savel,
 		FileClickHandlerPtr &&cancell) {
 	_openl = std::move(openl);
@@ -58,6 +58,7 @@ void File::setLinks(
 
 void File::refreshParentId(not_null<HistoryItem*> realParent) {
 	const auto contextId = realParent->fullId();
+	_openl->setMessageId(contextId);
 	_savel->setMessageId(contextId);
 	_cancell->setMessageId(contextId);
 }
@@ -114,9 +115,10 @@ void File::setDocumentLinks(
 	setLinks(
 		std::make_shared<DocumentOpenClickHandler>(
 			document,
-			crl::guard(this, [=] {
+			crl::guard(this, [=](FullMsgId id) {
-				_parent->delegate()->elementOpenDocument(document, context);
+				_parent->delegate()->elementOpenDocument(document, id);
-			})),
+			}),
+			context),
 		std::make_shared<DocumentSaveClickHandler>(document, context),
 		std::make_shared<DocumentCancelClickHandler>(document, context));
 }

Telegram/SourceFiles/history/view/media/history_view_file.h

@@ -44,11 +44,10 @@ protected:
 	using FileClickHandlerPtr = std::shared_ptr<FileClickHandler>;
 
 	not_null<HistoryItem*> _realParent;
-	ClickHandlerPtr _openl;
+	FileClickHandlerPtr _openl, _savel, _cancell;
-	FileClickHandlerPtr _savel, _cancell;
 
 	void setLinks(
-		ClickHandlerPtr &&openl,
+		FileClickHandlerPtr &&openl,
 		FileClickHandlerPtr &&savel,
 		FileClickHandlerPtr &&cancell);
 	void setDocumentLinks(

Telegram/SourceFiles/history/view/media/history_view_photo.cpp

@@ -87,9 +87,10 @@ Photo::~Photo() {
 
 void Photo::create(FullMsgId contextId, PeerData *chat) {
 	setLinks(
-		std::make_shared<PhotoOpenClickHandler>(_data, crl::guard(this, [=] {
+		std::make_shared<PhotoOpenClickHandler>(
-			showPhoto();
+			_data,
-		})),
+			crl::guard(this, [=](FullMsgId id) { showPhoto(id); }),
+			contextId),
 		std::make_shared<PhotoSaveClickHandler>(_data, contextId, chat),
 		std::make_shared<PhotoCancelClickHandler>(_data, contextId, chat));
 	if ((_dataMedia = _data->activeMediaView())) {
@@ -774,7 +775,7 @@ void Photo::playAnimation(bool autoplay) {
 	if (_streamed && autoplay) {
 		return;
 	} else if (_streamed && videoAutoplayEnabled()) {
-		showPhoto();
+		showPhoto(_parent->data()->fullId());
 		return;
 	}
 	if (_streamed) {
@@ -847,10 +848,8 @@ void Photo::parentTextUpdated() {
 	history()->owner().requestViewResize(_parent);
 }
 
-void Photo::showPhoto() {
+void Photo::showPhoto(FullMsgId id) {
-	_parent->delegate()->elementOpenPhoto(
+	_parent->delegate()->elementOpenPhoto(_data, id);
-		_data,
-		_parent->data()->fullId());
 }
 
 } // namespace HistoryView

Telegram/SourceFiles/history/view/media/history_view_photo.h

@@ -102,7 +102,7 @@ protected:
 private:
 	struct Streamed;
 
-	void showPhoto();
+	void showPhoto(FullMsgId id);
 
 	void create(FullMsgId contextId, PeerData *chat = nullptr);
 

Telegram/SourceFiles/history/view/media/history_view_sticker.cpp

@@ -287,11 +287,10 @@ void Sticker::refreshLink() {
 		// .webp image and we allow to open it in media viewer.
 		_link = std::make_shared<DocumentOpenClickHandler>(
 			_data,
-			crl::guard(this, [=] {
+			crl::guard(this, [=](FullMsgId id) {
-				_parent->delegate()->elementOpenDocument(
+				_parent->delegate()->elementOpenDocument(_data, id);
-					_data,
+			}),
-					_parent->data()->fullId());
+			_parent->data()->fullId());
-			}));
 	}
 }
 

Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp

@@ -2276,9 +2276,7 @@ void OverlayWidget::show(OpenRequest request) {
 		}
 
 		clearControlsState();
-		if (contextPeer) {
+		_firstOpenedPeerPhoto = (contextPeer != nullptr);
-			_firstOpenedPeerPhoto = true;
-		}
 		assignMediaPointer(photo);
 
 		displayPhoto(photo, contextPeer ? nullptr : contextItem);

Telegram/SourceFiles/overview/overview_layout.cpp

@@ -188,9 +188,10 @@ void RadialProgressItem::setDocumentLinks(
 	setLinks(
 		std::make_shared<DocumentOpenClickHandler>(
 			document,
-			crl::guard(this, [=] {
+			crl::guard(this, [=](FullMsgId id) {
-				delegate()->openDocument(document, context);
+				delegate()->openDocument(document, id);
-			})),
+			}),
+			context),
 		std::make_shared<DocumentSaveClickHandler>(document, context),
 		std::make_shared<DocumentCancelClickHandler>(document, context));
 }
@@ -277,9 +278,10 @@ Photo::Photo(
 	not_null<PhotoData*> photo)
 : ItemBase(delegate, parent)
 , _data(photo)
-, _link(std::make_shared<PhotoOpenClickHandler>(photo, crl::guard(this, [=] {
+, _link(std::make_shared<PhotoOpenClickHandler>(
-	delegate->openPhoto(photo, parent->fullId());
+	photo,
-}))) {
+	crl::guard(this, [=](FullMsgId id) { delegate->openPhoto(photo, id); }),
+	parent->fullId())) {
 	if (_data->inlineThumbnailBytes().isEmpty()
 		&& (_data->hasExact(Data::PhotoSize::Small)
 			|| _data->hasExact(Data::PhotoSize::Thumbnail))) {
@@ -602,9 +604,10 @@ Voice::Voice(
 , _data(voice)
 , _namel(std::make_shared<DocumentOpenClickHandler>(
 	_data,
-	crl::guard(this, [=] {
+	crl::guard(this, [=](FullMsgId id) {
-		delegate->openDocument(_data, parent->fullId());
+		delegate->openDocument(_data, id);
-	})))
+	}),
+	parent->fullId()))
 , _st(st) {
 	AddComponents(Info::Bit());
 
@@ -913,9 +916,10 @@ Document::Document(
 , _msgl(goToMessageClickHandler(parent))
 , _namel(std::make_shared<DocumentOpenClickHandler>(
 	_data,
-	crl::guard(this, [=] {
+	crl::guard(this, [=](FullMsgId id) {
-		delegate->openDocument(_data, parent->fullId());
+		delegate->openDocument(_data, id);
-	})))
+	}),
+	parent->fullId()))
 , _st(st)
 , _date(langDateTime(base::unixtime::parse(_data->date)))
 , _datew(st::normalFont->width(_date))
@@ -1469,9 +1473,10 @@ Link::Link(
 		if (_page->document) {
 			_photol = std::make_shared<DocumentOpenClickHandler>(
 				_page->document,
-				crl::guard(this, [=] {
+				crl::guard(this, [=](FullMsgId id) {
-					delegate->openDocument(_page->document, parent->fullId());
+					delegate->openDocument(_page->document, id);
-				}));
+				}),
+				parent->fullId());
 		} else if (_page->photo) {
 			if (_page->type == WebPageType::Profile || _page->type == WebPageType::Video) {
 				_photol = createHandler(_page->url);
@@ -1480,9 +1485,10 @@ Link::Link(
 				|| _page->siteName == qstr("Facebook")) {
 				_photol = std::make_shared<PhotoOpenClickHandler>(
 					_page->photo,
-					crl::guard(this, [=] {
+					crl::guard(this, [=](FullMsgId id) {
-						delegate->openPhoto(_page->photo, parent->fullId());
+						delegate->openPhoto(_page->photo, id);
-					}));
+					}),
+					parent->fullId());
 			} else {
 				_photol = createHandler(_page->url);
 			}