From ac41c7af69f849056691354d2ded3f21c76b7b97 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 18 Apr 2020 16:27:19 -0500
Subject: [PATCH] Added timestamp to retweets

---
 .../FeedProvider/Twitter/TwitterStatus.swift    | 17 +++++++++++++----
 Mac/MainWindow/Detail/styleSheet.css            |  4 ++++
 iOS/Resources/styleSheet.css                    |  4 ++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Frameworks/Account/FeedProvider/Twitter/TwitterStatus.swift b/Frameworks/Account/FeedProvider/Twitter/TwitterStatus.swift
index c661217fa..62f429371 100644
--- a/Frameworks/Account/FeedProvider/Twitter/TwitterStatus.swift
+++ b/Frameworks/Account/FeedProvider/Twitter/TwitterStatus.swift
@@ -66,12 +66,21 @@ final class TwitterStatus: Codable {
 		return renderAsOriginalHTML(topLevel: topLevel)
 	}
 	
-	func renderAsTweetHTML(_ status: TwitterStatus) -> String {
-		return status.displayText ?? ""
+	func renderAsTweetHTML(_ status: TwitterStatus, topLevel: Bool) -> String {
+		var html = "<div>\(status.displayText ?? "")</div>"
+		
+		if !topLevel, let createdAt = status.createdAt {
+			let dateFormatter = DateFormatter()
+			dateFormatter.dateStyle = .medium
+			dateFormatter.timeStyle = .short
+			html += "<div class=\"twitterTimestamp\">\(dateFormatter.string(from: createdAt))</div>"
+		}
+		
+		return html
 	}
 	
 	func renderAsOriginalHTML(topLevel: Bool) -> String {
-		var html = renderAsTweetHTML(self)
+		var html = renderAsTweetHTML(self, topLevel: topLevel)
 		if topLevel {
 			html += extendedEntities?.renderAsHTML() ?? ""
 		}
@@ -93,7 +102,7 @@ final class TwitterStatus: Codable {
 	
 	func renderAsQuoteHTML(_ quotedStatus: TwitterStatus, topLevel: Bool) -> String {
 		var html = String()
-		html += renderAsTweetHTML(self)
+		html += renderAsTweetHTML(self, topLevel: topLevel)
 		html += "<blockquote>"
 		if let userHTML = quotedStatus.user?.renderAsHTML() {
 			html += userHTML
diff --git a/Mac/MainWindow/Detail/styleSheet.css b/Mac/MainWindow/Detail/styleSheet.css
index 32e3e3926..c5cc8557b 100644
--- a/Mac/MainWindow/Detail/styleSheet.css
+++ b/Mac/MainWindow/Detail/styleSheet.css
@@ -258,6 +258,10 @@ blockquote {
 	vertical-align: middle;
 }
 
+.twitterTimestamp {
+	font-size: 66%;
+}
+
 /*Block ads and junk*/
 
 iframe[src*="feedads"],
diff --git a/iOS/Resources/styleSheet.css b/iOS/Resources/styleSheet.css
index 3138bf79a..4efbc456d 100644
--- a/iOS/Resources/styleSheet.css
+++ b/iOS/Resources/styleSheet.css
@@ -287,6 +287,10 @@ blockquote {
 	vertical-align: middle;
 }
 
+.twitterTimestamp {
+	font-size: 66%;
+}
+
 /*Block ads and junk*/
 
 iframe[src*="feedads"],