From bde3c3662da0deb1477b912ea98de71aee24eb7f Mon Sep 17 00:00:00 2001 From: Zed Date: Mon, 22 Jun 2020 03:50:16 +0200 Subject: [PATCH] Silence some warnings --- src/prefs.nim | 2 +- src/query.nim | 1 - src/redis_cache.nim | 2 +- src/routes/rss.nim | 2 +- src/tokens.nim | 2 +- src/utils.nim | 4 ++-- src/views/preferences.nim | 4 ++-- src/views/search.nim | 2 +- src/views/timeline.nim | 4 ++-- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/prefs.nim b/src/prefs.nim index c0573ef..aa45678 100644 --- a/src/prefs.nim +++ b/src/prefs.nim @@ -5,7 +5,7 @@ from parsecfg import nil export genUpdatePrefs, genResetPrefs -var defaultPrefs*: Prefs +var defaultPrefs* {.threadvar.}: Prefs proc updateDefaultPrefs*(cfg: parsecfg.Config) = genDefaultPrefs() diff --git a/src/query.nim b/src/query.nim index 6d68aef..7c9a69e 100644 --- a/src/query.nim +++ b/src/query.nim @@ -62,7 +62,6 @@ proc genQueryParam*(query: Query): string = if "nativeretweets" notin query.excludes: param &= "include:nativeretweets " - let rewrite = query.fromUser.len > 0 and query.kind in {posts, media} for f in query.filters: filters.add "filter:" & f for e in query.excludes: diff --git a/src/redis_cache.nim b/src/redis_cache.nim index e523cdd..d508ae6 100644 --- a/src/redis_cache.nim +++ b/src/redis_cache.nim @@ -6,7 +6,7 @@ import types, api const redisNil = "\0\0" var - pool: RedisPool + pool {.threadvar.}: RedisPool baseCacheTime = 60 * 60 rssCacheTime: int listCacheTime*: int diff --git a/src/routes/rss.nim b/src/routes/rss.nim index bc0d067..7db2c18 100644 --- a/src/routes/rss.nim +++ b/src/routes/rss.nim @@ -103,7 +103,7 @@ proc createRssRouter*(cfg: Config) = var key = @"name" & "/" & @"tab" if @"tab" == "search": - key &= hash(genQueryUrl(query)) + key &= $hash(genQueryUrl(query)) key &= getCursor() var rss = await getCachedRss(key) diff --git a/src/tokens.nim b/src/tokens.nim index c0bce26..c30bf95 100644 --- a/src/tokens.nim +++ b/src/tokens.nim @@ -1,7 +1,7 @@ import asyncdispatch, httpclient, times, sequtils, strutils import types -var tokenPool: seq[Token] +var tokenPool {.threadvar.}: seq[Token] proc fetchToken(): Future[Token] {.async.} = let diff --git a/src/utils.nim b/src/utils.nim index c143793..628ae7f 100644 --- a/src/utils.nim +++ b/src/utils.nim @@ -2,7 +2,7 @@ import strutils, strformat, sequtils, uri, tables, base64 import nimcrypto, regex var - hmacKey = "secretkey" + hmacKey {.threadvar.}: string base64Media = false const @@ -51,7 +51,7 @@ proc cleanFilename*(filename: string): string = result &= ".png" proc filterParams*(params: Table): seq[(string, string)] = - let filter = ["name", "id", "list", "referer", "scroll"] + const filter = ["name", "id", "list", "referer", "scroll"] toSeq(params.pairs()).filterIt(it[0] notin filter and it[1].len > 0) proc isTwitterUrl*(uri: Uri): bool = diff --git a/src/views/preferences.nim b/src/views/preferences.nim index 0ea1fbd..b0291b5 100644 --- a/src/views/preferences.nim +++ b/src/views/preferences.nim @@ -1,5 +1,5 @@ -import tables, macros, strutils, os -import karax/[karaxdsl, vdom, vstyles] +import tables, macros, strutils +import karax/[karaxdsl, vdom] import renderutils import ../types, ../prefs_impl diff --git a/src/views/search.nim b/src/views/search.nim index 81bc809..527dbe9 100644 --- a/src/views/search.nim +++ b/src/views/search.nim @@ -4,7 +4,7 @@ import karax/[karaxdsl, vdom] import renderutils, timeline import ".."/[types, query] -let toggles = { +const toggles = { "nativeretweets": "Retweets", "media": "Media", "videos": "Videos", diff --git a/src/views/timeline.nim b/src/views/timeline.nim index 5ac9ed7..5127244 100644 --- a/src/views/timeline.nim +++ b/src/views/timeline.nim @@ -1,5 +1,5 @@ -import strutils, strformat, sequtils, algorithm, times, uri, options -import karax/[karaxdsl, vdom, vstyles] +import strutils, strformat, sequtils, algorithm, uri, options +import karax/[karaxdsl, vdom] import ".."/[types, query, formatters] import tweet, renderutils