mirrors/nitter
1
0
Fork 0
mirror of https://github.com/zedeus/nitter.git synced 2024-12-23 07:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit video token usage to prevent crashes

Browse source
This commit is contained in:
Zed 2019-06-25 15:09:13 +02:00
parent a3285e8410
commit 2f51de90d0
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/api.nim
View file

@ -19,9 +19,11 @@ const
tokenUrl = "guest/activate.json" tokenUrl = "guest/activate.json"
var var
token = "" guestToken = ""
tokenUses = 0
tokenMaxUses = 230
tokenUpdated: Time tokenUpdated: Time
tokenLifetime = initDuration(hours=2) tokenLifetime = initDuration(minutes=20)
template newClient() {.dirty.} = template newClient() {.dirty.} =
var client = newAsyncHttpClient() var client = newAsyncHttpClient()
@ -53,11 +55,13 @@ proc fetchJson(url: Uri; headers: HttpHeaders): Future[JsonNode] {.async.} =
except: except:
return nil return nil
proc getGuestToken(): Future[string] {.async.} = proc getGuestToken(force=false): Future[string] {.async.} =
if getTime() - tokenUpdated < tokenLifetime: if getTime() - tokenUpdated < tokenLifetime and
return token not force and tokenUses < tokenMaxUses:
return guestToken
tokenUpdated = getTime() tokenUpdated = getTime()
tokenUses = 0
let headers = newHttpHeaders({ let headers = newHttpHeaders({
"Accept": "application/json, text/javascript, */*; q=0.01", "Accept": "application/json, text/javascript, */*; q=0.01",
@ -73,7 +77,7 @@ proc getGuestToken(): Future[string] {.async.} =
json = parseJson(await client.postContent($url)) json = parseJson(await client.postContent($url))
result = json["guest_token"].to(string) result = json["guest_token"].to(string)
token = result guestToken = result
proc getVideo*(tweet: Tweet; token: string) {.async.} = proc getVideo*(tweet: Tweet; token: string) {.async.} =
if tweet.video.isNone(): return if tweet.video.isNone(): return
@ -90,12 +94,23 @@ proc getVideo*(tweet: Tweet; token: string) {.async.} =
url = apiBase / (videoUrl % tweet.id) url = apiBase / (videoUrl % tweet.id)
json = await fetchJson(url, headers) json = await fetchJson(url, headers)
tweet.video = some(parseVideo(json)) if json.isNil:
if getTime() - tokenUpdated > initDuration(seconds=1):
tokenUpdated = getTime()
guestToken = await getGuestToken(force=true)
await getVideo(tweet, guestToken)
return
proc getVideos*(tweets: Tweets) {.async.} = tweet.video = some(parseVideo(json))
var token = await getGuestToken() tokenUses.inc
proc getVideos*(tweets: Tweets; token="") {.async.} =
var gToken = token
var videoFuts: seq[Future[void]] var videoFuts: seq[Future[void]]
if gToken.len == 0:
gToken = await getGuestToken()
for tweet in tweets.filterIt(it.video.isSome): for tweet in tweets.filterIt(it.video.isSome):
videoFuts.add getVideo(tweet, token) videoFuts.add getVideo(tweet, token)
@ -108,7 +123,7 @@ proc getConversationVideos*(convo: Conversation) {.async.} =
futs.add getVideo(convo.tweet, token) futs.add getVideo(convo.tweet, token)
futs.add getVideos(convo.before) futs.add getVideos(convo.before)
futs.add getVideos(convo.after) futs.add getVideos(convo.after)
futs.add convo.replies.mapIt(getVideos(it)) futs.add convo.replies.mapIt(getVideos(it, token))
await all(futs) await all(futs)