Procházet zdrojové kódy

Improve withheld tweet rendering

Zed před 4 roky
rodič
revize
5e0eb02422
3 změnil soubory, kde provedl 6 přidání a 5 odebrání
  1. 4 4
      src/parser.nim
  2. 1 0
      src/sass/tweet/_base.scss
  3. 1 1
      src/views/general.nim

+ 4 - 4
src/parser.nim

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

+ 1 - 0
src/sass/tweet/_base.scss

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

+ 1 - 1
src/views/general.nim

@@ -44,7 +44,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; titleText=""; desc=""; video="";
   let opensearchUrl = getUrlPrefix(cfg) & "/opensearch"
 
   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")
 
     if theme.len > 0: