Include "Video" and link for video tweets in RSS

Fixes #836

src/parser.nim

@@ -485,7 +485,6 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
             result.before.content.add tweet
         elif entryId.startsWith("cursor-bottom"):
           var cursorValue = select(
-            e{"content", "value"},
             e{"content", "content", "value"},
             e{"content", "itemContent", "value"}
           )

src/routes/status.nim

@@ -31,6 +31,8 @@ proc createStatusRouter*(cfg: Config) =
         resp $renderReplies(replies, prefs, getPath())
 
       let conv = await getTweet(id, getCursor())
+      if conv == nil:
+        echo "nil conv"
 
       if conv == nil or conv.tweet == nil or conv.tweet.id == 0:
         var error = "Tweet not found"
@@ -66,7 +68,7 @@ proc createStatusRouter*(cfg: Config) =
 
     get "/@name/@s/@id/@m/?@i?":
       cond @"s" in ["status", "statuses"]
-      cond @"m" in ["video", "photo", "history"]
+      cond @"m" in ["video", "photo"]
       redirect("/$1/status/$2" % [@"name", @"id"])
 
     get "/@name/statuses/@id/?":

src/views/rss.nimf

@@ -25,7 +25,7 @@
 #end proc
 #
 #proc getDescription(desc: string; cfg: Config): string =
-Twitter feed for: ${desc}. Generated by ${getUrlPrefix(cfg)}
+Twitter feed for: ${desc}. Generated by ${cfg.hostname}
 #end proc
 #
 #proc getTweetsWithPinned(profile: Profile): seq[Tweets] =
@@ -51,12 +51,19 @@ Twitter feed for: ${desc}. Generated by ${getUrlPrefix(cfg)}
 #let urlPrefix = getUrlPrefix(cfg)
 #let text = replaceUrls(tweet.text, defaultPrefs, absolute=urlPrefix)
 <p>${text.replace("\n", "<br>\n")}</p>
+#if tweet.quote.isSome and get(tweet.quote).available:
+#  let quoteLink = getLink(get(tweet.quote))
+<p><a href="${urlPrefix}${quoteLink}">${cfg.hostname}${quoteLink}</a></p>
+#end if
 #if tweet.photos.len > 0:
 #  for photo in tweet.photos:
 <img src="${urlPrefix}${getPicUrl(photo)}" style="max-width:250px;" />
 #  end for
 #elif tweet.video.isSome:
-<img src="${urlPrefix}${getPicUrl(get(tweet.video).thumb)}" style="max-width:250px;" />
+<a href="${urlPrefix}${tweet.getLink}">
+<br>Video<br>
+  <img src="${urlPrefix}${getPicUrl(get(tweet.video).thumb)}" style="max-width:250px;" />
+</a>
 #elif tweet.gif.isSome:
 #  let thumb = &"{urlPrefix}{getPicUrl(get(tweet.gif).thumb)}"
 #  let url = &"{urlPrefix}{getPicUrl(get(tweet.gif).url)}"
@@ -68,20 +75,6 @@ Twitter feed for: ${desc}. Generated by ${getUrlPrefix(cfg)}
 <img src="${urlPrefix}${getPicUrl(card.image)}" style="max-width:250px;" />
 #  end if
 #end if
-#if tweet.quote.isSome and get(tweet.quote).available:
-#  let quoteTweet = get(tweet.quote)
-#  let quoteLink = urlPrefix & getLink(quoteTweet)
-<hr/>
-<blockquote>
-<b>${quoteTweet.user.fullname} (@${quoteTweet.user.username})</b>
-<p>
-${renderRssTweet(quoteTweet, cfg)}
-</p>
-<footer>
-— <cite><a href="${quoteLink}">${quoteLink}</a>
-</footer>
-</blockquote>
-#end if
 #end proc
 #
 #proc renderRssTweets(tweets: seq[Tweets]; cfg: Config; userId=""): string =