Add replying to and quoting text where applicable
This commit is contained in:
parent
396322772f
commit
1cf37e4e84
4 changed files with 53 additions and 24 deletions
|
@ -208,6 +208,7 @@ proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull()): Tweet =
|
||||||
id: js{"id_str"}.getId,
|
id: js{"id_str"}.getId,
|
||||||
threadId: js{"conversation_id_str"}.getId,
|
threadId: js{"conversation_id_str"}.getId,
|
||||||
replyId: js{"in_reply_to_status_id_str"}.getId,
|
replyId: js{"in_reply_to_status_id_str"}.getId,
|
||||||
|
replyHandle: js{"in_reply_to_screen_name"}.getStr,
|
||||||
text: js{"full_text"}.getStr,
|
text: js{"full_text"}.getStr,
|
||||||
time: js{"created_at"}.getTime,
|
time: js{"created_at"}.getTime,
|
||||||
hasThread: js{"self_thread"}.notNull,
|
hasThread: js{"self_thread"}.notNull,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# SPDX-License-Identifier: AGPL-3.0-only
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
import asyncdispatch, strutils, sequtils, uri, options, sugar
|
import asyncdispatch, strutils, sequtils, uri, options, sugar, strformat
|
||||||
|
|
||||||
import jester, karax/vdom
|
import jester, karax/vdom
|
||||||
|
|
||||||
|
@ -64,30 +64,43 @@ proc createStatusRouter*(cfg: Config) =
|
||||||
resp Http404, showError(error, cfg)
|
resp Http404, showError(error, cfg)
|
||||||
|
|
||||||
let
|
let
|
||||||
title = pageTitle(conv.tweet)
|
tweet = conv.tweet
|
||||||
ogTitle = pageTitle(conv.tweet.user)
|
title = pageTitle(tweet)
|
||||||
desc = conv.tweet.text
|
ogTitle = pageTitle(tweet.user)
|
||||||
avatar = conv.tweet.user.userPic
|
desc = tweet.text
|
||||||
time = some(conv.tweet.time)
|
avatar = tweet.user.userPic
|
||||||
|
time = some(tweet.time)
|
||||||
|
|
||||||
var
|
var
|
||||||
images = conv.tweet.photos
|
images = tweet.photos
|
||||||
video = ""
|
video = ""
|
||||||
|
context = ""
|
||||||
|
contextUrl = ""
|
||||||
|
|
||||||
if conv.tweet.video.isSome():
|
if tweet.quote.isSome():
|
||||||
let videoObj = get(conv.tweet.video)
|
let
|
||||||
|
quote = tweet.quote.get()
|
||||||
|
quoteUser = quote.user
|
||||||
|
context = &"↘ Quoting: {quoteUser.fullname} (@{quoteUser.username})"
|
||||||
|
contextUrl = &"{getUrlPrefix(cfg)}/i/status/{quote.id}"
|
||||||
|
elif tweet.replyId != 0:
|
||||||
|
context = &"↩ Replying to: @{tweet.replyHandle}"
|
||||||
|
contextUrl = &"{getUrlPrefix(cfg)}/i/status/{tweet.replyId}"
|
||||||
|
|
||||||
|
if tweet.video.isSome():
|
||||||
|
let videoObj = get(tweet.video)
|
||||||
images = @[videoObj.thumb]
|
images = @[videoObj.thumb]
|
||||||
|
|
||||||
let vars = videoObj.variants.filterIt(it.contentType == mp4)
|
let vars = videoObj.variants.filterIt(it.contentType == mp4)
|
||||||
# idk why this wont sort when it sorts everywhere else
|
# idk why this wont sort when it sorts everywhere else
|
||||||
#video = vars.sortedByIt(it.bitrate)[^1].url
|
#video = vars.sortedByIt(it.bitrate)[^1].url
|
||||||
video = vars[^1].url
|
video = vars[^1].url
|
||||||
elif conv.tweet.gif.isSome():
|
elif tweet.gif.isSome():
|
||||||
let gif = get(conv.tweet.gif)
|
let gif = get(tweet.gif)
|
||||||
images = @[gif.thumb]
|
images = @[gif.thumb]
|
||||||
video = getPicUrl(gif.url)
|
video = getPicUrl(gif.url)
|
||||||
#elif conv.tweet.card.isSome():
|
#elif tweet.card.isSome():
|
||||||
# let card = conv.tweet.card.get()
|
# let card = tweet.card.get()
|
||||||
# if card.image.len > 0:
|
# if card.image.len > 0:
|
||||||
# images = @[card.image]
|
# images = @[card.image]
|
||||||
# elif card.video.isSome():
|
# elif card.video.isSome():
|
||||||
|
@ -95,7 +108,8 @@ proc createStatusRouter*(cfg: Config) =
|
||||||
|
|
||||||
let html = renderConversation(conv, prefs, getPath() & "#m")
|
let html = renderConversation(conv, prefs, getPath() & "#m")
|
||||||
resp renderMain(html, request, cfg, prefs, title, desc, ogTitle,
|
resp renderMain(html, request, cfg, prefs, title, desc, ogTitle,
|
||||||
images=images, video=video, avatar=avatar, time=time)
|
images=images, video=video, avatar=avatar, time=time,
|
||||||
|
context=context, contextUrl=contextUrl)
|
||||||
|
|
||||||
get "/@name/@s/@id/@m/?@i?":
|
get "/@name/@s/@id/@m/?@i?":
|
||||||
cond @"s" in ["status", "statuses"]
|
cond @"s" in ["status", "statuses"]
|
||||||
|
|
|
@ -211,6 +211,7 @@ type
|
||||||
text*: string
|
text*: string
|
||||||
time*: DateTime
|
time*: DateTime
|
||||||
reply*: seq[string]
|
reply*: seq[string]
|
||||||
|
replyHandle*: string
|
||||||
pinned*: bool
|
pinned*: bool
|
||||||
hasThread*: bool
|
hasThread*: bool
|
||||||
available*: bool
|
available*: bool
|
||||||
|
|
|
@ -38,7 +38,7 @@ proc renderNavbar(cfg: Config; req: Request; rss, canonical: string): VNode =
|
||||||
|
|
||||||
proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
|
proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
|
||||||
video=""; images: seq[string] = @[]; banner=""; ogTitle="";
|
video=""; images: seq[string] = @[]; banner=""; ogTitle="";
|
||||||
rss=""; canonical=""; avatar="";
|
rss=""; canonical=""; avatar=""; context=""; contextUrl="";
|
||||||
time: Option[DateTime] = none(DateTime)): VNode =
|
time: Option[DateTime] = none(DateTime)): VNode =
|
||||||
var theme = prefs.theme.toTheme
|
var theme = prefs.theme.toTheme
|
||||||
if "theme" in req.params:
|
if "theme" in req.params:
|
||||||
|
@ -140,16 +140,28 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
|
||||||
meta(property="og:video:url", content=video)
|
meta(property="og:video:url", content=video)
|
||||||
meta(property="og:video:secure_url", content=video)
|
meta(property="og:video:secure_url", content=video)
|
||||||
meta(property="og:video:type", content="video/mp4")
|
meta(property="og:video:type", content="video/mp4")
|
||||||
var title = encodeUrl(finalizedDesc)
|
|
||||||
var author = encodeUrl(finalizedTitleText)
|
var
|
||||||
|
title = encodeUrl(finalizedDesc)
|
||||||
|
author = encodeUrl(finalizedTitleText)
|
||||||
|
url = req.path
|
||||||
|
|
||||||
if len(finalizedDesc) > 67:
|
if len(finalizedDesc) > 67:
|
||||||
title = author
|
title = author
|
||||||
author = encodeUrl(finalizedDesc)
|
author = encodeUrl(finalizedDesc)
|
||||||
|
|
||||||
verbatim &"<link rel=\"alternate\" href=\"{getUrlPrefix(cfg)}/oembed.json?type=video&provider={encodeUrl(siteName)}&title={title}&user={author}&url={encodeUrl(req.path)}\" type=\"application/json+oembed\" />"
|
if context != "":
|
||||||
#link(rel="alternate",
|
author = encodeUrl(context & "\n") & author
|
||||||
# href=&"{getUrlPrefix(cfg)}/oembed.json?type=video&title={encodeUrl(stripHtml(desc))}&user={encodeUrl(finalizedTitleText)}&url={encodeUrl(req.path)}",
|
|
||||||
# `type`="application/json+oembed")
|
if contextUrl != "":
|
||||||
|
url = contextUrl
|
||||||
|
|
||||||
|
verbatim &"<link rel=\"alternate\" href=\"{getUrlPrefix(cfg)}/oembed.json?type=video&provider={encodeUrl(siteName)}&title={title}&user={author}&url={encodeUrl(url)}\" type=\"application/json+oembed\" />"
|
||||||
|
elif context != "" and contextUrl != "":
|
||||||
|
var
|
||||||
|
title = encodeUrl(finalizedTitleText)
|
||||||
|
author = encodeUrl(context)
|
||||||
|
verbatim &"<link rel=\"alternate\" href=\"{getUrlPrefix(cfg)}/oembed.json?type=video&provider={encodeUrl(siteName)}&title={title}&user={author}&url={encodeUrl(contextUrl)}\" type=\"application/json+oembed\" />"
|
||||||
|
|
||||||
# this is last so images are also preloaded
|
# this is last so images are also preloaded
|
||||||
# if this is done earlier, Chrome only preloads one image for some reason
|
# if this is done earlier, Chrome only preloads one image for some reason
|
||||||
|
@ -158,14 +170,15 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
|
||||||
|
|
||||||
proc renderMain*(body: VNode; req: Request; cfg: Config; prefs=defaultPrefs;
|
proc renderMain*(body: VNode; req: Request; cfg: Config; prefs=defaultPrefs;
|
||||||
titleText=""; desc=""; ogTitle=""; rss=""; video="";
|
titleText=""; desc=""; ogTitle=""; rss=""; video="";
|
||||||
images: seq[string] = @[]; banner=""; avatar="";
|
images: seq[string] = @[]; banner=""; avatar=""; context="";
|
||||||
time: Option[DateTime] = none(DateTime)): string =
|
contextUrl = ""; time: Option[DateTime] = none(DateTime)
|
||||||
|
): string =
|
||||||
|
|
||||||
let canonical = getTwitterLink(req.path, req.params)
|
let canonical = getTwitterLink(req.path, req.params)
|
||||||
|
|
||||||
let node = buildHtml(html(lang="en")):
|
let node = buildHtml(html(lang="en")):
|
||||||
renderHead(prefs, cfg, req, titleText, desc, video, images, banner, ogTitle,
|
renderHead(prefs, cfg, req, titleText, desc, video, images, banner, ogTitle,
|
||||||
rss, canonical, avatar, time)
|
rss, canonical, avatar, context, contextUrl, time)
|
||||||
|
|
||||||
body:
|
body:
|
||||||
renderNavbar(cfg, req, rss, canonical)
|
renderNavbar(cfg, req, rss, canonical)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue