blankie
/
nitter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix rare edge case where gifs get parsed as videos

This commit is contained in:
Zed 2019-12-22 01:31:50 +01:00
parent 8836cf51e8
commit 7ef3a4faba
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/media.nim
View File

@ -93,11 +93,19 @@ proc getVideoFetch(tweet: Tweet; agent, token: string; retry=true): Future[Optio
result = some video result = some video
tokenUses.inc tokenUses.inc
proc videoIsInvalid(video: Video): bool =
not video.available and video.url.len == 0
proc getVideo*(tweet: Tweet; agent, token: string; force=false) {.async.} = proc getVideo*(tweet: Tweet; agent, token: string; force=false) {.async.} =
let token = if token.len == 0: guestToken else: token let token = if token.len == 0: guestToken else: token
var video = getCachedVideo(tweet.id) var video = getCachedVideo(tweet.id)
if video.isNone: if video.isNone:
video = await getVideoFetch(tweet, agent, token) video = await getVideoFetch(tweet, agent, token)
elif videoIsInvalid(get(video)) and tweet.gif.isSome:
# gif was mistakenly parsed as a gif
uncache(tweet.id)
return
getVideoVar(tweet) = video getVideoVar(tweet) = video
if tweet.card.isSome: tweet.video = none Video if tweet.card.isSome: tweet.video = none Video

8
src/cache.nim
View File

@ -63,6 +63,14 @@ proc cache*(video: var Video) =
if video.videoId.len > 0: if video.videoId.len > 0:
video.insert() video.insert()
proc uncache*(id: int64) =
withDb:
try:
var video = Video.getOne("videoId = ?", $id)
video.delete()
except:
discard
proc getCachedVideo*(id: int64): Option[Video] = proc getCachedVideo*(id: int64): Option[Video] =
withDb: withDb:
try: try: