From 240ce15651cb7b8968344c9822313fd5ec9bc1b0 Mon Sep 17 00:00:00 2001 From: Zed Date: Sun, 29 Mar 2020 23:20:00 +0200 Subject: [PATCH] Revert og:title for tweets --- src/routes/status.nim | 4 +++- src/views/general.nim | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/routes/status.nim b/src/routes/status.nim index a2870e9..9e6071f 100644 --- a/src/routes/status.nim +++ b/src/routes/status.nim @@ -26,6 +26,7 @@ proc createStatusRouter*(cfg: Config) = var title = pageTitle(conversation.tweet) + ogTitle = pageTitle(conversation.tweet.profile) desc = conversation.tweet.text images = conversation.tweet.photos video = "" @@ -38,7 +39,8 @@ proc createStatusRouter*(cfg: Config) = video = getGifUrl(get(conversation.tweet.gif).url) let html = renderConversation(conversation, prefs, getPath() & "#m") - resp renderMain(html, request, cfg, title, desc, images=images, video=video) + resp renderMain(html, request, cfg, title, desc, + images=images, video=video, ogTitle=ogTitle) get "/@name/@s/@id/@m/?@i?": cond @"s" in ["status", "statuses"] diff --git a/src/views/general.nim b/src/views/general.nim index 41a22c7..9655c50 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -29,7 +29,7 @@ proc renderNavbar*(title, rss: string; req: Request): VNode = iconReferer "cog", "/settings", path, title="Preferences" proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video=""; - images: seq[string] = @[]): VNode = + images: seq[string] = @[]; ogTitle=""): VNode = let ogType = if video.len > 0: "video" elif images.len > 0: "photo" @@ -67,7 +67,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video=""; meta(name="viewport", content="width=device-width, initial-scale=1.0") meta(property="og:type", content=ogType) - meta(property="og:title", content=titleText) + meta(property="og:title", content=(if ogTitle.len > 0: ogTitle else: titleText)) meta(property="og:description", content=stripHtml(desc)) meta(property="og:site_name", content="Nitter") meta(property="og:locale", content="en_US") @@ -81,12 +81,12 @@ proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video=""; meta(property="og:video:type", content="text/html") proc renderMain*(body: VNode; req: Request; cfg: Config; titleText=""; desc=""; - rss=""; video=""; images: seq[string] = @[]): string = + rss=""; video=""; images: seq[string] = @[]; ogTitle=""): string = let prefs = getPrefs(req.cookies.getOrDefault("preferences"), cfg) let theme = toLowerAscii(prefs.theme).replace(" ", "_") let node = buildHtml(html(lang="en")): - renderHead(prefs, cfg, titleText, desc, video, images): + renderHead(prefs, cfg, titleText, desc, video, images, ogTitle): if theme.len > 0: link(rel="stylesheet", `type`="text/css", href=(&"/css/themes/{theme}.css"))