From 21fdbb88ec4866176ad087dca4af5ab87a6c0768 Mon Sep 17 00:00:00 2001 From: Zed Date: Mon, 1 Jun 2020 05:50:59 +0200 Subject: [PATCH] Fix RSS retweet rendering --- src/views/rss.nimf | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/rss.nimf b/src/views/rss.nimf index 2ea4bc4..1857d8c 100644 --- a/src/views/rss.nimf +++ b/src/views/rss.nimf @@ -2,9 +2,9 @@ #import strutils, xmltree, strformat, options #import ../types, ../utils, ../formatters # -#proc getTitle(tweet: Tweet; prefs: Prefs; hostname: string): string = +#proc getTitle(tweet: Tweet; prefs: Prefs; retweet: bool): string = #if tweet.pinned: result = "Pinned: " -#elif tweet.retweet.isSome: result = "RT: " +#elif retweet: result = "RT: " #elif tweet.reply.len > 0: result = "R: " #end if #result &= xmltree.escape(stripHtml(tweet.text)) @@ -20,6 +20,7 @@ #end proc # #proc renderRssTweet(tweet: Tweet; prefs: Prefs; hostname: string): string = +#let tweet = tweet.retweet.get(tweet) #let text = replaceUrl(tweet.text, prefs, absolute=hostname) #if tweet.quote.isSome and get(tweet.quote).available: #let quoteLink = hostname & getLink(get(tweet.quote)) @@ -43,13 +44,15 @@ # #proc renderRssTweets(tweets: seq[Tweet]; prefs: Prefs; hostname: string): string = #var links: seq[string] -#for tweet in tweets: +#for t in tweets: +#let retweet = t.retweet.isSome +#let tweet = if retweet: t.retweet.get else: t #let link = getLink(tweet) #if link in links: continue #end if #links.add link - ${getTitle(tweet, prefs, hostname)} + ${getTitle(tweet, prefs, retweet)} @${tweet.profile.username} ${getRfc822Time(tweet)}