Show video link in RSS feed

.github/workflows/run-tests.yml

@@ -10,34 +10,25 @@ on:
 
 jobs:
   test:
-    runs-on: buildjet-2vcpu-ubuntu-2204
+    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        nim:
-          - "1.6.10"
-          - "1.6.x"
-          - "2.0.x"
-          - "devel"
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Cache nimble
         id: cache-nimble
-        uses: buildjet/cache@v3
+        uses: actions/cache@v3
         with:
           path: ~/.nimble
-          key: ${{ matrix.nim }}-nimble-${{ hashFiles('*.nimble') }}
+          key: nimble-${{ hashFiles('*.nimble') }}
-          restore-keys: |
+          restore-keys: "nimble-"
-            ${{ matrix.nim }}-nimble-
       - uses: actions/setup-python@v4
         with:
           python-version: "3.10"
           cache: "pip"
       - uses: jiro4989/setup-nim-action@v1
         with:
-          nim-version: ${{ matrix.nim }}
+          nim-version: "1.x"
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - run: nimble build -d:release -Y
       - run: pip install seleniumbase
       - run: seleniumbase install chromedriver
@@ -46,11 +37,9 @@ jobs:
         run: |
           sudo apt install libsass-dev -y
           cp nitter.example.conf nitter.conf
-          sed -i 's/enableDebug = false/enableDebug = true/g' nitter.conf
           nimble md
           nimble scss
-          echo '${{ secrets.GUEST_ACCOUNTS }}' > ./guest_accounts.jsonl
       - name: Run tests
         run: |
           ./nitter &
-          pytest -n8 tests
+          pytest -n4 tests

.gitignore

