Skip to content

Commit

Permalink
Minor cleanup, fix empty lines before card links
Browse files Browse the repository at this point in the history
  • Loading branch information
zedeus committed Oct 10, 2019
1 parent a3303d6 commit 4407651
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/formatters.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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()
3 changes: 2 additions & 1 deletion src/parserutils.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/views/general.nim
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 4407651

Please sign in to comment.