From e04b6e9201d0d1a3a2287fc9a772d06672a98074 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Mon, 9 Feb 2026 18:15:37 +0300 Subject: [PATCH] Moved PeerId parameter to SearchCalendarController constructor. --- Telegram/SourceFiles/data/data_search_calendar.cpp | 5 +++-- Telegram/SourceFiles/data/data_search_calendar.h | 3 ++- Telegram/SourceFiles/window/window_session_controller.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/data/data_search_calendar.cpp b/Telegram/SourceFiles/data/data_search_calendar.cpp index d9f74ac352..31e5464ec6 100644 --- a/Telegram/SourceFiles/data/data_search_calendar.cpp +++ b/Telegram/SourceFiles/data/data_search_calendar.cpp @@ -23,18 +23,19 @@ namespace Api { SearchCalendarController::SearchCalendarController( not_null session, + PeerId peerId, Storage::SharedMediaType type) : _session(session) +, _peerId(peerId) , _type(type) { } void SearchCalendarController::monthThumbnails( - PeerId peerId, TimeId date, Fn)> onFinish) { const auto parsed = base::unixtime::parse(date).date(); const auto key = MonthKey{ - .peerId = peerId, + .peerId = _peerId, .year = parsed.year(), .month = parsed.month(), }; diff --git a/Telegram/SourceFiles/data/data_search_calendar.h b/Telegram/SourceFiles/data/data_search_calendar.h index 88304a2885..eaab6c23c9 100644 --- a/Telegram/SourceFiles/data/data_search_calendar.h +++ b/Telegram/SourceFiles/data/data_search_calendar.h @@ -42,10 +42,10 @@ class SearchCalendarController final { public: SearchCalendarController( not_null session, + PeerId peerId, Storage::SharedMediaType type); void monthThumbnails( - PeerId peerId, TimeId date, Fn)> onFinish); @@ -81,6 +81,7 @@ private: bool noMoreData); const not_null _session; + const PeerId _peerId; const Storage::SharedMediaType _type; base::flat_map _months; diff --git a/Telegram/SourceFiles/window/window_session_controller.cpp b/Telegram/SourceFiles/window/window_session_controller.cpp index f9ead8639a..c6f5a41096 100644 --- a/Telegram/SourceFiles/window/window_session_controller.cpp +++ b/Telegram/SourceFiles/window/window_session_controller.cpp @@ -2818,6 +2818,7 @@ void SessionController::showCalendar(ShowCalendarDescriptor &&descriptor) { } const auto search = std::make_shared( &session(), + history->peer->id, (descriptor.mediaPhoto && descriptor.mediaVideo) ? Storage::SharedMediaType::PhotoVideo : descriptor.mediaPhoto @@ -2825,7 +2826,6 @@ void SessionController::showCalendar(ShowCalendarDescriptor &&descriptor) { : Storage::SharedMediaType::Video); return (ReturnType)[=](QDate date, Ui::CalendarImageSetter set) { search->monthThumbnails( - peerId, base::unixtime::serialize(QDateTime(date, QTime())), [=](const std::vector &thumbnails) { for (const auto &thumb : thumbnails) {