@@ -10,5 +10,4 @@ nitter
 /public/css/style.css
 /public/md/*.html
 nitter.conf
-guest_accounts.json*
 dump.rdb

Dockerfile.arm64

@@ -1,7 +1,7 @@
-FROM alpine:3.18 as nim
+FROM alpine:3.17 as nim
 LABEL maintainer="setenforce@protonmail.com"
 
-RUN apk --no-cache add libsass-dev pcre gcc git libc-dev "nim=1.6.14-r0" "nimble=0.13.1-r2"
+RUN apk --no-cache add gcc git libc-dev libsass-dev "nim=1.6.8-r0" nimble pcre
 
 WORKDIR /src/nitter
 
@@ -13,13 +13,11 @@ RUN nimble build -d:danger -d:lto -d:strip \
     && nimble scss \
     && nimble md
 
-FROM alpine:3.18
+FROM alpine:3.17
 WORKDIR /src/
-RUN apk --no-cache add pcre ca-certificates openssl1.1-compat
+RUN apk --no-cache add ca-certificates pcre openssl1.1-compat
 COPY --from=nim /src/nitter/nitter ./
 COPY --from=nim /src/nitter/nitter.example.conf ./nitter.conf
 COPY --from=nim /src/nitter/public ./public
 EXPOSE 8080
-RUN adduser -h /src/ -D -s /bin/sh nitter
-USER nitter
 CMD ./nitter

config.nims

@@ -7,7 +7,12 @@
 
 # disable annoying warnings
 warning("GcUnsafe2", off)
-warning("HoleEnumConv", off)
 hint("XDeclaredButNotUsed", off)
 hint("XCannotRaiseY", off)
 hint("User", off)
+
+const
+  nimVersion = (major: NimMajor, minor: NimMinor, patch: NimPatch)
+
+when nimVersion >= (1, 6, 0):
+  warning("HoleEnumConv", off)

nitter.example.conf

@@ -23,7 +23,7 @@ redisMaxConnections = 30
 hmacKey = "secretkey"  # random key for cryptographic signing of video urls
 base64Media = false  # use base64 encoding for proxied media urls
 enableRSS = true  # set this to false to disable RSS feeds
-enableDebug = false  # enable request logs and debug endpoints (/.accounts)
+enableDebug = false  # enable request logs and debug endpoints (/.tokens)
 proxy = ""  # http/https url, SOCKS proxies are not supported
 proxyAuth = ""
 tokenCount = 10

nitter.nimble

@@ -10,11 +10,11 @@ bin           = @["nitter"]
 
 # Dependencies
 
-requires "nim >= 1.6.10"
+requires "nim >= 1.4.8"
 requires "jester#baca3f"
 requires "karax#5cf360c"
 requires "sass#7dfdd03"
-requires "nimcrypto#a079df9"
+requires "nimcrypto#4014ef9"
 requires "markdown#158efe3"
 requires "packedjson#9e6fbb6"
 requires "supersnappy#6c94198"
@@ -22,8 +22,8 @@ requires "redpool#8b7c1db"
 requires "https://github.com/zedeus/redis#d0a0e6f"
 requires "zippy#ca5989a"
 requires "flatty#e668085"
-requires "jsony#1de1f08"
+requires "jsony#ea811be"
-requires "oauth#b8c163b"
+
 
 # Tasks
 

src/api.nim

@@ -33,6 +33,23 @@ proc getGraphUserTweets*(id: string; kind: TimelineKind; after=""): Future[Profi
     js = await fetch(url ? params, apiId)
   result = parseGraphTimeline(js, "user", after)
 
+# proc getTimeline*(id: string; after=""; replies=false): Future[Profile] {.async.} =
+#   if id.len == 0: return
+#   let
+#     ps = genParams({"userId": id, "include_tweet_replies": $replies}, after)
+#     url = oldUserTweets / (id & ".json") ? ps
+#   result = parseTimeline(await fetch(url, Api.timeline), after)
+
+proc getUserTimeline*(id: string; after=""): Future[Profile] {.async.} =
+  var ps = genParams({"id": id})
+  if after.len > 0:
+    ps.add ("down_cursor", after)
+
+  let
+    url = legacyUserTweets ? ps
+    js = await fetch(url, Api.userTimeline)
+  result = parseUserTimeline(js, after)
+
 proc getGraphListTweets*(id: string; after=""): Future[Timeline] {.async.} =
   if id.len == 0: return
   let
@@ -95,10 +112,10 @@ proc getTweet*(id: string; after=""): Future[Conversation] {.async.} =
   if after.len > 0:
     result.replies = await getReplies(id, after)
 
-proc getGraphTweetSearch*(query: Query; after=""): Future[Timeline] {.async.} =
+proc getGraphSearch*(query: Query; after=""): Future[Profile] {.async.} =
   let q = genQueryParam(query)
   if q.len == 0 or q == emptyQuery:
-    return Timeline(query: query, beginning: true)
+    return Profile(tweets: Timeline(query: query, beginning: true))
 
   var
     variables = %*{
@@ -112,29 +129,44 @@ proc getGraphTweetSearch*(query: Query; after=""): Future[Timeline] {.async.} =
   if after.len > 0:
     variables["cursor"] = % after
   let url = graphSearchTimeline ? {"variables": $variables, "features": gqlFeatures}
-  result = parseGraphSearch[Tweets](await fetch(url, Api.search), after)
+  result = Profile(tweets: parseGraphSearch(await fetch(url, Api.search), after))
+  result.tweets.query = query
+
+proc getTweetSearch*(query: Query; after=""): Future[Timeline] {.async.} =
+  var q = genQueryParam(query)
+
+  if q.len == 0 or q == emptyQuery:
+    return Timeline(query: query, beginning: true)
+
+  if after.len > 0:
+    q &= " max_id:" & after
+
+  let url = tweetSearch ? genParams({
+    "q": q ,
+    "modules": "status",
+    "result_type": "recent",
+  })
+
+  result = parseTweetSearch(await fetch(url, Api.search), after)
   result.query = query
 
-proc getGraphUserSearch*(query: Query; after=""): Future[Result[User]] {.async.} =
+proc getUserSearch*(query: Query; page="1"): Future[Result[User]] {.async.} =
   if query.text.len == 0:
     return Result[User](query: query, beginning: true)
 
-  var
+  var url = userSearch ? {
-    variables = %*{
+    "q": query.text,
-      "rawQuery": query.text,
+    "skip_status": "1",
-      "count": 20,
+    "count": "20",
-      "product": "People",
+    "page": page
-      "withDownvotePerspective": false,
+  }
-      "withReactionsMetadata": false,
-      "withReactionsPerspective": false
-    }
-  if after.len > 0:
-    variables["cursor"] = % after
-    result.beginning = false
 
-  let url = graphSearchTimeline ? {"variables": $variables, "features": gqlFeatures}
+  result = parseUsers(await fetchRaw(url, Api.userSearch))
-  result = parseGraphSearch[User](await fetch(url, Api.search), after)
   result.query = query
+  if page.len == 0:
+    result.bottom = "2"
+  elif page.allCharsInSet(Digits):
+    result.bottom = $(parseInt(page) + 1)
 
 proc getPhotoRail*(name: string): Future[PhotoRail] {.async.} =
   if name.len == 0: return

src/apiutils.nim

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import httpclient, asyncdispatch, options, strutils, uri, times, math, tables
+import httpclient, asyncdispatch, options, strutils, uri
-import jsony, packedjson, zippy, oauth1
+import jsony, packedjson, zippy
-import types, auth, consts, parserutils, http_pool
+import types, tokens, consts, parserutils, http_pool
 import experimental/types/common
 
 const
@@ -29,30 +29,12 @@ proc genParams*(pars: openArray[(string, string)] = @[]; cursor="";
     else:
       result &= ("cursor", cursor)
 
-proc getOauthHeader(url, oauthToken, oauthTokenSecret: string): string =
+proc genHeaders*(token: Token = nil): HttpHeaders =
-  let
-    encodedUrl = url.replace(",", "%2C").replace("+", "%20")
-    params = OAuth1Parameters(
-      consumerKey: consumerKey,
-      signatureMethod: "HMAC-SHA1",
-      timestamp: $int(round(epochTime())),
-      nonce: "0",
-      isIncludeVersionToHeader: true,
-      token: oauthToken
-    )
-    signature = getSignature(HttpGet, encodedUrl, "", params, consumerSecret, oauthTokenSecret)
-
-  params.signature = percentEncode(signature)
-
-  return getOauth1RequestHeader(params)["authorization"]
-
-proc genHeaders*(url, oauthToken, oauthTokenSecret: string): HttpHeaders =
-  let header = getOauthHeader(url, oauthToken, oauthTokenSecret)
-
   result = newHttpHeaders({
     "connection": "keep-alive",
-    "authorization": header,
+    "authorization": auth,
     "content-type": "application/json",
+    "x-guest-token": if token == nil: "" else: token.tok,
     "x-twitter-active-user": "yes",
     "authority": "api.twitter.com",
     "accept-encoding": "gzip",
@@ -61,18 +43,24 @@ proc genHeaders*(url, oauthToken, oauthTokenSecret: string): HttpHeaders =
     "DNT": "1"
   })
 
+template updateToken() =
+  if resp.headers.hasKey(rlRemaining):
+    let
+      remaining = parseInt(resp.headers[rlRemaining])
+      reset = parseInt(resp.headers[rlReset])
+    token.setRateLimit(api, remaining, reset)
+
 template fetchImpl(result, fetchBody) {.dirty.} =
   once:
     pool = HttpPool()
 
-  var account = await getGuestAccount(api)
+  var token = await getToken(api)
-  if account.oauthToken.len == 0:
+  if token.tok.len == 0:
-    echo "[accounts] Empty oauth token, account: ", account.id
     raise rateLimitError()
 
   try:
     var resp: AsyncResponse
-    pool.use(genHeaders($url, account.oauthToken, account.oauthSecret)):
+    pool.use(genHeaders(token)):
       template getContent =
         resp = await c.get($url)
         result = await resp.body
@@ -83,75 +71,57 @@ template fetchImpl(result, fetchBody) {.dirty.} =
         badClient = true
         raise newException(BadClientError, "Bad client")
 
-    if resp.headers.hasKey(rlRemaining):
-      let
-        remaining = parseInt(resp.headers[rlRemaining])
-        reset = parseInt(resp.headers[rlReset])
-      account.setRateLimit(api, remaining, reset)
-
     if result.len > 0:
       if resp.headers.getOrDefault("content-encoding") == "gzip":
         result = uncompress(result, dfGzip)
-
+      else:
-      if result.startsWith("{\"errors"):
+        echo "non-gzip body, url: ", url, ", body: ", result
-        let errors = result.fromJson(Errors)
-        if errors in {expiredToken, badToken}:
-          echo "fetch error: ", errors
-          invalidate(account)
-          raise rateLimitError()
-        elif errors in {rateLimited}:
-          # rate limit hit, resets after 24 hours
-          setLimited(account, api)
-          raise rateLimitError()
-      elif result.startsWith("429 Too Many Requests"):
-        echo "[accounts] 429 error, API: ", api, ", account: ", account.id
-        account.apis[api].remaining = 0
-        # rate limit hit, resets after the 15 minute window
-        raise rateLimitError()
 
     fetchBody
 
+    release(token, used=true)
+
     if resp.status == $Http400:
       raise newException(InternalError, $url)
   except InternalError as e:
     raise e
   except BadClientError as e:
-    raise e
+    release(token, used=true)
-  except OSError as e:
     raise e
   except Exception as e:
-    let id = if account.isNil: "null" else: $account.id
+    echo "error: ", e.name, ", msg: ", e.msg, ", token: ", token[], ", url: ", url
-    echo "error: ", e.name, ", msg: ", e.msg, ", accountId: ", id, ", url: ", url
+    if "length" notin e.msg and "descriptor" notin e.msg:
+      release(token, invalid=true)
     raise rateLimitError()
-  finally:
-    release(account)
-
-template retry(bod) =
-  try:
-    bod
-  except RateLimitError:
-    echo "[accounts] Rate limited, retrying ", api, " request..."
-    bod
 
 proc fetch*(url: Uri; api: Api): Future[JsonNode] {.async.} =
-  retry:
+  var body: string
-    var body: string
+  fetchImpl body:
-    fetchImpl body:
+    if body.startsWith('{') or body.startsWith('['):
-      if body.startsWith('{') or body.startsWith('['):
+      result = parseJson(body)
-        result = parseJson(body)
+    else:
-      else:
+      echo resp.status, ": ", body, " --- url: ", url
-        echo resp.status, ": ", body, " --- url: ", url
+      result = newJNull()
-        result = newJNull()
 
-      let error = result.getError
+    updateToken()
-      if error in {expiredToken, badToken}:
+
-        echo "fetchBody error: ", error
+    let error = result.getError
-        invalidate(account)
+    if error in {invalidToken, badToken}:
-        raise rateLimitError()
+      echo "fetch error: ", result.getError
+      release(token, invalid=true)
+      raise rateLimitError()
 
 proc fetchRaw*(url: Uri; api: Api): Future[string] {.async.} =
-  retry:
+  fetchImpl result:
-    fetchImpl result:
+    if not (result.startsWith('{') or result.startsWith('[')):
-      if not (result.startsWith('{') or result.startsWith('[')):
+      echo resp.status, ": ", result, " --- url: ", url
-        echo resp.status, ": ", result, " --- url: ", url
+      result.setLen(0)
-        result.setLen(0)
+
+    updateToken()
+
+    if result.startsWith("{\"errors"):
+      let errors = result.fromJson(Errors)
+      if errors in {invalidToken, badToken}:
+        echo "fetch error: ", errors
+        release(token, invalid=true)
+        raise rateLimitError()

src/auth.nim

@@ -1,209 +0,0 @@
-#SPDX-License-Identifier: AGPL-3.0-only
-import std/[asyncdispatch, times, json, random, sequtils, strutils, tables, packedsets, os]
-import types
-import experimental/parser/guestaccount
-
-# max requests at a time per account to avoid race conditions
-const
-  maxConcurrentReqs = 2
-  dayInSeconds = 24 * 60 * 60
-  apiMaxReqs: Table[Api, int] = {
-    Api.search: 50,
-    Api.tweetDetail: 150,
-    Api.photoRail: 180,
-    Api.userTweets: 500,
-    Api.userTweetsAndReplies: 500,
-    Api.userMedia: 500,
-    Api.userRestId: 500,
-    Api.userScreenName: 500,
-    Api.tweetResult: 500,
-    Api.list: 500,
-    Api.listTweets: 500,
-    Api.listMembers: 500,
-    Api.listBySlug: 500
-  }.toTable
-
-var
-  accountPool: seq[GuestAccount]
-  enableLogging = false
-
-template log(str: varargs[string, `$`]) =
-  if enableLogging: echo "[accounts] ", str.join("")
-
-proc snowflakeToEpoch(flake: int64): int64 =
-  int64(((flake shr 22) + 1288834974657) div 1000)
-
-proc hasExpired(account: GuestAccount): bool =
-  let
-    created = snowflakeToEpoch(account.id)
-    now = epochTime().int64
-    daysOld = int(now - created) div dayInSeconds
-  return daysOld > 30
-
-proc getAccountPoolHealth*(): JsonNode =
-  let now = epochTime().int
-
-  var
-    totalReqs = 0
-    limited: PackedSet[int64]
-    reqsPerApi: Table[string, int]
-    oldest = now.int64
-    newest = 0'i64
-    average = 0'i64
-
-  for account in accountPool:
-    let created = snowflakeToEpoch(account.id)
-    if created > newest:
-      newest = created
-    if created < oldest:
-      oldest = created
-    average += created
-
-    for api in account.apis.keys:
-      let
-        apiStatus = account.apis[api]
-        reqs = apiMaxReqs[api] - apiStatus.remaining
-
-      if apiStatus.limited:
-        limited.incl account.id
-
-      # no requests made with this account and endpoint since the limit reset
-      if apiStatus.reset < now:
-        continue
-
-      reqsPerApi.mgetOrPut($api, 0).inc reqs
-      totalReqs.inc reqs
-
-  if accountPool.len > 0:
-    average = average div accountPool.len
-  else:
-    oldest = 0
-    average = 0
-
-  return %*{
-    "accounts": %*{
-      "total": accountPool.len,
-      "limited": limited.card,
-      "oldest": $fromUnix(oldest),
-      "newest": $fromUnix(newest),
-      "average": $fromUnix(average)
-    },
-    "requests": %*{
-      "total": totalReqs,
-      "apis": reqsPerApi
-    }
-  }
-
-proc getAccountPoolDebug*(): JsonNode =
-  let now = epochTime().int
-  var list = newJObject()
-
-  for account in accountPool:
-    let accountJson = %*{
-      "apis": newJObject(),
-      "pending": account.pending,
-    }
-
-    for api in account.apis.keys:
-      let
-        apiStatus = account.apis[api]
-        obj = %*{}
-
-      if apiStatus.reset > now.int:
-        obj["remaining"] = %apiStatus.remaining
-
-      if "remaining" notin obj and not apiStatus.limited:
-        continue
-
-      if apiStatus.limited:
-        obj["limited"] = %true
-
-      accountJson{"apis", $api} = obj
-      list[$account.id] = accountJson
-
-  return %list
-
-proc rateLimitError*(): ref RateLimitError =
-  newException(RateLimitError, "rate limited")
-
-proc isLimited(account: GuestAccount; api: Api): bool =
-  if account.isNil:
-    return true
-
-  if api in account.apis:
-    let limit = account.apis[api]
-
-    if limit.limited and (epochTime().int - limit.limitedAt) > dayInSeconds:
-      account.apis[api].limited = false
-      log "resetting limit, api: ", api, ", id: ", account.id
-
-    return limit.limited or (limit.remaining <= 10 and limit.reset > epochTime().int)
-  else:
-    return false
-
-proc isReady(account: GuestAccount; api: Api): bool =
-  not (account.isNil or account.pending > maxConcurrentReqs or account.isLimited(api))
-
-proc invalidate*(account: var GuestAccount) =
-  if account.isNil: return
-  log "invalidating expired account: ", account.id
-
-  # TODO: This isn't sufficient, but it works for now
-  let idx = accountPool.find(account)
-  if idx > -1: accountPool.delete(idx)
-  account = nil
-
-proc release*(account: GuestAccount) =
-  if account.isNil: return
-  dec account.pending
-
-proc getGuestAccount*(api: Api): Future[GuestAccount] {.async.} =
-  for i in 0 ..< accountPool.len:
-    if result.isReady(api): break
-    result = accountPool.sample()
-
-  if not result.isNil and result.isReady(api):
-    inc result.pending
-  else:
-    log "no accounts available for API: ", api
-    raise rateLimitError()
-
-proc setLimited*(account: GuestAccount; api: Api) =
-  account.apis[api].limited = true
-  account.apis[api].limitedAt = epochTime().int
-  log "rate limited, api: ", api, ", reqs left: ", account.apis[api].remaining, ", id: ", account.id
-
-proc setRateLimit*(account: GuestAccount; api: Api; remaining, reset: int) =
-  # avoid undefined behavior in race conditions
-  if api in account.apis:
-    let limit = account.apis[api]
-    if limit.reset >= reset and limit.remaining < remaining:
-      return
-    if limit.reset == reset and limit.remaining >= remaining:
-      account.apis[api].remaining = remaining
-      return
-
-  account.apis[api] = RateLimit(remaining: remaining, reset: reset)
-
-proc initAccountPool*(cfg: Config; path: string) =
-  enableLogging = cfg.enableDebug
-
-  let jsonlPath = if path.endsWith(".json"): (path & 'l') else: path
-
-  if fileExists(jsonlPath):
-    log "Parsing JSONL guest accounts file: ", jsonlPath
-    for line in jsonlPath.lines:
-      accountPool.add parseGuestAccount(line)
-  elif fileExists(path):
-    log "Parsing JSON guest accounts file: ", path
-    accountPool = parseGuestAccounts(path)
-  else:
-    echo "[accounts] ERROR: ", path, " not found. This file is required to authenticate API requests."
-    quit 1
-
-  let accountsPrePurge = accountPool.len
-  accountPool.keepItIf(not it.hasExpired)
-
-  log "Successfully added ", accountPool.len, " valid accounts."
-  if accountsPrePurge > accountPool.len:
-    log "Purged ", accountsPrePurge - accountPool.len, " expired accounts."

src/consts.nim

@@ -2,13 +2,17 @@
 import uri, sequtils, strutils
 
 const
-  consumerKey* = "3nVuSoBZnx6U4vzUxf5w"
+  auth* = "Bearer AAAAAAAAAAAAAAAAAAAAAFQODgEAAAAAVHTp76lzh3rFzcHbmHVvQxYYpTw%3DckAlMINMjmCwxUcaXbAN4XqJVdgMJaHqNOFgPMK0zN1qLqLQCF"
-  consumerSecret* = "Bcs59EFbbsdF6Sl9Ng71smgStWEGwXXKSjYvPVt7qys"
 
   api = parseUri("https://api.twitter.com")
   activate* = $(api / "1.1/guest/activate.json")
 
+  legacyUserTweets* = api / "1.1/timeline/user.json"
   photoRail* = api / "1.1/statuses/media_timeline.json"
+  userSearch* = api / "1.1/users/search.json"
+  tweetSearch* = api / "1.1/search/universal.json"
+
+  # oldUserTweets* = api / "2/timeline/profile"
 
   graphql = api / "graphql"
   graphUser* = graphql / "u7wQyGi6oExe8_TRWGMq4Q/UserResultByScreenNameQuery"
@@ -16,7 +20,7 @@ const
   graphUserTweets* = graphql / "3JNH4e9dq1BifLxAa3UMWg/UserWithProfileTweetsQueryV2"
   graphUserTweetsAndReplies* = graphql / "8IS8MaO-2EN6GZZZb8jF0g/UserWithProfileTweetsAndRepliesQueryV2"
   graphUserMedia* = graphql / "PDfFf8hGeJvUCiTyWtw4wQ/MediaTimelineV2"
-  graphTweet* = graphql / "q94uRCEn65LZThakYcPT6g/TweetDetail"
+  graphTweet* = graphql / "83h5UyHZ9wEKBVzALX8R_g/ConversationTimelineV2"
   graphTweetResult* = graphql / "sITyJdhRPpvpEjg4waUmTA/TweetResultByIdQuery"
   graphSearchTimeline* = graphql / "gkjsKepM6gl_HmFWoWKfgg/SearchTimeline"
   graphListById* = graphql / "iTpgCtbdxrsJfyx0cFjHqg/ListByRestId"
@@ -29,10 +33,11 @@ const
     "include_cards": "1",
     "include_entities": "1",
     "include_profile_interstitial_type": "0",
-    "include_quote_count": "0",
+    "include_quote_count": "1",
-    "include_reply_count": "0",
+    "include_reply_count": "1",
-    "include_user_entities": "0",
+    "include_user_entities": "1",
-    "include_ext_reply_count": "0",
+    "include_ext_reply_count": "1",
+    "include_ext_is_blue_verified": "1",
     "include_ext_media_color": "0",
     "cards_platform": "Web-13",
     "tweet_mode": "extended",
@@ -86,12 +91,8 @@ const
   tweetVariables* = """{
   "focalTweetId": "$1",
   $2
-  "includeHasBirdwatchNotes": false,
+  "includeHasBirdwatchNotes": false
-  "includePromotedContent": false,
+}"""
-  "withBirdwatchNotes": false,
-  "withVoice": false,
-  "withV2Timeline": true
-}""".replace(" ", "").replace("\n", "")
 
 #   oldUserTweetsVariables* = """{
 #   "userId": "$1", $2

src/experimental/parser/graphql.nim

@@ -1,7 +1,7 @@
 import options
 import jsony
 import user, ../types/[graphuser, graphlistmembers]
-from ../../types import User, VerifiedType, Result, Query, QueryKind
+from ../../types import User, Result, Query, QueryKind
 
 proc parseGraphUser*(json: string): User =
   if json.len == 0 or json[0] != '{':
@@ -12,10 +12,9 @@ proc parseGraphUser*(json: string): User =
   if raw.data.userResult.result.unavailableReason.get("") == "Suspended":
     return User(suspended: true)
 
-  result = raw.data.userResult.result.legacy
+  result = toUser raw.data.userResult.result.legacy
   result.id = raw.data.userResult.result.restId
-  if result.verifiedType == VerifiedType.none and raw.data.userResult.result.isBlueVerified:
+  result.verified = result.verified or raw.data.userResult.result.isBlueVerified
-    result.verifiedType = blue
 
 proc parseGraphListMembers*(json, cursor: string): Result[User] =
   result = Result[User](
@@ -31,7 +30,7 @@ proc parseGraphListMembers*(json, cursor: string): Result[User] =
         of TimelineTimelineItem:
           let userResult = entry.content.itemContent.userResults.result
           if userResult.restId.len > 0:
-            result.content.add userResult.legacy
+            result.content.add toUser userResult.legacy
         of TimelineTimelineCursor:
           if entry.content.cursorType == "Bottom":
             result.bottom = entry.content.value

src/experimental/parser/guestaccount.nim

@@ -1,21 +0,0 @@
-import std/strutils
-import jsony
-import ../types/guestaccount
-from ../../types import GuestAccount
-
-proc toGuestAccount(account: RawAccount): GuestAccount =
-  let id = account.oauthToken[0 ..< account.oauthToken.find('-')]
-  result = GuestAccount(
-    id: parseBiggestInt(id),
-    oauthToken: account.oauthToken,
-    oauthSecret: account.oauthTokenSecret
-  )
-
-proc parseGuestAccount*(raw: string): GuestAccount =
-  let rawAccount = raw.fromJson(RawAccount)
-  result = rawAccount.toGuestAccount
-
-proc parseGuestAccounts*(path: string): seq[GuestAccount] =
-  let rawAccounts = readFile(path).fromJson(seq[RawAccount])
-  for account in rawAccounts:
-    result.add account.toGuestAccount

src/experimental/parser/unifiedcard.nim

@@ -1,6 +1,6 @@
 import std/[options, tables, strutils, strformat, sugar]
 import jsony
-import user, ../types/unifiedcard
+import ../types/unifiedcard
 from ../../types import Card, CardKind, Video
 from ../../utils import twimg, https
 
@@ -27,14 +27,6 @@ proc parseMediaDetails(data: ComponentData; card: UnifiedCard; result: var Card)
   result.text = data.topicDetail.title
   result.dest = "Topic"
 
-proc parseJobDetails(data: ComponentData; card: UnifiedCard; result: var Card) =
-  data.destination.parseDestination(card, result)
-
-  result.kind = CardKind.jobDetails
-  result.title = data.title
-  result.text = data.shortDescriptionText
-  result.dest = &"@{data.profileUser.username} · {data.location}"
-
 proc parseAppDetails(data: ComponentData; card: UnifiedCard; result: var Card) =
   let app = card.appStoreData[data.appId][0]
 
@@ -92,8 +84,6 @@ proc parseUnifiedCard*(json: string): Card =
       component.parseMedia(card, result)
     of buttonGroup:
       discard
-    of ComponentType.jobDetails:
-      component.data.parseJobDetails(card, result)
     of ComponentType.hidden:
       result.kind = CardKind.hidden
     of ComponentType.unknown:

src/experimental/parser/user.nim

@@ -56,7 +56,7 @@ proc toUser*(raw: RawUser): User =
     tweets: raw.statusesCount,
     likes: raw.favouritesCount,
     media: raw.mediaCount,
-    verifiedType: raw.verifiedType,
+    verified: raw.verified,
     protected: raw.protected,
     joinDate: parseTwitterDate(raw.createdAt),
     banner: getBanner(raw),
@@ -68,11 +68,6 @@ proc toUser*(raw: RawUser): User =
 
   result.expandUserEntities(raw)
 
-proc parseHook*(s: string; i: var int; v: var User) =
-  var u: RawUser
-  parseHook(s, i, u)
-  v = toUser u
-
 proc parseUser*(json: string; username=""): User =
   handleErrors:
     case error.code
@@ -80,7 +75,7 @@ proc parseUser*(json: string; username=""): User =
     of userNotFound: return
     else: echo "[error - parseUser]: ", error
 
-  result = json.fromJson(User)
+  result = toUser json.fromJson(RawUser)
 
 proc parseUsers*(json: string; after=""): Result[User] =
   result = Result[User](beginning: after.len == 0)

src/experimental/types/graphuser.nim

@@ -1,5 +1,5 @@
 import options
-from ../../types import User
+import user
 
 type
   GraphUser* = object
@@ -9,7 +9,7 @@ type
     result*: UserResult
 
   UserResult = object
-    legacy*: User
+    legacy*: RawUser
     restId*: string
     isBlueVerified*: bool
     unavailableReason*: Option[string]

src/experimental/types/guestaccount.nim

@@ -1,4 +0,0 @@
-type
-  RawAccount* = object
-    oauthToken*: string
-    oauthTokenSecret*: string

src/experimental/types/timeline.nim

@@ -1,5 +1,5 @@
 import std/tables
-from ../../types import User
+import user
 
 type
   Search* = object
@@ -7,7 +7,7 @@ type
     timeline*: Timeline
 
   GlobalObjects = object
-    users*: Table[string, User]
+    users*: Table[string, RawUser]
 
   Timeline = object
     instructions*: seq[Instructions]

src/experimental/types/unifiedcard.nim

@@ -1,10 +1,7 @@
-import std/[options, tables, times]
+import options, tables
-import jsony
+from ../../types import VideoType, VideoVariant
-from ../../types import VideoType, VideoVariant, User
 
 type
-  Text* = distinct string
-
   UnifiedCard* = object
     componentObjects*: Table[string, Component]
     destinationObjects*: Table[string, Destination]
@@ -16,7 +13,6 @@ type
     media
     swipeableMedia
     buttonGroup
-    jobDetails
     appStoreDetails
     twitterListDetails
     communityDetails
@@ -33,15 +29,12 @@ type
     appId*: string
     mediaId*: string
     destination*: string
-    location*: string
     title*: Text
     subtitle*: Text
     name*: Text
     memberCount*: int
     mediaList*: seq[MediaItem]
     topicDetail*: tuple[title: Text]
-    profileUser*: User
-    shortDescriptionText*: string
 
   MediaItem* = object
     id*: string
@@ -76,9 +69,12 @@ type
     title*: Text
     category*: Text
 
+  Text = object
+    content: string
+
   TypeField = Component | Destination | MediaEntity | AppStoreData
 
-converter fromText*(text: Text): string = string(text)
+converter fromText*(text: Text): string = text.content
 
 proc renameHook*(v: var TypeField; fieldName: var string) =
   if fieldName == "type":
@@ -90,7 +86,6 @@ proc enumHook*(s: string; v: var ComponentType) =
       of "media": media
       of "swipeable_media": swipeableMedia
       of "button_group": buttonGroup
-      of "job_details": jobDetails
       of "app_store_details": appStoreDetails
       of "twitter_list_details": twitterListDetails
       of "community_details": communityDetails
@@ -111,18 +106,3 @@ proc enumHook*(s: string; v: var MediaType) =
       of "photo": photo
       of "model3d": model3d
       else: echo "ERROR: Unknown enum value (MediaType): ", s; photo
-
-proc parseHook*(s: string; i: var int; v: var DateTime) =
-  var str: string
-  parseHook(s, i, str)
-  v = parse(str, "yyyy-MM-dd hh:mm:ss")
-
-proc parseHook*(s: string; i: var int; v: var Text) =
-  if s[i] == '"':
-    var str: string
-    parseHook(s, i, str)
-    v = Text(str)
-  else:
-    var t: tuple[content: string]
-    parseHook(s, i, t)
-    v = Text(t.content)

src/experimental/types/user.nim

@@ -1,6 +1,5 @@
 import options
 import common
-from ../../types import VerifiedType
 
 type
   RawUser* = object
@@ -16,7 +15,7 @@ type
     favouritesCount*: int
     statusesCount*: int
     mediaCount*: int
-    verifiedType*: VerifiedType
+    verified*: bool
     protected*: bool
     profileLinkColor*: string
     profileBannerUrl*: string

src/http_pool.nim

@@ -39,8 +39,11 @@ template use*(pool: HttpPool; heads: HttpHeaders; body: untyped): untyped =
 
   try:
     body
-  except BadClientError, ProtocolError:
+  except ProtocolError:
-    # Twitter returned 503 or closed the connection, we need a new client
+    # Twitter closed the connection, retry
+    body
+  except BadClientError:
+    # Twitter returned 503, we need a new client
     pool.release(c, true)
     badClient = false
     c = pool.acquire(heads)

src/nitter.nim

@@ -6,7 +6,7 @@ from os import getEnv
 
 import jester
 
-import types, config, prefs, formatters, redis_cache, http_pool, auth
+import types, config, prefs, formatters, redis_cache, http_pool, tokens
 import views/[general, about]
 import routes/[
   preferences, timeline, status, media, search, rss, list, debug,
@@ -15,13 +15,8 @@ import routes/[
 const instancesUrl = "https://github.com/zedeus/nitter/wiki/Instances"
 const issuesUrl = "https://github.com/zedeus/nitter/issues"
 
-let
+let configPath = getEnv("NITTER_CONF_FILE", "./nitter.conf")
-  configPath = getEnv("NITTER_CONF_FILE", "./nitter.conf")
+let (cfg, fullCfg) = getConfig(configPath)
-  (cfg, fullCfg) = getConfig(configPath)
-
-  accountsPath = getEnv("NITTER_ACCOUNTS_FILE", "./guest_accounts.json")
-
-initAccountPool(cfg, accountsPath)
 
 if not cfg.enableDebug:
   # Silence Jester's query warning
@@ -43,6 +38,8 @@ waitFor initRedisPool(cfg)
 stdout.write &"Connected to Redis at {cfg.redisHost}:{cfg.redisPort}\n"
 stdout.flushFile
 
+asyncCheck initTokenPool(cfg)
+
 createUnsupportedRouter(cfg)
 createResolverRouter(cfg)
 createPrefRouter(cfg)

src/parser.nim

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import strutils, options, times, math
+import strutils, options, times, math, tables
 import packedjson, packedjson/deserialiser
 import types, parserutils, utils
 import experimental/parser/unifiedcard
 
-proc parseGraphTweet(js: JsonNode; isLegacy=false): Tweet
+proc parseGraphTweet(js: JsonNode): Tweet
 
 proc parseUser(js: JsonNode; id=""): User =
   if js.isNull: return
@@ -21,7 +21,7 @@ proc parseUser(js: JsonNode; id=""): User =
     tweets: js{"statuses_count"}.getInt,
     likes: js{"favourites_count"}.getInt,
     media: js{"media_count"}.getInt,
-    verifiedType: parseEnum[VerifiedType](js{"verified_type"}.getStr("None")),
+    verified: js{"verified"}.getBool or js{"ext_is_blue_verified"}.getBool,
     protected: js{"protected"}.getBool,
     joinDate: js{"created_at"}.getTime
   )
@@ -29,13 +29,11 @@ proc parseUser(js: JsonNode; id=""): User =
   result.expandUserEntities(js)
 
 proc parseGraphUser(js: JsonNode): User =
-  var user = js{"user_result", "result"}
+  let user = ? js{"user_result", "result"}
-  if user.isNull:
+  result = parseUser(user{"legacy"})
-    user = ? js{"user_results", "result"}
-  result = parseUser(user{"legacy"}, user{"rest_id"}.getStr)
 
-  if result.verifiedType == VerifiedType.none and user{"is_blue_verified"}.getBool(false):
+  if "is_blue_verified" in user:
-    result.verifiedType = blue
+    result.verified = user{"is_blue_verified"}.getBool()
 
 proc parseGraphList*(js: JsonNode): List =
   if js.isNull: return
@@ -219,6 +217,8 @@ proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull()): Tweet =
     )
   )
 
+  result.expandTweetEntities(js)
+
   # fix for pinned threads
   if result.hasThread and result.threadId == 0:
     result.threadId = js{"self_thread", "id_str"}.getId
@@ -252,8 +252,6 @@ proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull()): Tweet =
     else:
       result.card = some parseCard(jsCard, js{"entities", "urls"})
 
-  result.expandTweetEntities(js)
-
   with jsMedia, js{"extended_entities", "media"}:
     for m in jsMedia:
       case m{"type"}.getStr
@@ -289,6 +287,169 @@ proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull()): Tweet =
       result.text.removeSuffix(" Learn more.")
       result.available = false
 
+proc parseLegacyTweet(js: JsonNode): Tweet =
+  result = parseTweet(js, js{"card"})
+  if not result.isNil and result.available:
+    result.user = parseUser(js{"user"})
+
+    if result.quote.isSome:
+      result.quote = some parseLegacyTweet(js{"quoted_status"})
+
+proc parseTweetSearch*(js: JsonNode; after=""): Timeline =
+  result.beginning = after.len == 0
+
+  if js.kind == JNull or "modules" notin js or js{"modules"}.len == 0:
+    return
+
+  for item in js{"modules"}:
+    with tweet, item{"status", "data"}:
+      let parsed = parseLegacyTweet(tweet)
+
+      if parsed.retweet.isSome:
+        parsed.retweet = some parseLegacyTweet(tweet{"retweeted_status"})
+
+      result.content.add @[parsed]
+
+  if result.content.len > 0:
+    result.bottom = $(result.content[^1][0].id - 1)
+
+proc parseUserTimelineTweet(tweet: JsonNode; users: TableRef[string, User]): Tweet =
+  result = parseTweet(tweet, tweet{"card"})
+
+  if result.isNil or not result.available:
+    return
+
+  with user, tweet{"user"}:
+    let userId = user{"id_str"}.getStr
+    if user{"ext_is_blue_verified"}.getBool(false):
+      users[userId].verified = users[userId].verified or true
+    result.user = users[userId]
+
+proc parseUserTimeline*(js: JsonNode; after=""): Profile =
+  result = Profile(tweets: Timeline(beginning: after.len == 0))
+
+  if js.kind == JNull or "response" notin js or "twitter_objects" notin js:
+    return
+
+  var users = newTable[string, User]()
+  for userId, user in js{"twitter_objects", "users"}:
+    users[userId] = parseUser(user)
+
+  for entity in js{"response", "timeline"}:
+    let
+      tweetId = entity{"tweet", "id"}.getId
+      isPinned = entity{"tweet", "is_pinned"}.getBool(false)
+
+    with tweet, js{"twitter_objects", "tweets", $tweetId}:
+      var parsed = parseUserTimelineTweet(tweet, users)
+
+      if not parsed.isNil and parsed.available:
+        if parsed.quote.isSome:
+          parsed.quote = some parseUserTimelineTweet(tweet{"quoted_status"}, users)
+
+        if parsed.retweet.isSome:
+          let retweet = parseUserTimelineTweet(tweet{"retweeted_status"}, users)
+          if retweet.quote.isSome:
+            retweet.quote = some parseUserTimelineTweet(tweet{"retweeted_status", "quoted_status"}, users)
+          parsed.retweet = some retweet
+
+      if isPinned:
+        parsed.pinned = true
+        result.pinned = some parsed
+      else:
+        result.tweets.content.add parsed
+
+  result.tweets.bottom = js{"response", "cursor", "bottom"}.getStr
+
+# proc finalizeTweet(global: GlobalObjects; id: string): Tweet =
+#   let intId = if id.len > 0: parseBiggestInt(id) else: 0
+#   result = global.tweets.getOrDefault(id, Tweet(id: intId))
+
+#   if result.quote.isSome:
+#     let quote = get(result.quote).id
+#     if $quote in global.tweets:
+#       result.quote = some global.tweets[$quote]
+#     else:
+#       result.quote = some Tweet()
+
+#   if result.retweet.isSome:
+#     let rt = get(result.retweet).id
+#     if $rt in global.tweets:
+#       result.retweet = some finalizeTweet(global, $rt)
+#     else:
+#       result.retweet = some Tweet()
+
+# proc parsePin(js: JsonNode; global: GlobalObjects): Tweet =
+#   let pin = js{"pinEntry", "entry", "entryId"}.getStr
+#   if pin.len == 0: return
+
+#   let id = pin.getId
+#   if id notin global.tweets: return
+
+#   global.tweets[id].pinned = true
+#   return finalizeTweet(global, id)
+
+# proc parseGlobalObjects(js: JsonNode): GlobalObjects =
+#   result = GlobalObjects()
+#   let
+#     tweets = ? js{"globalObjects", "tweets"}
+#     users = ? js{"globalObjects", "users"}
+
+#   for k, v in users:
+#     result.users[k] = parseUser(v, k)
+
+#   for k, v in tweets:
+#     var tweet = parseTweet(v, v{"card"})
+#     if tweet.user.id in result.users:
+#       tweet.user = result.users[tweet.user.id]
+#     result.tweets[k] = tweet
+
+# proc parseInstructions(res: var Profile; global: GlobalObjects; js: JsonNode) =
+#   if js.kind != JArray or js.len == 0:
+#     return
+
+#   for i in js:
+#     if res.tweets.beginning and i{"pinEntry"}.notNull:
+#       with pin, parsePin(i, global):
+#         res.pinned = some pin
+
+#     with r, i{"replaceEntry", "entry"}:
+#       if "top" in r{"entryId"}.getStr:
+#         res.tweets.top = r.getCursor
+#       elif "bottom" in r{"entryId"}.getStr:
+#         res.tweets.bottom = r.getCursor
+
+# proc parseTimeline*(js: JsonNode; after=""): Profile =
+#   result = Profile(tweets: Timeline(beginning: after.len == 0))
+#   let global = parseGlobalObjects(? js)
+
+#   let instructions = ? js{"timeline", "instructions"}
+#   if instructions.len == 0: return
+
+#   result.parseInstructions(global, instructions)
+
+#   var entries: JsonNode
+#   for i in instructions:
+#     if "addEntries" in i:
+#       entries = i{"addEntries", "entries"}
+
+#   for e in ? entries:
+#     let entry = e{"entryId"}.getStr
+#     if "tweet" in entry or entry.startsWith("sq-I-t") or "tombstone" in entry:
+#       let tweet = finalizeTweet(global, e.getEntryId)
+#       if not tweet.available: continue
+#       result.tweets.content.add tweet
+#     elif "cursor-top" in entry:
+#       result.tweets.top = e.getCursor
+#     elif "cursor-bottom" in entry:
+#       result.tweets.bottom = e.getCursor
+#     elif entry.startsWith("sq-cursor"):
+#       with cursor, e{"content", "operation", "cursor"}:
+#         if cursor{"cursorType"}.getStr == "Bottom":
+#           result.tweets.bottom = cursor{"value"}.getStr
+#         else:
+#           result.tweets.top = cursor{"value"}.getStr
+
 proc parsePhotoRail*(js: JsonNode): PhotoRail =
   with error, js{"error"}:
     if error.getStr == "Not authorized.":
@@ -306,7 +467,7 @@ proc parsePhotoRail*(js: JsonNode): PhotoRail =
     if url.len == 0: continue
     result.add GalleryPhoto(url: url, tweetId: $t.id)
 
-proc parseGraphTweet(js: JsonNode; isLegacy=false): Tweet =
+proc parseGraphTweet(js: JsonNode): Tweet =
   if js.kind == JNull:
     return Tweet()
 
@@ -322,14 +483,9 @@ proc parseGraphTweet(js: JsonNode; isLegacy=false): Tweet =
   of "TweetPreviewDisplay":
     return Tweet(text: "You're unable to view this Tweet because it's only available to the Subscribers of the account owner.")
   of "TweetWithVisibilityResults":
-    return parseGraphTweet(js{"tweet"}, isLegacy)
+    return parseGraphTweet(js{"tweet"})
-  else:
-    discard
 
-  if not js.hasKey("legacy"):
+  var jsCard = copy(js{"tweet_card", "legacy"})
-    return Tweet()
-
-  var jsCard = copy(js{if isLegacy: "card" else: "tweet_card", "legacy"})
   if jsCard.kind != JNull:
     var values = newJObject()
     for val in jsCard["binding_values"]:
@@ -344,9 +500,10 @@ proc parseGraphTweet(js: JsonNode; isLegacy=false): Tweet =
     result.expandNoteTweetEntities(noteTweet)
 
   if result.quote.isSome:
-    result.quote = some(parseGraphTweet(js{"quoted_status_result", "result"}, isLegacy))
+    result.quote = some(parseGraphTweet(js{"quoted_status_result", "result"}))
 
 proc parseGraphThread(js: JsonNode): tuple[thread: Chain; self: bool] =
+  let thread = js{"content", "items"}
   for t in js{"content", "items"}:
     let entryId = t{"entryId"}.getStr
     if "cursor-showmore" in entryId:
@@ -354,33 +511,28 @@ proc parseGraphThread(js: JsonNode): tuple[thread: Chain; self: bool] =
       result.thread.cursor = cursor.getStr
       result.thread.hasMore = true
     elif "tweet" in entryId:
-      let
+      let tweet = parseGraphTweet(t{"item", "content", "tweetResult", "result"})
-        isLegacy = t{"item"}.hasKey("itemContent")
+      result.thread.content.add tweet
-        (contentKey, resultKey) = if isLegacy: ("itemContent", "tweet_results")
-                                  else: ("content", "tweetResult")
 
-      with content, t{"item", contentKey}:
+      if t{"item", "content", "tweetDisplayType"}.getStr == "SelfThread":
-        result.thread.content.add parseGraphTweet(content{resultKey, "result"}, isLegacy)
+        result.self = true
-
-        if content{"tweetDisplayType"}.getStr == "SelfThread":
-          result.self = true
 
 proc parseGraphTweetResult*(js: JsonNode): Tweet =
   with tweet, js{"data", "tweet_result", "result"}:
-    result = parseGraphTweet(tweet, false)
+    result = parseGraphTweet(tweet)
 
 proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
   result = Conversation(replies: Result[Chain](beginning: true))
 
-  let instructions = ? js{"data", "threaded_conversation_with_injections_v2", "instructions"}
+  let instructions = ? js{"data", "timeline_response", "instructions"}
   if instructions.len == 0:
     return
 
   for e in instructions[0]{"entries"}:
     let entryId = e{"entryId"}.getStr
     if entryId.startsWith("tweet"):
-      with tweetResult, e{"content", "itemContent", "tweet_results", "result"}:
+      with tweetResult, e{"content", "content", "tweetResult", "result"}:
-        let tweet = parseGraphTweet(tweetResult, true)
+        let tweet = parseGraphTweet(tweetResult)
 
         if not tweet.available:
           tweet.id = parseBiggestInt(entryId.getId())
@@ -394,7 +546,7 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
       let tweet = Tweet(
         id: parseBiggestInt(id),
         available: false,
-        text: e{"content", "itemContent", "tombstoneInfo", "richText"}.getTombstone
+        text: e{"content", "content", "tombstoneInfo", "richText"}.getTombstone
       )
 
       if id == tweetId:
@@ -408,7 +560,7 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
       else:
         result.replies.content.add thread
     elif entryId.startsWith("cursor-bottom"):
-      result.replies.bottom = e{"content", "itemContent", "value"}.getStr
+      result.replies.bottom = e{"content", "content", "value"}.getStr
 
 proc parseGraphTimeline*(js: JsonNode; root: string; after=""): Profile =
   result = Profile(tweets: Timeline(beginning: after.len == 0))
@@ -426,7 +578,7 @@ proc parseGraphTimeline*(js: JsonNode; root: string; after=""): Profile =
         let entryId = e{"entryId"}.getStr
         if entryId.startsWith("tweet"):
           with tweetResult, e{"content", "content", "tweetResult", "result"}:
-            let tweet = parseGraphTweet(tweetResult, false)
+            let tweet = parseGraphTweet(tweetResult)
             if not tweet.available:
               tweet.id = parseBiggestInt(entryId.getId())
             result.tweets.content.add tweet
@@ -437,7 +589,7 @@ proc parseGraphTimeline*(js: JsonNode; root: string; after=""): Profile =
           result.tweets.bottom = e{"content", "value"}.getStr
     if after.len == 0 and i{"__typename"}.getStr == "TimelinePinEntry":
       with tweetResult, i{"entry", "content", "content", "tweetResult", "result"}:
-        let tweet = parseGraphTweet(tweetResult, false)
+        let tweet = parseGraphTweet(tweetResult)
         tweet.pinned = true
         if not tweet.available and tweet.tombstone.len == 0:
           let entryId = i{"entry", "entryId"}.getEntryId
@@ -445,8 +597,8 @@ proc parseGraphTimeline*(js: JsonNode; root: string; after=""): Profile =
             tweet.id = parseBiggestInt(entryId)
         result.pinned = some tweet
 
-proc parseGraphSearch*[T: User | Tweets](js: JsonNode; after=""): Result[T] =
+proc parseGraphSearch*(js: JsonNode; after=""): Timeline =
-  result = Result[T](beginning: after.len == 0)
+  result = Timeline(beginning: after.len == 0)
 
   let instructions = js{"data", "search_by_raw_query", "search_timeline", "timeline", "instructions"}
   if instructions.len == 0:
@@ -455,21 +607,15 @@ proc parseGraphSearch*[T: User | Tweets](js: JsonNode; after=""): Result[T] =
   for instruction in instructions:
     let typ = instruction{"type"}.getStr
     if typ == "TimelineAddEntries":
-      for e in instruction{"entries"}:
+      for e in instructions[0]{"entries"}:
         let entryId = e{"entryId"}.getStr
-        when T is Tweets:
+        if entryId.startsWith("tweet"):
-          if entryId.startsWith("tweet"):
+          with tweetResult, e{"content", "itemContent", "tweet_results", "result"}:
-            with tweetRes, e{"content", "itemContent", "tweet_results", "result"}:
+            let tweet = parseGraphTweet(tweetResult)
-              let tweet = parseGraphTweet(tweetRes)
+            if not tweet.available:
-              if not tweet.available:
+              tweet.id = parseBiggestInt(entryId.getId())
-                tweet.id = parseBiggestInt(entryId.getId())
+            result.content.add tweet
-              result.content.add tweet
+        elif entryId.startsWith("cursor-bottom"):
-        elif T is User:
-          if entryId.startsWith("user"):
-            with userRes, e{"content", "itemContent"}:
-              result.content.add parseGraphUser(userRes)
-
-        if entryId.startsWith("cursor-bottom"):
           result.bottom = e{"content", "value"}.getStr
     elif typ == "TimelineReplaceEntry":
       if instruction{"entry_id_to_replace"}.getStr.startsWith("cursor-bottom"):

src/parserutils.nim

@@ -1,17 +1,9 @@
 # SPDX-License-Identifier: AGPL-3.0-only
-import std/[times, macros, htmlgen, options, algorithm, re]
+import std/[strutils, times, macros, htmlgen, options, algorithm, re]
-import std/strutils except escape
 import std/unicode except strip
-from xmltree import escape
 import packedjson
 import types, utils, formatters
 
-const
-  unicodeOpen = "\uFFFA"
-  unicodeClose = "\uFFFB"
-  xmlOpen = escape("<")
-  xmlClose = escape(">")
-
 let
   unRegex = re"(^|[^A-z0-9-_./?])@([A-z0-9_]{1,15})"
   unReplace = "$1<a href=\"/$2\">@$2</a>"
@@ -44,8 +36,7 @@ template with*(ident, value, body): untyped =
 template with*(ident; value: JsonNode; body): untyped =
   if true:
     let ident {.inject.} = value
-    # value.notNull causes a compilation error for versions < 1.6.14
+    if value.notNull: body
-    if notNull(value): body
 
 template getCursor*(js: JsonNode): string =
   js{"content", "operation", "cursor", "value"}.getStr
@@ -246,7 +237,7 @@ proc expandUserEntities*(user: var User; js: JsonNode) =
                      .replacef(htRegex, htReplace)
 
 proc expandTextEntities(tweet: Tweet; entities: JsonNode; text: string; textSlice: Slice[int];
-                        replyTo=""; hasRedundantLink=false) =
+                        replyTo=""; hasQuote=false) =
   let hasCard = tweet.card.isSome
 
   var replacements = newSeq[ReplaceSlice]()
@@ -257,7 +248,7 @@ proc expandTextEntities(tweet: Tweet; entities: JsonNode; text: string; textSlic
       if urlStr.len == 0 or urlStr notin text:
         continue
 
-      replacements.extractUrls(u, textSlice.b, hideTwitter = hasRedundantLink)
+      replacements.extractUrls(u, textSlice.b, hideTwitter = hasQuote)
 
       if hasCard and u{"url"}.getStr == get(tweet.card).url:
         get(tweet.card).url = u{"expanded_url"}.getStr
@@ -297,10 +288,9 @@ proc expandTextEntities(tweet: Tweet; entities: JsonNode; text: string; textSlic
 proc expandTweetEntities*(tweet: Tweet; js: JsonNode) =
   let
     entities = ? js{"entities"}
+    hasQuote = js{"is_quote_status"}.getBool
     textRange = js{"display_text_range"}
     textSlice = textRange{0}.getInt .. textRange{1}.getInt
-    hasQuote = js{"is_quote_status"}.getBool
-    hasJobCard = tweet.card.isSome and get(tweet.card).kind == jobDetails
 
   var replyTo = ""
   if tweet.replyId != 0:
@@ -308,14 +298,12 @@ proc expandTweetEntities*(tweet: Tweet; js: JsonNode) =
       replyTo = reply.getStr
       tweet.reply.add replyTo
 
-  tweet.expandTextEntities(entities, tweet.text, textSlice, replyTo, hasQuote or hasJobCard)
+  tweet.expandTextEntities(entities, tweet.text, textSlice, replyTo, hasQuote)
 
 proc expandNoteTweetEntities*(tweet: Tweet; js: JsonNode) =
   let
     entities = ? js{"entity_set"}
-    text = js{"text"}.getStr.multiReplace(("<", unicodeOpen), (">", unicodeClose))
+    text = js{"text"}.getStr
     textSlice = 0..text.runeLen
 
   tweet.expandTextEntities(entities, text, textSlice)
-
-  tweet.text = tweet.text.multiReplace((unicodeOpen, xmlOpen), (unicodeClose, xmlClose))

src/query.nim

@@ -60,7 +60,7 @@ proc genQueryParam*(query: Query): string =
       param &= "OR "
 
   if query.fromUser.len > 0 and query.kind in {posts, media}:
-    param &= "filter:self_threads OR -filter:replies "
+    param &= "filter:self_threads OR-filter:replies "
 
   if "nativeretweets" notin query.excludes:
     param &= "include:nativeretweets "

src/redis_cache.nim

@@ -52,7 +52,6 @@ proc initRedisPool*(cfg: Config) {.async.} =
     await migrate("profileDates", "p:*")
     await migrate("profileStats", "p:*")
     await migrate("userType", "p:*")
-    await migrate("verifiedType", "p:*")
 
     pool.withAcquire(r):
       # optimize memory usage for user ID buckets
@@ -86,7 +85,7 @@ proc cache*(data: List) {.async.} =
   await setEx(data.listKey, listCacheTime, compress(toFlatty(data)))
 
 proc cache*(data: PhotoRail; name: string) {.async.} =
-  await setEx("pr:" & toLower(name), baseCacheTime * 2, compress(toFlatty(data)))
+  await setEx("pr:" & toLower(name), baseCacheTime, compress(toFlatty(data)))
 
 proc cache*(data: User) {.async.} =
   if data.username.len == 0: return
@@ -148,15 +147,15 @@ proc getCachedUsername*(userId: string): Future[string] {.async.} =
     if result.len > 0 and user.id.len > 0:
       await all(cacheUserId(result, user.id), cache(user))
 
-# proc getCachedTweet*(id: int64): Future[Tweet] {.async.} =
+proc getCachedTweet*(id: int64): Future[Tweet] {.async.} =
-#   if id == 0: return
+  if id == 0: return
-#   let tweet = await get(id.tweetKey)
+  let tweet = await get(id.tweetKey)
-#   if tweet != redisNil:
+  if tweet != redisNil:
-#     tweet.deserialize(Tweet)
+    tweet.deserialize(Tweet)
-#   else:
+  else:
-#     result = await getGraphTweetResult($id)
+    result = await getGraphTweetResult($id)
-#     if not result.isNil:
+    if not result.isNil:
-#       await cache(result)
+      await cache(result)
 
 proc getCachedPhotoRail*(name: string): Future[PhotoRail] {.async.} =
   if name.len == 0: return

src/routes/debug.nim

@@ -1,13 +1,10 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 import jester
 import router_utils
-import ".."/[auth, types]
+import ".."/[tokens, types]
 
 proc createDebugRouter*(cfg: Config) =
   router debug:
-    get "/.health":
+    get "/.tokens":
-      respJson getAccountPoolHealth()
-
-    get "/.accounts":
       cond cfg.enableDebug
-      respJson getAccountPoolDebug()
+      respJson getPoolJson()

src/routes/media.nim

@@ -37,7 +37,6 @@ proc proxyMedia*(req: jester.Request; url: string): Future[HttpCode] {.async.} =
   try:
     let res = await client.get(url)
     if res.status != "200 OK":
-      echo "[media] Proxying failed, status: $1, url: $2" % [res.status, url]
       return Http404
 
     let hashed = $hash(url)
@@ -66,7 +65,6 @@ proc proxyMedia*(req: jester.Request; url: string): Future[HttpCode] {.async.} =
         await request.client.send(data)
     data.setLen 0
   except HttpRequestError, ProtocolError, OSError:
-    echo "[media] Proxying exception, error: $1, url: $2" % [getCurrentExceptionMsg(), url]
     result = Http404
   finally:
     client.close()

src/routes/rss.nim

@@ -15,7 +15,7 @@ proc redisKey*(page, name, cursor: string): string =
   if cursor.len > 0:
     result &= ":" & cursor
 
-proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs; tab, param: string): Future[Rss] {.async.} =
+proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs): Future[Rss] {.async.} =
   var profile: Profile
   let
     name = req.params.getOrDefault("name")
@@ -27,7 +27,7 @@ proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs; tab, pa
   else:
     var q = query
     q.fromUser = names
-    profile.tweets = await getGraphTweetSearch(q, after)
+    profile.tweets = await getTweetSearch(q, after)
     # this is kinda dumb
     profile.user = User(
       username: name,
@@ -39,7 +39,7 @@ proc timelineRss*(req: Request; cfg: Config; query: Query; prefs: Prefs; tab, pa
     return Rss(feed: profile.user.username, cursor: "suspended")
 
   if profile.user.fullname.len > 0:
-    let rss = renderTimelineRss(profile, cfg, prefs, tab, param, multi=(names.len > 1))
+    let rss = renderTimelineRss(profile, cfg, prefs, multi=(names.len > 1))
     return Rss(feed: rss, cursor: profile.tweets.bottom)
 
 template respRss*(rss, page) =
@@ -76,7 +76,7 @@ proc createRssRouter*(cfg: Config) =
       if rss.cursor.len > 0:
         respRss(rss, "Search")
 
-      let tweets = await getGraphTweetSearch(query, cursor)
+      let tweets = await getTweetSearch(query, cursor)
       rss.cursor = tweets.bottom
       rss.feed = renderSearchRss(tweets.content, query.text, genQueryUrl(query), cfg, cookiePrefs())
 
@@ -94,7 +94,7 @@ proc createRssRouter*(cfg: Config) =
       if rss.cursor.len > 0:
         respRss(rss, "User")
 
-      rss = await timelineRss(request, cfg, Query(fromUser: @[name]), cookiePrefs(), "", "")
+      rss = await timelineRss(request, cfg, Query(fromUser: @[name]), cookiePrefs())
 
       await cacheRss(key, rss)
       respRss(rss, "User")
@@ -110,13 +110,11 @@ proc createRssRouter*(cfg: Config) =
           case tab
           of "with_replies": getReplyQuery(name)
           of "media": getMediaQuery(name)
-          of "search": initQuery(params(request), name=name)
+          # of "search": initQuery(params(request), name=name)
           else: Query(fromUser: @[name])
 
-      let param = if tab != "search": ""
-                  else: genQueryUrl(query)
       let searchKey = if tab != "search": ""
-                      else: ":" & $hash(param)
+                      else: ":" & $hash(genQueryUrl(query))
 
       let key = redisKey(tab, name & searchKey, getCursor())
 
@@ -124,7 +122,7 @@ proc createRssRouter*(cfg: Config) =
       if rss.cursor.len > 0:
         respRss(rss, "User")
 
-      rss = await timelineRss(request, cfg, query, cookiePrefs(), tab, param)
+      rss = await timelineRss(request, cfg, query, cookiePrefs())
 
       await cacheRss(key, rss)
       respRss(rss, "User")

src/routes/search.nim

@@ -29,13 +29,13 @@ proc createSearchRouter*(cfg: Config) =
           redirect("/" & q)
         var users: Result[User]
         try:
-          users = await getGraphUserSearch(query, getCursor())
+          users = await getUserSearch(query, getCursor())
         except InternalError:
           users = Result[User](beginning: true, query: query)
         resp renderMain(renderUserSearch(users, prefs), request, cfg, prefs, title)
       of tweets:
         let
-          tweets = await getGraphTweetSearch(query, getCursor())
+          tweets = await getTweetSearch(query, getCursor())
           rss = "/search/rss?" & genQueryUrl(query)
         resp renderMain(renderTweetSearch(tweets, prefs, getPath()),
                         request, cfg, prefs, title, rss=rss)

src/routes/timeline.nim

@@ -53,10 +53,10 @@ proc fetchProfile*(after: string; query: Query; skipRail=false;
 
   result =
     case query.kind
-    of posts: await getGraphUserTweets(userId, TimelineKind.tweets, after)
+    of posts: await getUserTimeline(userId, after)
     of replies: await getGraphUserTweets(userId, TimelineKind.replies, after)
     of media: await getGraphUserTweets(userId, TimelineKind.media, after)
-    else: Profile(tweets: await getGraphTweetSearch(query, after))
+    else: Profile(tweets: await getTweetSearch(query, after))
 
   result.user = await user
   result.photoRail = await rail
@@ -67,7 +67,7 @@ proc showTimeline*(request: Request; query: Query; cfg: Config; prefs: Prefs;
                    rss, after: string): Future[string] {.async.} =
   if query.fromUser.len != 1:
     let
-      timeline = await getGraphTweetSearch(query, after)
+      timeline = await getTweetSearch(query, after)
       html = renderTweetSearch(timeline, prefs, getPath())
     return renderMain(html, request, cfg, prefs, "Multi", rss=rss)
 
@@ -122,7 +122,7 @@ proc createTimelineRouter*(cfg: Config) =
       # used for the infinite scroll feature
       if @"scroll".len > 0:
         if query.fromUser.len != 1:
-          var timeline = await getGraphTweetSearch(query, after)
+          var timeline = await getTweetSearch(query, after)
           if timeline.content.len == 0: resp Http404
           timeline.beginning = true
           resp $renderTweetSearch(timeline, prefs, getPath())

src/sass/include/_variables.scss

@@ -28,8 +28,6 @@ $more_replies_dots: #AD433B;
 $error_red: #420A05;
 
 $verified_blue: #1DA1F2;
-$verified_business: #FAC82B;
-$verified_government: #C1B6A4;
 $icon_text: $fg_color;
 
 $tab: $fg_color;

src/sass/index.scss

@@ -39,8 +39,6 @@ body {
     --error_red: #{$error_red};
 
     --verified_blue: #{$verified_blue};
-    --verified_business: #{$verified_business};
-    --verified_government: #{$verified_government};
     --icon_text: #{$icon_text};
 
     --tab: #{$fg_color};
@@ -143,30 +141,17 @@ ul {
 
 .verified-icon {
     color: var(--icon_text);
+    background-color: var(--verified_blue);
     border-radius: 50%;
     flex-shrink: 0;
     margin: 2px 0 3px 3px;
-    padding-top: 3px;
+    padding-top: 2px;
-    height: 11px;
+    height: 12px;
     width: 14px;
     font-size: 8px;
     display: inline-block;
     text-align: center;
     vertical-align: middle;
-
-    &.blue {
-        background-color: var(--verified_blue);
-    }
-
-    &.business {
-        color: var(--bg_panel);
-        background-color: var(--verified_business);
-    }
-
-    &.government {
-        color: var(--bg_panel);
-        background-color: var(--verified_government);
-    }
 }
 
 @media(max-width: 600px) {

src/sass/navbar.scss

@@ -70,9 +70,8 @@ nav {
 
 .lp {
     height: 14px;
-    display: inline-block;
+    margin-top: 2px;
-    position: relative;
+    display: block;
-    top: 2px;
     fill: var(--fg_nav);
 
     &:hover {

src/sass/profile/card.scss

@@ -115,7 +115,7 @@
     }
 
     .profile-card-tabs-name {
-        flex-shrink: 100;
+        @include breakable;
     }
 
     .profile-card-avatar {

src/sass/search.scss

@@ -14,8 +14,6 @@
     button {
         margin: 0 2px 0 0;
         height: 23px;
-        display: flex;
-        align-items: center;
     }
 
     .pref-input {

src/tokens.nim

@@ -0,0 +1,166 @@
+# SPDX-License-Identifier: AGPL-3.0-only
+import asyncdispatch, httpclient, times, sequtils, json, random
+import strutils, tables
+import types, consts
+
+const
+  maxConcurrentReqs = 5  # max requests at a time per token, to avoid race conditions
+  maxLastUse = 1.hours   # if a token is unused for 60 minutes, it expires
+  maxAge = 2.hours + 55.minutes  # tokens expire after 3 hours
+  failDelay = initDuration(minutes=30)
+
+var
+  tokenPool: seq[Token]
+  lastFailed: Time
+  enableLogging = false
+
+let headers = newHttpHeaders({"authorization": auth})
+
+template log(str) =
+  if enableLogging: echo "[tokens] ", str
+
+proc getPoolJson*(): JsonNode =
+  var
+    list = newJObject()
+    totalReqs = 0
+    totalPending = 0
+    reqsPerApi: Table[string, int]
+
+  for token in tokenPool:
+    totalPending.inc(token.pending)
+    list[token.tok] = %*{
+      "apis": newJObject(),
+      "pending": token.pending,
+      "init": $token.init,
+      "lastUse": $token.lastUse
+    }
+
+    for api in token.apis.keys:
+      list[token.tok]["apis"][$api] = %token.apis[api]
+
+      let
+        maxReqs =
+          case api
+          of Api.search: 100000
+          of Api.photoRail: 180
+          of Api.timeline: 187
+          of Api.userTweets, Api.userTimeline: 300
+          of Api.userTweetsAndReplies, Api.userRestId,
+             Api.userScreenName, Api.tweetDetail, Api.tweetResult,
+             Api.list, Api.listTweets, Api.listMembers, Api.listBySlug, Api.userMedia: 500
+          of Api.userSearch: 900
+        reqs = maxReqs - token.apis[api].remaining
+
+      reqsPerApi[$api] = reqsPerApi.getOrDefault($api, 0) + reqs
+      totalReqs.inc(reqs)
+
+  return %*{
+    "amount": tokenPool.len,
+    "requests": totalReqs,
+    "pending": totalPending,
+    "apis": reqsPerApi,
+    "tokens": list
+  }
+
+proc rateLimitError*(): ref RateLimitError =
+  newException(RateLimitError, "rate limited")
+
+proc fetchToken(): Future[Token] {.async.} =
+  if getTime() - lastFailed < failDelay:
+    raise rateLimitError()
+
+  let client = newAsyncHttpClient(headers=headers)
+
+  try:
+    let
+      resp = await client.postContent(activate)
+      tokNode = parseJson(resp)["guest_token"]
+      tok = tokNode.getStr($(tokNode.getInt))
+      time = getTime()
+
+    return Token(tok: tok, init: time, lastUse: time)
+  except Exception as e:
+    echo "[tokens] fetching token failed: ", e.msg
+    if "Try again" notin e.msg:
+      echo "[tokens] fetching tokens paused, resuming in 30 minutes"
+      lastFailed = getTime()
+  finally:
+    client.close()
+
+proc expired(token: Token): bool =
+  let time = getTime()
+  token.init < time - maxAge or token.lastUse < time - maxLastUse
+
+proc isLimited(token: Token; api: Api): bool =
+  if token.isNil or token.expired:
+    return true
+
+  if api in token.apis:
+    let limit = token.apis[api]
+    return (limit.remaining <= 10 and limit.reset > epochTime().int)
+  else:
+    return false
+
+proc isReady(token: Token; api: Api): bool =
+  not (token.isNil or token.pending > maxConcurrentReqs or token.isLimited(api))
+
+proc release*(token: Token; used=false; invalid=false) =
+  if token.isNil: return
+  if invalid or token.expired:
+    if invalid: log "discarding invalid token"
+    elif token.expired: log "discarding expired token"
+
+    let idx = tokenPool.find(token)
+    if idx > -1: tokenPool.delete(idx)
+  elif used:
+    dec token.pending
+    token.lastUse = getTime()
+
+proc getToken*(api: Api): Future[Token] {.async.} =
+  for i in 0 ..< tokenPool.len:
+    if result.isReady(api): break
+    release(result)
+    result = tokenPool.sample()
+
+  if not result.isReady(api):
+    release(result)
+    result = await fetchToken()
+    log "added new token to pool"
+    tokenPool.add result
+
+  if not result.isNil:
+    inc result.pending
+  else:
+    raise rateLimitError()
+
+proc setRateLimit*(token: Token; api: Api; remaining, reset: int) =
+  # avoid undefined behavior in race conditions
+  if api in token.apis:
+    let limit = token.apis[api]
+    if limit.reset >= reset and limit.remaining < remaining:
+      return
+
+  token.apis[api] = RateLimit(remaining: remaining, reset: reset)
+
+proc poolTokens*(amount: int) {.async.} =
+  var futs: seq[Future[Token]]
+  for i in 0 ..< amount:
+    futs.add fetchToken()
+
+  for token in futs:
+    var newToken: Token
+
+    try: newToken = await token
+    except: discard
+
+    if not newToken.isNil:
+      log "added new token to pool"
+      tokenPool.add newToken
+
+proc initTokenPool*(cfg: Config) {.async.} =
+  enableLogging = cfg.enableDebug
+
+  while true:
+    if tokenPool.countIt(not it.isLimited(Api.userTimeline)) < cfg.minTokens:
+      await poolTokens(min(4, cfg.minTokens - tokenPool.len))
+    await sleepAsync(2000)

src/types.nim

@@ -10,13 +10,18 @@ type
   BadClientError* = object of CatchableError
 
   TimelineKind* {.pure.} = enum
-    tweets, replies, media
+    tweets
+    replies
+    media
 
   Api* {.pure.} = enum
     tweetDetail
     tweetResult
+    timeline
+    userTimeline
     photoRail
     search
+    userSearch
     list
     listBySlug
     listMembers
@@ -30,13 +35,11 @@ type
   RateLimit* = object
     remaining*: int
     reset*: int
-    limited*: bool
-    limitedAt*: int
 
-  GuestAccount* = ref object
+  Token* = ref object
-    id*: int64
+    tok*: string
-    oauthToken*: string
+    init*: Time
-    oauthSecret*: string
+    lastUse*: Time
     pending*: int
     apis*: Table[Api, RateLimit]
 
@@ -51,7 +54,7 @@ type
     userNotFound = 50
     suspended = 63
     rateLimited = 88
-    expiredToken = 89
+    invalidToken = 89
     listIdOrSlug = 112
     tweetNotFound = 144
     tweetNotAuthorized = 179
@@ -61,12 +64,6 @@ type
     tweetUnavailable = 421
     tweetCensored = 422
 
-  VerifiedType* = enum
-    none = "None"
-    blue = "Blue"
-    business = "Business"
-    government = "Government"
-
   User* = object
     id*: string
     username*: string
@@ -82,7 +79,7 @@ type
     tweets*: int
     likes*: int
     media*: int
-    verifiedType*: VerifiedType
+    verified*: bool
     protected*: bool
     suspended*: bool
     joinDate*: DateTime
@@ -166,10 +163,9 @@ type
     imageDirectMessage = "image_direct_message"
     audiospace = "audiospace"
     newsletterPublication = "newsletter_publication"
-    jobDetails = "job_details"
     hidden
     unknown
-
+    
   Card* = object
     kind*: CardKind
     url*: string

src/utils.nim

@@ -16,8 +16,7 @@ const
     "twimg.com",
     "abs.twimg.com",
     "pbs.twimg.com",
-    "video.twimg.com",
+    "video.twimg.com"
-    "x.com"
   ]
 
 proc setHmacKey*(key: string) =
@@ -31,9 +30,7 @@ proc getHmac*(data: string): string =
 
 proc getVidUrl*(link: string): string =
   if link.len == 0: return
-  let 
+  let sig = getHmac(link)
-    link = link.replace("cmaf", "fmp4")
-    sig = getHmac(link)
   if base64Media:
     &"/video/enc/{sig}/{encode(link, safe=true)}"
   else:
@@ -60,4 +57,4 @@ proc isTwitterUrl*(uri: Uri): bool =
   uri.hostname in twitterDomains
 
 proc isTwitterUrl*(url: string): bool =
-  isTwitterUrl(parseUri(url))
+  parseUri(url).hostname in twitterDomains

src/views/general.nim

@@ -52,7 +52,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
   let opensearchUrl = getUrlPrefix(cfg) & "/opensearch"
 
   buildHtml(head):
-    link(rel="stylesheet", type="text/css", href="/css/style.css?v=19")
+    link(rel="stylesheet", type="text/css", href="/css/style.css?v=18")
     link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=2")
 
     if theme.len > 0:

src/views/renderutils.nim

@@ -23,13 +23,6 @@ proc icon*(icon: string; text=""; title=""; class=""; href=""): VNode =
     if text.len > 0:
       text " " & text
 
-template verifiedIcon*(user: User): untyped {.dirty.} =
-  if user.verifiedType != VerifiedType.none:
-    let lower = ($user.verifiedType).toLowerAscii()
-    icon "ok", class=(&"verified-icon {lower}"), title=(&"Verified {lower} account")
-  else:
-    text ""
-
 proc linkUser*(user: User, class=""): VNode =
   let
     isName = "username" notin class
@@ -39,11 +32,11 @@ proc linkUser*(user: User, class=""): VNode =
 
   buildHtml(a(href=href, class=class, title=nameText)):
     text nameText
-    if isName:
+    if isName and user.verified:
-      verifiedIcon(user)
+      icon "ok", class="verified-icon", title="Verified account"
-      if user.protected:
+    if isName and user.protected:
-        text " "
+      text " "
-        icon "lock", title="Protected account"
+      icon "lock", title="Protected account"
 
 proc linkText*(text: string; class=""): VNode =
   let url = if "http" notin text: https & text else: text

src/views/rss.nimf

@@ -132,20 +132,8 @@ Twitter feed for: ${desc}. Generated by ${cfg.hostname}
 #end for
 #end proc
 #
-#proc renderTimelineRss*(profile: Profile; cfg: Config; prefs: Prefs; tab, param: string; multi=false): string =
+#proc renderTimelineRss*(profile: Profile; cfg: Config; prefs: Prefs; multi=false): string =
 #let urlPrefix = getUrlPrefix(cfg)
-#var atomLink = &"{urlPrefix}/{profile.user.username}"
-#var link = &"{urlPrefix}/{profile.user.username}"
-#if tab != "":
-#  atomLink &= "/" & tab
-#  link &= "/" & tab
-#end if
-#atomLink &= "/rss"
-#if param != "":
-#  let escParam = xmltree.escape(param)
-#  atomLink &= "?" & escParam
-#  link &= "?" & escParam
-#end if
 #result = ""
 #let handle = (if multi: "" else: "@") & profile.user.username
 #var title = profile.user.fullname
@@ -155,9 +143,9 @@ Twitter feed for: ${desc}. Generated by ${cfg.hostname}
 <?xml version="1.0" encoding="UTF-8"?>
 <rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
   <channel>
-    <atom:link href="${atomLink}" rel="self" type="application/rss+xml" />
+    <atom:link href="${urlPrefix}/${profile.user.username}/rss" rel="self" type="application/rss+xml" />
     <title>${title}</title>
-    <link>${link}</link>
+    <link>${urlPrefix}/${profile.user.username}</link>
     <description>${getDescription(handle, cfg)}</description>
     <language>en-us</language>
     <ttl>40</ttl>
@@ -193,16 +181,15 @@ ${renderRssTweets(tweets, cfg, prefs)}
 #end proc
 #
 #proc renderSearchRss*(tweets: seq[Tweets]; name, param: string; cfg: Config; prefs: Prefs): string =
-#let urlPrefix = getUrlPrefix(cfg)
+#let link = &"{getUrlPrefix(cfg)}/search"
 #let escName = xmltree.escape(name)
-#let escParam = xmltree.escape(param)
 #result = ""
 <?xml version="1.0" encoding="UTF-8"?>
 <rss xmlns:atom="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/" version="2.0">
   <channel>
-    <atom:link href="${urlPrefix}/search/rss?${escParam}" rel="self" type="application/rss+xml" />
+    <atom:link href="${link}" rel="self" type="application/rss+xml" />
     <title>Search results for "${escName}"</title>
-    <link>${urlPrefix}/search?${escParam}</link>
+    <link>${link}</link>
     <description>${getDescription(&"Search \"{escName}\"", cfg)}</description>
     <language>en-us</language>
     <ttl>40</ttl>

src/views/tweet.nim

@@ -200,7 +200,8 @@ proc renderAttribution(user: User; prefs: Prefs): VNode =
   buildHtml(a(class="attribution", href=("/" & user.username))):
     renderMiniAvatar(user, prefs)
     strong: text user.fullname
-    verifiedIcon(user)
+    if user.verified:
+      icon "ok", class="verified-icon", title="Verified account"
 
 proc renderMediaTags(tags: seq[User]): VNode =
   buildHtml(tdiv(class="media-tag-block")):

tests/test_card.py

@@ -13,6 +13,11 @@ card = [
      'Basic OBS Studio plugin, written in nim, supporting C++ (C fine too) - obsplugin.nim',
      'gist.github.com', True],
 
+    ['FluentAI/status/1116417904831029248',
+     'Amazon’s Alexa isn’t just AI — thousands of humans are listening',
+     'One of the only ways to improve Alexa is to have human beings check it for errors',
+     'theverge.com', True],
+
     ['nim_lang/status/1082989146040340480',
      'Nim in 2018: A short recap',
      'There were several big news in the Nim world in 2018 – two new major releases, partnership with Status, and much more. But let us go chronologically.',
@@ -20,11 +25,6 @@ card = [
 ]
 
 no_thumb = [
-    ['FluentAI/status/1116417904831029248',
-     'LinkedIn',
-     'This link will take you to a page that’s not on LinkedIn',
-     'lnkd.in'],
-
     ['Thom_Wolf/status/1122466524860702729',
      'facebookresearch/fairseq',
      'Facebook AI Research Sequence-to-Sequence Toolkit written in Python. - GitHub - facebookresearch/fairseq: Facebook AI Research Sequence-to-Sequence Toolkit written in Python.',

tests/test_quote.py

@@ -9,7 +9,7 @@ text = [
 What are we doing wrong? reuters.com/article/us-norwa…"""],
 
     ['nim_lang/status/1491461266849808397#m',
-     'Nim', '@nim_lang',
+     'Nim language', '@nim_lang',
      """What's better than Nim 1.6.0?
 
 Nim 1.6.2 :)

tests/test_timeline.py

@@ -6,7 +6,7 @@ normal = [['jack'], ['elonmusk']]
 after = [['jack', '1681686036294803456'],
          ['elonmusk', '1681686036294803456']]
 
-no_more = [['mobile_test_8?cursor=DAABCgABF4YVAqN___kKAAICNn_4msIQAAgAAwAAAAIAAA']]
+no_more = [['mobile_test_8?cursor=1000']]
 
 empty = [['emptyuser'], ['mobile_test_10']]
 

tests/test_tweet.py

@@ -1,4 +1,4 @@
-from base import BaseTestCase, Tweet, Conversation, get_timeline_tweet
+from base import BaseTestCase, Tweet, get_timeline_tweet
 from parameterized import parameterized
 
 # image = tweet + 'div.attachments.media-body > div > div > a > div > img'
@@ -35,16 +35,7 @@ multiline = [
  CALM
    AND
 CLICHÉ
-    ON"""],
+    ON"""]
-    [1718660434457239868, 'WebDesignMuseum',
-     """
-Happy 32nd Birthday HTML tags! 
-
-On October 29, 1991, the internet pioneer, Tim Berners-Lee, published a document entitled HTML Tags. 
-
-The document contained a description of the first 18 HTML tags: <title>, <nextid>, <a>, <isindex>, <plaintext>, <listing>, <p>, <h1>…<h6>, <address>, <hp1>, <hp2>…, <dl>, <dt>, <dd>, <ul>, <li>,<menu> and <dir>. The design of the first version of HTML language was influenced by the SGML universal markup language.
-
-#WebDesignHistory"""]
 ]
 
 link = [
@@ -83,18 +74,22 @@ retweet = [
     [3, 'mobile_test_8', 'mobile test 8', 'jack', '@jack', 'twttr']
 ]
 
+# reply = [
+#     ['mobile_test/with_replies', 15]
+# ]
+
 
 class TweetTest(BaseTestCase):
-    @parameterized.expand(timeline)
+    # @parameterized.expand(timeline)
-    def test_timeline(self, index, fullname, username, date, tid, text):
+    # def test_timeline(self, index, fullname, username, date, tid, text):
-        self.open_nitter(username)
+    #     self.open_nitter(username)
-        tweet = get_timeline_tweet(index)
+    #     tweet = get_timeline_tweet(index)
-        self.assert_exact_text(fullname, tweet.fullname)
+    #     self.assert_exact_text(fullname, tweet.fullname)
-        self.assert_exact_text('@' + username, tweet.username)
+    #     self.assert_exact_text('@' + username, tweet.username)
-        self.assert_exact_text(date, tweet.date)
+    #     self.assert_exact_text(date, tweet.date)
-        self.assert_text(text, tweet.text)
+    #     self.assert_text(text, tweet.text)
-        permalink = self.find_element(tweet.date + ' a')
+    #     permalink = self.find_element(tweet.date + ' a')
-        self.assertIn(tid, permalink.get_attribute('href'))
+    #     self.assertIn(tid, permalink.get_attribute('href'))
 
     @parameterized.expand(status)
     def test_status(self, tid, fullname, username, date, text):
@@ -108,18 +103,18 @@ class TweetTest(BaseTestCase):
     @parameterized.expand(multiline)
     def test_multiline_formatting(self, tid, username, text):
         self.open_nitter(f'{username}/status/{tid}')
-        self.assert_text(text.strip('\n'), Conversation.main)
+        self.assert_text(text.strip('\n'), '.main-tweet')
 
     @parameterized.expand(emoji)
     def test_emoji(self, tweet, text):
         self.open_nitter(tweet)
-        self.assert_text(text, Conversation.main)
+        self.assert_text(text, '.main-tweet')
 
     @parameterized.expand(link)
     def test_link(self, tweet, links):
         self.open_nitter(tweet)
         for link in links:
-            self.assert_text(link, Conversation.main)
+            self.assert_text(link, '.main-tweet')
 
     @parameterized.expand(username)
     def test_username(self, tweet, usernames):
@@ -128,22 +123,22 @@ class TweetTest(BaseTestCase):
             link = self.find_link_text(f'@{un}')
             self.assertIn(f'/{un}', link.get_property('href'))
 
-    @parameterized.expand(retweet)
+    # @parameterized.expand(retweet)
-    def test_retweet(self, index, url, retweet_by, fullname, username, text):
+    # def test_retweet(self, index, url, retweet_by, fullname, username, text):
-        self.open_nitter(url)
+    #     self.open_nitter(url)
-        tweet = get_timeline_tweet(index)
+    #     tweet = get_timeline_tweet(index)
-        self.assert_text(f'{retweet_by} retweeted', tweet.retweet)
+    #     self.assert_text(f'{retweet_by} retweeted', tweet.retweet)
-        self.assert_text(text, tweet.text)
+    #     self.assert_text(text, tweet.text)
-        self.assert_exact_text(fullname, tweet.fullname)
+    #     self.assert_exact_text(fullname, tweet.fullname)
-        self.assert_exact_text(username, tweet.username)
+    #     self.assert_exact_text(username, tweet.username)
 
     @parameterized.expand(invalid)
     def test_invalid_id(self, tweet):
         self.open_nitter(tweet)
         self.assert_text('Tweet not found', '.error-panel')
 
-    #@parameterized.expand(reply)
+    # @parameterized.expand(reply)
-    #def test_thread(self, tweet, num):
+    # def test_thread(self, tweet, num):
-        #self.open_nitter(tweet)
+    #     self.open_nitter(tweet)
-        #thread = self.find_element(f'.timeline > div:nth-child({num})')
+    #     thread = self.find_element(f'.timeline > div:nth-child({num})')
-        #self.assertIn(thread.get_attribute('class'), 'thread-line')
+    #     self.assertIn(thread.get_attribute('class'), 'thread-line')

tests/test_tweet_media.py

@@ -14,7 +14,7 @@ poll = [
 
 image = [
     ['mobile_test/status/519364660823207936', 'BzUnaDFCUAAmrjs'],
-    #['mobile_test_2/status/324619691039543297', 'BIFH45vCUAAQecj']
+    ['mobile_test_2/status/324619691039543297', 'BIFH45vCUAAQecj']
 ]
 
 gif = [