From a56cafb97e406be10447be59ef6b0d5c03b034e8 Mon Sep 17 00:00:00 2001 From: James Graham Date: Thu, 19 Dec 2024 19:49:37 +0000 Subject: [PATCH] Remove makeMessageTimestamp from MessageEventModel as it is now unused --- src/models/messageeventmodel.cpp | 25 ------------------------- src/models/messageeventmodel.h | 1 - 2 files changed, 26 deletions(-) diff --git a/src/models/messageeventmodel.cpp b/src/models/messageeventmodel.cpp index d6ba98a5b..99d7d8c68 100644 --- a/src/models/messageeventmodel.cpp +++ b/src/models/messageeventmodel.cpp @@ -336,31 +336,6 @@ inline bool hasValidTimestamp(const Quotient::TimelineItem &ti) return ti->originTimestamp().isValid(); } -QDateTime MessageEventModel::makeMessageTimestamp(const Quotient::Room::rev_iter_t &baseIt) const -{ - const auto &timeline = m_currentRoom->messageEvents(); - auto ts = baseIt->event()->originTimestamp(); - if (ts.isValid()) { - return ts; - } - - // The event is most likely redacted or just invalid. - // Look for the nearest date around and slap zero time to it. - using Quotient::TimelineItem; - auto rit = std::find_if(baseIt, timeline.rend(), hasValidTimestamp); - if (rit != timeline.rend()) { - return {rit->event()->originTimestamp().date(), {0, 0}, QTimeZone::LocalTime}; - }; - auto it = std::find_if(baseIt.base(), timeline.end(), hasValidTimestamp); - if (it != timeline.end()) { - return {it->event()->originTimestamp().date(), {0, 0}, QTimeZone::LocalTime}; - }; - - // What kind of room is that?.. - qCCritical(MessageEvent) << "No valid timestamps in the room timeline!"; - return {}; -} - void MessageEventModel::refreshLastUserEvents(int baseTimelineRow) { if (!m_currentRoom || m_currentRoom->timelineSize() <= baseTimelineRow) { diff --git a/src/models/messageeventmodel.h b/src/models/messageeventmodel.h index 43e0f3afc..af9e39d70 100644 --- a/src/models/messageeventmodel.h +++ b/src/models/messageeventmodel.h @@ -125,7 +125,6 @@ private: QMap> m_reactionModels; [[nodiscard]] int timelineBaseIndex() const; - [[nodiscard]] QDateTime makeMessageTimestamp(const Quotient::Room::rev_iter_t &baseIt) const; bool canFetchMore(const QModelIndex &parent) const override; void fetchMore(const QModelIndex &parent) override;