From 4407651ed694abab26d68ec0b4989d79e739ca0d Mon Sep 17 00:00:00 2001 From: Zed Date: Thu, 10 Oct 2019 17:47:02 +0200 Subject: [PATCH] Minor cleanup, fix empty lines before card links --- src/formatters.nim | 8 ++++---- src/parserutils.nim | 3 ++- src/views/general.nim | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/formatters.nim b/src/formatters.nim index ea61ce0..c9aa369 100644 --- a/src/formatters.nim +++ b/src/formatters.nim @@ -16,6 +16,10 @@ const hostname {.strdefine.} = "nitter.net" proc stripText*(text: string): string = text.replace(nbsp, " ").strip() +proc stripHtml*(text: string): string = + let html = parseHtml(text) + html.innerText() + proc shortLink*(text: string; length=28): string = result = text.replace(re"https?://(www.)?", "") if result.len > length: @@ -93,7 +97,3 @@ proc getTwitterLink*(path: string; params: Table[string, string]): string = result = $(parseUri("https://twitter.com") / path ? p) if username.len > 0: result = result.replace("/" & username, "") - -proc getTweetPreview*(text: string): string = - let html = parseHtml(text) - html.innerText() diff --git a/src/parserutils.nim b/src/parserutils.nim index b2b5bec..37e03ca 100644 --- a/src/parserutils.nim +++ b/src/parserutils.nim @@ -57,7 +57,8 @@ proc parseText*(text: XmlNode; skipLink=""): string = if "data-expanded-url" in el.attrs: let url = el.attr("data-expanded-url") if url == skipLink: continue - elif "u-hidden" in class: result.add "\n" + if "u-hidden" in class and result.len > 0: + result.add "\n" result.add a(shortLink(url), href=url) elif "ashtag" in class: let hash = el.innerText() diff --git a/src/views/general.nim b/src/views/general.nim index dbb4bac..0ff46b1 100644 --- a/src/views/general.nim +++ b/src/views/general.nim @@ -57,7 +57,7 @@ proc renderMain*(body: VNode; req: Request; title="Nitter"; titleText=""; desc=" meta(name="viewport", content="width=device-width, initial-scale=1.0") meta(property="og:type", content=`type`) meta(property="og:title", content=titleText) - meta(property="og:description", content=getTweetPreview(desc)) + meta(property="og:description", content=stripHtml(desc)) meta(property="og:site_name", content="Nitter") for url in images: