Create widgets on demand for messages added to the end of the timeline

1 files changed, 6 insertions, 22 deletions

diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cc

index 202b331d..eeac668d 100644
--- a/src/timeline/TimelineItem.cc
+++ b/src/timeline/TimelineItem.cc
@@ -84,9 +84,10 @@ TimelineItem::TimelineItem(mtx::events::MessageType ty,
 
         if (ty == mtx::events::MessageType::Emote) {
                 body            = QString("* %1 %2").arg(displayName).arg(body);
-                descriptionMsg_ = {"", userid, body, descriptiveTime(timestamp), timestamp};
+                descriptionMsg_ = {"", userid, body, utils::descriptiveTime(timestamp), timestamp};
         } else {
-                descriptionMsg_ = {"You: ", userid, body, descriptiveTime(timestamp), timestamp};
+                descriptionMsg_ = {
+                  "You: ", userid, body, utils::descriptiveTime(timestamp), timestamp};
         }
 
         body = body.toHtmlEscaped();
@@ -207,7 +208,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Notice
         descriptionMsg_ = {TimelineViewManager::displayName(sender),
                            sender,
                            " sent a notification",
-                           descriptiveTime(timestamp),
+                           utils::descriptiveTime(timestamp),
                            timestamp};
 
         generateTimestamp(timestamp);
@@ -251,7 +252,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Emote>
         auto displayName = TimelineViewManager::displayName(sender);
         auto emoteMsg    = QString("* %1 %2").arg(displayName).arg(body);
 
-        descriptionMsg_ = {"", sender, emoteMsg, descriptiveTime(timestamp), timestamp};
+        descriptionMsg_ = {"", sender, emoteMsg, utils::descriptiveTime(timestamp), timestamp};
 
         generateTimestamp(timestamp);
         emoteMsg = emoteMsg.toHtmlEscaped();
@@ -293,7 +294,7 @@ TimelineItem::TimelineItem(const mtx::events::RoomEvent<mtx::events::msg::Text>
         descriptionMsg_ = {sender == settings.value("auth/user_id") ? "You" : displayName,
                            sender,
                            QString(": %1").arg(body),
-                           descriptiveTime(timestamp),
+                           utils::descriptiveTime(timestamp),
                            timestamp};
 
         generateTimestamp(timestamp);
@@ -463,23 +464,6 @@ TimelineItem::setUserAvatar(const QImage &avatar)
         userAvatar_->setImage(avatar);
 }
 
-QString
-TimelineItem::descriptiveTime(const QDateTime &then)
-{
-        auto now = QDateTime::currentDateTime();
-
-        auto days = then.daysTo(now);
-
-        if (days == 0)
-                return then.toString("HH:mm");
-        else if (days < 2)
-                return QString("Yesterday");
-        else if (days < 365)
-                return then.toString("dd/MM");
-
-        return then.toString("dd/MM/yy");
-}
-
 TimelineItem::~TimelineItem() {}
 
 void