From 2a654ea5cd844bfd8dc2986c042f83a22490dfe1 Mon Sep 17 00:00:00 2001 From: Zed Date: Fri, 5 Jun 2020 16:27:48 +0200 Subject: [PATCH] Fix missing search params in rss cache --- src/redis_cache.nim | 2 +- src/routes/rss.nim | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/redis_cache.nim b/src/redis_cache.nim index a508b84..f598046 100644 --- a/src/redis_cache.nim +++ b/src/redis_cache.nim @@ -1,4 +1,4 @@ -import asyncdispatch, times, strutils, options, tables +import asyncdispatch, times, strutils, tables import redis, redpool, msgpack4nim export redpool, msgpack4nim diff --git a/src/routes/rss.nim b/src/routes/rss.nim index b322345..7701ac1 100644 --- a/src/routes/rss.nim +++ b/src/routes/rss.nim @@ -1,4 +1,4 @@ -import asyncdispatch, strutils, tables, times, sequtils +import asyncdispatch, strutils, tables, times, sequtils, hashes import jester @@ -7,7 +7,7 @@ import ".."/[redis_cache, query], ../views/general include "../views/rss.nimf" -export times +export times, hashes proc showRss*(req: Request; hostname: string; query: Query): Future[(string, string)] {.async.} = var profile: Profile @@ -57,7 +57,7 @@ proc createRssRouter*(cfg: Config) = let cursor = getCursor() - key = genQueryParam(query) & cursor + key = $hash(genQueryUrl(query)) & cursor (cRss, cCursor) = await getCachedRss(key) if cRss.len > 0: @@ -97,10 +97,12 @@ proc createRssRouter*(cfg: Config) = of "search": initQuery(params(request), name=name) else: Query(fromUser: @[name]) - let - key = @"name" & "/" & @"tab" & getCursor() - (cRss, cCursor) = await getCachedRss(key) + var key = @"name" & "/" & @"tab" + if @"tab" == "search": + key &= hash(genQueryUrl(query)) + key &= getCursor() + let (cRss, cCursor) = await getCachedRss(key) if cRss.len > 0: respRss(cRss, cCursor)