Prevent unnecessary profile cache
This commit is contained in:
parent
d01f62c5ae
commit
b4fe3d1f6a
2 changed files with 11 additions and 8 deletions
|
@ -54,6 +54,11 @@ proc cache*(data: Profile) {.async.} =
|
||||||
discard await r.hset("p:", toLower(data.username), data.id)
|
discard await r.hset("p:", toLower(data.username), data.id)
|
||||||
discard await r.flushPipeline()
|
discard await r.flushPipeline()
|
||||||
|
|
||||||
|
proc cacheProfileId*(username, id: string) {.async.} =
|
||||||
|
if username.len == 0 or id.len == 0: return
|
||||||
|
pool.withAcquire(r):
|
||||||
|
discard await r.hset("p:", toLower(username), id)
|
||||||
|
|
||||||
proc cacheRss*(query, rss, cursor: string) {.async.} =
|
proc cacheRss*(query, rss, cursor: string) {.async.} =
|
||||||
let key = "rss:" & query
|
let key = "rss:" & query
|
||||||
pool.withAcquire(r):
|
pool.withAcquire(r):
|
||||||
|
@ -73,10 +78,8 @@ proc getCachedProfile*(username: string; fetch=true): Future[Profile] {.async.}
|
||||||
let prof = await get("p:" & toLower(username))
|
let prof = await get("p:" & toLower(username))
|
||||||
if prof != redisNil:
|
if prof != redisNil:
|
||||||
result = prof.to(Profile)
|
result = prof.to(Profile)
|
||||||
else:
|
elif fetch:
|
||||||
result = await getProfile(username)
|
result = await getProfile(username)
|
||||||
if result.id.len > 0:
|
|
||||||
await cache(result)
|
|
||||||
|
|
||||||
proc getCachedPhotoRail*(id: string): Future[PhotoRail] {.async.} =
|
proc getCachedPhotoRail*(id: string): Future[PhotoRail] {.async.} =
|
||||||
if id.len == 0: return
|
if id.len == 0: return
|
||||||
|
|
|
@ -27,15 +27,16 @@ proc fetchSingleTimeline*(after: string; query: Query; skipRail=false):
|
||||||
profileId = await getProfileId(name)
|
profileId = await getProfileId(name)
|
||||||
|
|
||||||
if profile.username.len == 0 and profileId.len == 0:
|
if profile.username.len == 0 and profileId.len == 0:
|
||||||
profile = await getCachedProfile(name)
|
profile = await getProfile(name)
|
||||||
profileId = profile.id
|
profileId = profile.id
|
||||||
|
await cacheProfileId(profile.username, profile.id)
|
||||||
|
|
||||||
if profile.suspended or profileId.len == 0:
|
if profile.suspended or profile.protected or profileId.len == 0:
|
||||||
result[0] = profile
|
result[0] = profile
|
||||||
return
|
return
|
||||||
|
|
||||||
var rail: Future[PhotoRail]
|
var rail: Future[PhotoRail]
|
||||||
if skipRail or query.kind == media or profile.suspended or profile.protected:
|
if skipRail or query.kind == media:
|
||||||
rail = newFuture[PhotoRail]()
|
rail = newFuture[PhotoRail]()
|
||||||
rail.complete(@[])
|
rail.complete(@[])
|
||||||
else:
|
else:
|
||||||
|
@ -50,7 +51,7 @@ proc fetchSingleTimeline*(after: string; query: Query; skipRail=false):
|
||||||
|
|
||||||
timeline.query = query
|
timeline.query = query
|
||||||
|
|
||||||
for tweet in timeline.content:
|
for tweet in timeline.content.mitems:
|
||||||
if tweet.profile.id == profileId or
|
if tweet.profile.id == profileId or
|
||||||
tweet.profile.username.cmpIgnoreCase(name) == 0:
|
tweet.profile.username.cmpIgnoreCase(name) == 0:
|
||||||
profile = tweet.profile
|
profile = tweet.profile
|
||||||
|
@ -58,7 +59,6 @@ proc fetchSingleTimeline*(after: string; query: Query; skipRail=false):
|
||||||
|
|
||||||
if profile.username.len == 0:
|
if profile.username.len == 0:
|
||||||
profile = await getCachedProfile(name)
|
profile = await getCachedProfile(name)
|
||||||
else:
|
|
||||||
await cache(profile)
|
await cache(profile)
|
||||||
|
|
||||||
return (profile, timeline, await rail)
|
return (profile, timeline, await rail)
|
||||||
|
|
Loading…
Reference in a new issue