blankie
/
nitter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve withheld tweet rendering

This commit is contained in:
Zed 2021-12-29 06:41:00 +01:00
parent ab94d9eb7d
commit 5e0eb02422
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/parser.nim
View File

@ -271,10 +271,9 @@ proc parseTweet(js: JsonNode): Tweet =
else: discard else: discard
with jsWithheld, js{"withheld_in_countries"}: with jsWithheld, js{"withheld_in_countries"}:
var withheldInCountries: seq[string] let withheldInCountries: seq[string] =
if jsWithheld.kind != JArray: @[]
if jsWithheld.kind == JArray: else: jsWithheld.to(seq[string])
withheldInCountries = jsWithheld.to(seq[string])
# XX - Content is withheld in all countries # XX - Content is withheld in all countries
# XY - Content is withheld due to a DMCA request. # XY - Content is withheld due to a DMCA request.
@ -282,6 +281,7 @@ proc parseTweet(js: JsonNode): Tweet =
withheldInCountries.len > 0 and ("XX" in withheldInCountries or withheldInCountries.len > 0 and ("XX" in withheldInCountries or
"XY" in withheldInCountries or "XY" in withheldInCountries or
"withheld" in result.text): "withheld" in result.text):
result.text.removeSuffix(" Learn more.")
result.available = false result.available = false
proc finalizeTweet(global: GlobalObjects; id: string): Tweet = proc finalizeTweet(global: GlobalObjects; id: string): Tweet =

1
src/sass/tweet/_base.scss
View File

@ -191,6 +191,7 @@
box-sizing: border-box; box-sizing: border-box;
border-radius: 10px; border-radius: 10px;
background-color: var(--bg_color); background-color: var(--bg_color);
z-index: 2;
} }
.tweet-link { .tweet-link {

2
src/views/general.nim
View File

@ -44,7 +44,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video="";
let opensearchUrl = getUrlPrefix(cfg) & "/opensearch" let opensearchUrl = getUrlPrefix(cfg) & "/opensearch"
buildHtml(head): buildHtml(head):
link(rel="stylesheet", type="text/css", href="/css/style.css?v=5") link(rel="stylesheet", type="text/css", href="/css/style.css?v=6")
link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=2") link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=2")
if theme.len > 0: if theme.len > 0: