Merge branch 'zedeus:master' into master

src/api.nim

@@ -33,6 +33,13 @@ 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 getGraphListTweets*(id: string; after=""): Future[Timeline] {.async.} =
   if id.len == 0: return
   let
@@ -198,7 +205,7 @@ proc getPhotoRail*(name: string): Future[PhotoRail] {.async.} =
     ps = genParams({"screen_name": name, "trim_user": "true"},
                     count="18", ext=false)
     url = photoRail ? ps
-  result = parsePhotoRail(await fetch(url, Api.timeline))
+  result = parsePhotoRail(await fetch(url, Api.photoRail))
 
 proc resolve*(url: string; prefs: Prefs): Future[string] {.async.} =
   let client = newAsyncHttpClient(maxRedirects=0)

src/consts.nim

@@ -14,6 +14,8 @@ const
   userSearch* = api / "1.1/users/search.json"
   tweetSearch* = api / "1.1/search/tweets.json"
 
+  oldUserTweets* = api / "2/timeline/profile"
+
   graphql = api / "graphql"
   graphUser* = graphql / "u7wQyGi6oExe8_TRWGMq4Q/UserResultByScreenNameQuery"
   graphUserById* = graphql / "oPppcargziU1uDQHAUmH-A/UserResultByIdQuery"
@@ -105,6 +107,18 @@ const
   "includeHasBirdwatchNotes": false
 }"""
 
+  oldUserTweetsVariables* = """{
+  "userId": "$1", $2
+  "count": 20,
+  "includePromotedContent": false,
+  "withDownvotePerspective": false,
+  "withReactionsMetadata": false,
+  "withReactionsPerspective": false,
+  "withVoice": false,
+  "withV2Timeline": true
+}
+"""
+
   userTweetsVariables* = """{
   "rest_id": "$1", $2
   "count": 20

src/nitter.nim

@@ -83,7 +83,7 @@ routes:
 
   error BadClientError:
     echo error.exc.name, ": ", error.exc.msg
-    resp Http500, showError("Network error occured, please try again.", cfg)
+    resp Http500, showError("Network error occurred, please try again.", cfg)
 
   error RateLimitError:
     const link = a("another instance", href = instancesUrl)

src/parser.nim

@@ -336,6 +336,16 @@ proc finalizeTweet(global: GlobalObjects; id: string): Tweet =
     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
@@ -346,24 +356,28 @@ proc parseGlobalObjects(js: JsonNode): GlobalObjects =
     result.users[k] = parseUser(v, k)
 
   for k, v in tweets:
-    var tweet = parseTweet(v, v{"tweet_card"})
+    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[T](res: var Result[T]; global: GlobalObjects; js: JsonNode) =
+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.top = r.getCursor
+        res.tweets.top = r.getCursor
       elif "bottom" in r{"entryId"}.getStr:
-        res.bottom = r.getCursor
+        res.tweets.bottom = r.getCursor
 
-proc parseTimeline*(js: JsonNode; after=""): Timeline =
+proc parseTimeline*(js: JsonNode; after=""): Profile =
-  result = Timeline(beginning: after.len == 0)
+  result = Profile(tweets: Timeline(beginning: after.len == 0))
   let global = parseGlobalObjects(? js)
 
   let instructions = ? js{"timeline", "instructions"}
@@ -381,17 +395,17 @@ proc parseTimeline*(js: JsonNode; after=""): Timeline =
     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.content.add tweet
+      result.tweets.content.add tweet
     elif "cursor-top" in entry:
-      result.top = e.getCursor
+      result.tweets.top = e.getCursor
     elif "cursor-bottom" in entry:
-      result.bottom = e.getCursor
+      result.tweets.bottom = e.getCursor
     elif entry.startsWith("sq-cursor"):
       with cursor, e{"content", "operation", "cursor"}:
         if cursor{"cursorType"}.getStr == "Bottom":
-          result.bottom = cursor{"value"}.getStr
+          result.tweets.bottom = cursor{"value"}.getStr
         else:
-          result.top = cursor{"value"}.getStr
+          result.tweets.top = cursor{"value"}.getStr
 
 proc parsePhotoRail*(js: JsonNode): PhotoRail =
   with error, js{"error"}:

src/routes/timeline.nim

@@ -54,7 +54,7 @@ proc fetchProfile*(after: string; query: Query; cfg: Config; skipRail=false;
 
   result =
     case query.kind
-    of posts: await getGraphUserTweets(userId, TimelineKind.tweets, after)
+    of posts: await getTimeline(userId, after)
     of replies: await getGraphUserTweets(userId, TimelineKind.replies, after)
     of media: await getGraphUserTweets(userId, TimelineKind.media, after)
     of favorites: Profile(tweets: await getFavorites(userId, cfg, after))

src/tokens.nim

@@ -41,8 +41,10 @@ proc getPoolJson*(): JsonNode =
       let
         maxReqs =
           case api
-          of Api.timeline, Api.search: 180
+          of Api.photoRail, Api.search: 180
-          of Api.userTweets, Api.userTweetsAndReplies, Api.userRestId,
+          of Api.timeline: 187
+          of Api.userTweets: 300
+          of Api.userTweetsAndReplies, Api.userRestId,
              Api.userScreenName, Api.tweetDetail, Api.tweetResult: 500
           of Api.list, Api.listTweets, Api.listMembers, Api.listBySlug, Api.userMedia, Api.favorites, Api.retweeters, Api.favoriters: 500
           of Api.userSearch: 900

src/types.nim

@@ -18,6 +18,7 @@ type
     tweetDetail
     tweetResult
     timeline
+    photoRail
     search
     userSearch
     list

src/views/embed.nim

@@ -11,7 +11,7 @@ const doctype = "<!DOCTYPE html>\n"
 proc renderVideoEmbed*(tweet: Tweet; cfg: Config; req: Request): string =
   let thumb = get(tweet.video).thumb
   let vidUrl = getVideoEmbed(cfg, tweet.id)
-  let prefs = Prefs(hlsPlayback: true)
+  let prefs = Prefs(hlsPlayback: true, mp4Playback: true)
   let node = buildHtml(html(lang="en")):
     renderHead(prefs, cfg, req, video=vidUrl, images=(@[thumb]))