From cc0d6127ee90c25e4d79aad3bb90b284820e223b Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <scarpino@kde.org>
Date: Tue, 25 Aug 2020 09:00:46 +0200
Subject: [PATCH] Partially revert ffff0c3e, which made signatures static as a
 side effect

BUG: 417297
---
 helperlibs/twitterapihelper/twitterapipostwidget.cpp |  2 +-
 libchoqok/ui/postwidget.cpp                          | 11 +++++++++--
 microblogs/mastodon/mastodonpostwidget.cpp           |  2 +-
 microblogs/pumpio/pumpiopostwidget.cpp               |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/helperlibs/twitterapihelper/twitterapipostwidget.cpp b/helperlibs/twitterapihelper/twitterapipostwidget.cpp
index cf666ab8..79ee1752 100644
--- a/helperlibs/twitterapihelper/twitterapipostwidget.cpp
+++ b/helperlibs/twitterapihelper/twitterapipostwidget.cpp
@@ -119,7 +119,7 @@ QString TwitterApiPostWidget::generateSign()
         }
 
         sign += QStringLiteral("<a href=\"%1\" title=\"%2\">%3</a>").arg(currentPost()->link.toDisplayString())
-                .arg(time.toString(Qt::DefaultLocaleLongDate)).arg(formatDateTime(time));
+                .arg(time.toString(Qt::DefaultLocaleLongDate)).arg(QStringLiteral("%1"));
     }
 
     if (!currentPost()->source.isEmpty()) {
diff --git a/libchoqok/ui/postwidget.cpp b/libchoqok/ui/postwidget.cpp
index 20da3b0c..7c82fccf 100644
--- a/libchoqok/ui/postwidget.cpp
+++ b/libchoqok/ui/postwidget.cpp
@@ -160,7 +160,7 @@ QString PostWidget::generateSign()
     }
 
     ss += QStringLiteral("<a href=\"%1\" title=\"%2\">%3</a>").arg(d->mCurrentPost->link.toDisplayString())
-            .arg(time.toString(Qt::DefaultLocaleLongDate)).arg(formatDateTime(time));
+            .arg(time.toString(Qt::DefaultLocaleLongDate)).arg(QStringLiteral("%1"));
 
     if (!d->mCurrentPost->source.isEmpty()) {
         ss += QLatin1String(" - ") + d->mCurrentPost->source;
@@ -231,9 +231,16 @@ void PostWidget::initUi()
 
 void PostWidget::updateUi()
 {
+    QDateTime time;
+    if (currentPost()->repeatedDateTime.isNull()) {
+        time = currentPost()->creationDateTime;
+    } else {
+        time = currentPost()->repeatedDateTime;
+    }
+
     _mainWidget->setHtml(baseTextTemplate.arg( d->mProfileImage,                     /*1*/
                                                d->mContent,                          /*2*/
-                                               d->mSign,                             /*3*/
+                                               d->mSign.arg(formatDateTime(time)),   /*3*/
                                                d->dir,                               /*4*/
                                                d->mImage,                            /*5*/
                                                d->extraContents                      /*6*/
diff --git a/microblogs/mastodon/mastodonpostwidget.cpp b/microblogs/mastodon/mastodonpostwidget.cpp
index 93f939a1..543db39c 100644
--- a/microblogs/mastodon/mastodonpostwidget.cpp
+++ b/microblogs/mastodon/mastodonpostwidget.cpp
@@ -74,7 +74,7 @@ QString MastodonPostWidget::generateSign()
 
         ss += QStringLiteral("<a href=\"%1\" title=\"%2\">%3</a>").arg(post->link.toDisplayString())
                 .arg(post->creationDateTime.toString(Qt::DefaultLocaleLongDate))
-                .arg(formatDateTime(time));
+                .arg(QStringLiteral("%1"));
 
         if (!post->source.isEmpty()) {
             ss += QLatin1String(" - ") + post->source;
diff --git a/microblogs/pumpio/pumpiopostwidget.cpp b/microblogs/pumpio/pumpiopostwidget.cpp
index 90689746..d6853dc3 100644
--- a/microblogs/pumpio/pumpiopostwidget.cpp
+++ b/microblogs/pumpio/pumpiopostwidget.cpp
@@ -91,7 +91,7 @@ QString PumpIOPostWidget::generateSign()
         }
 
         ss += QStringLiteral("<a href=\"%1\" title=\"%2\">%3</a>").arg(currentPost()->link.toDisplayString())
-                .arg(time.toString(Qt::DefaultLocaleLongDate)).arg(formatDateTime(time));
+                .arg(time.toString(Qt::DefaultLocaleLongDate)).arg(QStringLiteral("%1"));
 
         if (!post->source.isEmpty()) {
             ss += QLatin1String(" - ") + post->source;
-- 
GitLab