Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Rework profile cache behavior, fix suspended cache
Fixes #480
  • Loading branch information
zedeus committed Jan 16, 2022
1 parent 23f87c1 commit f3d6f53
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion src/api.nim
Expand Up @@ -34,7 +34,7 @@ proc getProfile*(username: string): Future[Profile] {.async.} =
let
ps = genParams({"screen_name": username})
json = await fetchRaw(userShow ? ps, Api.userShow)
result = parseUser(json)
result = parseUser(json, username)

proc getProfileById*(userId: string): Future[Profile] {.async.} =
let
Expand Down
4 changes: 2 additions & 2 deletions src/experimental/parser/user.nim
Expand Up @@ -38,10 +38,10 @@ proc getBanner(user: User): string =
return '#' & user.profileLinkColor
return "#161616"

proc parseUser*(json: string): Profile =
proc parseUser*(json: string; username=""): Profile =
handleErrors:
case error.code
of suspended: return Profile(suspended: true)
of suspended: return Profile(username: username, suspended: true)
of userNotFound: return
else: echo "[error - parseUser]: ", error

Expand Down
18 changes: 12 additions & 6 deletions src/redis_cache.nim
Expand Up @@ -80,16 +80,16 @@ proc cache*(data: PhotoRail; name: string) {.async.} =
await setEx("pr:" & toLower(name), baseCacheTime, compress(toFlatty(data)))

proc cache*(data: Profile) {.async.} =
if data.username.len == 0 or data.id.len == 0: return
if data.username.len == 0: return
let name = toLower(data.username)
pool.withAcquire(r):
r.startPipelining()
dawait r.setEx(name.profileKey, baseCacheTime, compress(toFlatty(data)))
dawait r.setEx("i:" & data.id , baseCacheTime, data.username)
dawait r.hSet(name.pidKey, name, data.id)
if data.id.len > 0:
dawait r.hSet(name.pidKey, name, data.id)
dawait r.flushPipeline()

proc cacheProfileId*(username, id: string) {.async.} =
proc cacheProfileId(username, id: string) {.async.} =
if username.len == 0 or id.len == 0: return
let name = toLower(username)
pool.withAcquire(r):
Expand Down Expand Up @@ -117,15 +117,21 @@ proc getCachedProfile*(username: string; fetch=true): Future[Profile] {.async.}
result = fromFlatty(uncompress(prof), Profile)
elif fetch:
result = await getProfile(username)
await cacheProfileId(result.username, result.id)
if result.suspended:
await cache(result)

proc getCachedProfileUsername*(userId: string): Future[string] {.async.} =
let username = await get("i:" & userId)
let
key = "i:" & userId
username = await get(key)

if username != redisNil:
result = username
else:
let profile = await getProfileById(userId)
result = profile.username
await cache(profile)
await setEx(key, baseCacheTime, result)

proc getCachedPhotoRail*(name: string): Future[PhotoRail] {.async.} =
if name.len == 0: return
Expand Down
17 changes: 5 additions & 12 deletions src/routes/timeline.nim
Expand Up @@ -30,20 +30,13 @@ proc fetchTimeline*(after: string; query: Query; skipRail=false):

if profileId.len == 0:
profile = await getCachedProfile(name)
profileId = if profile.suspended: "s"
else: profile.id

if profileId.len > 0:
await cacheProfileId(profile.username, profileId)

profileId = profile.id
fetched = true

if profileId.len == 0 or profile.protected:
result[0] = profile
return
elif profileId == "s":
result[0] = Profile(username: name, suspended: true)
return
if profile.protected or profile.suspended:
return (profile, Timeline(), @[])
elif profileId.len == 0:
return (Profile(username: name), Timeline(), @[])

var rail: Future[PhotoRail]
if skipRail or profile.protected or query.kind == media:
Expand Down

0 comments on commit f3d6f53

Please sign in to comment.