Preload profile/tweet images, banners, and icons
This commit is contained in:
parent
768642a2cc
commit
ed7ecf7c8d
3 changed files with 20 additions and 5 deletions
|
@ -15,7 +15,7 @@ template respList*(list, timeline, vnode: typed) =
|
||||||
html = renderList(vnode, timeline.query, list)
|
html = renderList(vnode, timeline.query, list)
|
||||||
rss = "/$1/lists/$2/rss" % [@"name", @"list"]
|
rss = "/$1/lists/$2/rss" % [@"name", @"list"]
|
||||||
|
|
||||||
resp renderMain(html, request, cfg, prefs, rss=rss)
|
resp renderMain(html, request, cfg, prefs, rss=rss, banner=list.banner)
|
||||||
|
|
||||||
proc createListRouter*(cfg: Config) =
|
proc createListRouter*(cfg: Config) =
|
||||||
router list:
|
router list:
|
||||||
|
|
|
@ -95,7 +95,8 @@ proc showTimeline*(request: Request; query: Query; cfg: Config; prefs: Prefs;
|
||||||
|
|
||||||
let pHtml = renderProfile(p, t, r, prefs, getPath())
|
let pHtml = renderProfile(p, t, r, prefs, getPath())
|
||||||
result = renderMain(pHtml, request, cfg, prefs, pageTitle(p), pageDesc(p),
|
result = renderMain(pHtml, request, cfg, prefs, pageTitle(p), pageDesc(p),
|
||||||
rss=rss, images = @[p.getUserpic("_400x400")])
|
rss=rss, images = @[p.getUserpic("_400x400")],
|
||||||
|
banner=p.banner)
|
||||||
|
|
||||||
template respTimeline*(timeline: typed) =
|
template respTimeline*(timeline: typed) =
|
||||||
let t = timeline
|
let t = timeline
|
||||||
|
|
|
@ -32,7 +32,8 @@ proc renderNavbar*(title, rss: string; req: Request): VNode =
|
||||||
iconReferer "cog", "/settings", path, title="Preferences"
|
iconReferer "cog", "/settings", path, title="Preferences"
|
||||||
|
|
||||||
proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video="";
|
proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video="";
|
||||||
images: seq[string] = @[]; ogTitle=""; theme=""; rss=""): VNode =
|
images: seq[string] = @[]; banner=""; ogTitle=""; theme="";
|
||||||
|
rss=""): VNode =
|
||||||
let ogType =
|
let ogType =
|
||||||
if video.len > 0: "video"
|
if video.len > 0: "video"
|
||||||
elif rss.len > 0: "object"
|
elif rss.len > 0: "object"
|
||||||
|
@ -83,7 +84,15 @@ proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video="";
|
||||||
meta(property="og:site_name", content="Nitter")
|
meta(property="og:site_name", content="Nitter")
|
||||||
meta(property="og:locale", content="en_US")
|
meta(property="og:locale", content="en_US")
|
||||||
|
|
||||||
|
if banner.len > 0:
|
||||||
|
let bannerUrl = getPicUrl(banner)
|
||||||
|
link(rel="preload", type="image/png", href=getPicUrl(banner), `as`="image")
|
||||||
|
|
||||||
for url in images:
|
for url in images:
|
||||||
|
let suffix = if "400x400" in url: "" else: "?name=small"
|
||||||
|
let preloadUrl = getPicUrl(url & suffix)
|
||||||
|
link(rel="preload", type="image/png", href=preloadUrl, `as`="image")
|
||||||
|
|
||||||
let image = "https://" & cfg.hostname & getPicUrl(url)
|
let image = "https://" & cfg.hostname & getPicUrl(url)
|
||||||
meta(property="og:image", content=image)
|
meta(property="og:image", content=image)
|
||||||
meta(property="twitter:image:src", content=image)
|
meta(property="twitter:image:src", content=image)
|
||||||
|
@ -98,15 +107,20 @@ proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video="";
|
||||||
meta(property="og:video:secure_url", content=video)
|
meta(property="og:video:secure_url", content=video)
|
||||||
meta(property="og:video:type", content="text/html")
|
meta(property="og:video:type", content="text/html")
|
||||||
|
|
||||||
|
# this is last so images are also preloaded
|
||||||
|
# if this is done earlier, Chrome only preloads one image for some reason
|
||||||
|
link(rel="preload", type="font/woff2", `as`="font",
|
||||||
|
href="/fonts/fontello.woff2?21002321", crossorigin="anonymous")
|
||||||
|
|
||||||
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] = @[]): string =
|
images: seq[string] = @[]; banner=""): string =
|
||||||
var theme = toLowerAscii(prefs.theme).replace(" ", "_")
|
var theme = toLowerAscii(prefs.theme).replace(" ", "_")
|
||||||
if "theme" in req.params:
|
if "theme" in req.params:
|
||||||
theme = toLowerAscii(req.params["theme"]).replace(" ", "_")
|
theme = toLowerAscii(req.params["theme"]).replace(" ", "_")
|
||||||
|
|
||||||
let node = buildHtml(html(lang="en")):
|
let node = buildHtml(html(lang="en")):
|
||||||
renderHead(prefs, cfg, titleText, desc, video, images, ogTitle, theme, rss)
|
renderHead(prefs, cfg, titleText, desc, video, images, banner, ogTitle, theme, rss)
|
||||||
|
|
||||||
body:
|
body:
|
||||||
renderNavbar(cfg.title, rss, req)
|
renderNavbar(cfg.title, rss, req)
|
||||||
|
|
Loading…
Reference in a new issue