Merge remote-tracking branch 'upstream/master'

2025-11-17 10:10:27 -03:00
parent c3ff68b061 824a7e346a
commit 9c8310f473
28 changed files with 604 additions and 196 deletions
--- a/src/api.nim
+++ b/src/api.nim
@@ -7,12 +7,39 @@ import experimental/parser as newParser
 proc mediaUrl(id: string; cursor: string): SessionAwareUrl =
  let
    cookieVariables = userMediaVariables % [id, cursor]
-    oauthVariables = userTweetsVariables % [id, cursor]
+    oauthVariables = restIdVariables % [id, cursor]
  result = SessionAwareUrl(
    cookieUrl: graphUserMedia ? {"variables": cookieVariables, "features": gqlFeatures},
    oauthUrl: graphUserMediaV2 ? {"variables": oauthVariables, "features": gqlFeatures}
  )

+proc userTweetsUrl(id: string; cursor: string): SessionAwareUrl =
+  let
+    cookieVariables = userTweetsVariables % [id, cursor]
+    oauthVariables = restIdVariables % [id, cursor]
+  result = SessionAwareUrl(
+    cookieUrl: graphUserTweets ? {"variables": cookieVariables, "features": gqlFeatures, "fieldToggles": fieldToggles},
+    oauthUrl: graphUserTweetsV2 ? {"variables": oauthVariables, "features": gqlFeatures}
+  )
+
+proc userTweetsAndRepliesUrl(id: string; cursor: string): SessionAwareUrl =
+  let
+    cookieVariables = userTweetsAndRepliesVariables % [id, cursor]
+    oauthVariables = restIdVariables % [id, cursor]
+  result = SessionAwareUrl(
+    cookieUrl: graphUserTweetsAndReplies ? {"variables": cookieVariables, "features": gqlFeatures, "fieldToggles": fieldToggles},
+    oauthUrl: graphUserTweetsAndRepliesV2 ? {"variables": oauthVariables, "features": gqlFeatures}
+  )
+
+proc tweetDetailUrl(id: string; cursor: string): SessionAwareUrl =
+  let
+    cookieVariables = tweetDetailVariables % [id, cursor]
+    oauthVariables = tweetVariables % [id, cursor]
+  result = SessionAwareUrl(
+    cookieUrl: graphTweetDetail ? {"variables": cookieVariables, "features": gqlFeatures, "fieldToggles": tweetDetailFieldToggles},
+    oauthUrl: graphTweet ? {"variables": oauthVariables, "features": gqlFeatures}
+  )
+
 proc getGraphUser*(username: string): Future[User] {.async.} =
  if username.len == 0: return
  let
@@ -33,13 +60,11 @@ proc getGraphUserTweets*(id: string; kind: TimelineKind; after=""): Future[Profi
  if id.len == 0: return
  let
    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    variables = userTweetsVariables % [id, cursor]
-    params = {"variables": variables, "features": gqlFeatures}
    js = case kind
      of TimelineKind.tweets:
-        await fetch(graphUserTweets ? params, Api.userTweets)
+        await fetch(userTweetsUrl(id, cursor), Api.userTweets)
      of TimelineKind.replies:
-        await fetch(graphUserTweetsAndReplies ? params, Api.userTweetsAndReplies)
+        await fetch(userTweetsAndRepliesUrl(id, cursor), Api.userTweetsAndReplies)
      of TimelineKind.media:
        await fetch(mediaUrl(id, cursor), Api.userMedia)
  result = parseGraphTimeline(js, after)
@@ -48,7 +73,7 @@ proc getGraphListTweets*(id: string; after=""): Future[Timeline] {.async.} =
  if id.len == 0: return
  let
    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    variables = listTweetsVariables % [id, cursor]
+    variables = restIdVariables % [id, cursor]
    params = {"variables": variables, "features": gqlFeatures}
    js = await fetch(graphListTweets ? params, Api.listTweets)
  result = parseGraphTimeline(js, after).tweets
@@ -94,9 +119,7 @@ proc getGraphTweet(id: string; after=""): Future[Conversation] {.async.} =
  if id.len == 0: return
  let
    cursor = if after.len > 0: "\"cursor\":\"$1\"," % after else: ""
-    variables = tweetVariables % [id, cursor]
-    params = {"variables": variables, "features": gqlFeatures}
-    js = await fetch(graphTweet ? params, Api.tweetDetail)
+    js = await fetch(tweetDetailUrl(id, cursor), Api.tweetDetail)
  result = parseGraphConversation(js, id)

 proc getReplies*(id, after: string): Future[Result[Chain]] {.async.} =
--- a/src/apiutils.nim
+++ b/src/apiutils.nim
@@ -60,11 +60,11 @@ proc getAndValidateSession*(api: Api): Future[Session] {.async.} =
  case result.kind
  of SessionKind.oauth:
    if result.oauthToken.len == 0:
-      echo "[sessions] Empty oauth token, session: ", result.id
+      echo "[sessions] Empty oauth token, session: ", result.pretty
      raise rateLimitError()
  of SessionKind.cookie:
    if result.authToken.len == 0 or result.ct0.len == 0:
-      echo "[sessions] Empty cookie credentials, session: ", result.id
+      echo "[sessions] Empty cookie credentials, session: ", result.pretty
      raise rateLimitError()

 template fetchImpl(result, fetchBody) {.dirty.} =
@@ -107,7 +107,7 @@ template fetchImpl(result, fetchBody) {.dirty.} =
            setLimited(session, api)
            raise rateLimitError()
      elif result.startsWith("429 Too Many Requests"):
-        echo "[sessions] 429 error, API: ", api, ", session: ", session.id
+        echo "[sessions] 429 error, API: ", api, ", session: ", session.pretty
        session.apis[api].remaining = 0
        # rate limit hit, resets after the 15 minute window
        raise rateLimitError()
@@ -124,8 +124,8 @@ template fetchImpl(result, fetchBody) {.dirty.} =
  except OSError as e:
    raise e
  except Exception as e:
-    let id = if session.isNil: "null" else: $session.id
-    echo "error: ", e.name, ", msg: ", e.msg, ", sessionId: ", id, ", url: ", url
+    let s = session.pretty
+    echo "error: ", e.name, ", msg: ", e.msg, ", session: ", s, ", url: ", url
    raise rateLimitError()
  finally:
    release(session)
--- a/src/auth.nim
+++ b/src/auth.nim
@@ -7,20 +7,6 @@ import experimental/parser/session
 const
  maxConcurrentReqs = 2
  hourInSeconds = 60 * 60
-  apiMaxReqs: Table[Api, int] = {
-    Api.search: 50,
-    Api.tweetDetail: 500,
-    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
  sessionPool: seq[Session]
@@ -29,6 +15,20 @@ var
 template log(str: varargs[string, `$`]) =
  echo "[sessions] ", str.join("")

+proc pretty*(session: Session): string =
+  if session.isNil:
+    return "<null>"
+
+  if session.id > 0 and session.username.len > 0:
+    result = $session.id & " (" & session.username & ")"
+  elif session.username.len > 0:
+    result = session.username
+  elif session.id > 0:
+    result = $session.id
+  else:
+    result = "<unknown>"
+  result = $session.kind & " " & result
+
 proc snowflakeToEpoch(flake: int64): int64 =
  int64(((flake shr 22) + 1288834974657) div 1000)

@@ -57,8 +57,7 @@ proc getSessionPoolHealth*(): JsonNode =
    for api in session.apis.keys:
      let
        apiStatus = session.apis[api]
-        limit = if apiStatus.limit > 0: apiStatus.limit else: apiMaxReqs.getOrDefault(api, 0)
-        reqs = limit - apiStatus.remaining
+        reqs = apiStatus.limit - apiStatus.remaining

      # no requests made with this session and endpoint since the limit reset
      if apiStatus.reset < now:
@@ -130,7 +129,7 @@ proc isLimited(session: Session; api: Api): bool =
  if session.limited and api != Api.userTweets:
    if (epochTime().int - session.limitedAt) > hourInSeconds:
      session.limited = false
-      log "resetting limit: ", session.id
+      log "resetting limit: ", session.pretty
      return false
    else:
      return true
@@ -146,7 +145,7 @@ proc isReady(session: Session; api: Api): bool =

 proc invalidate*(session: var Session) =
  if session.isNil: return
-  log "invalidating: ", session.id
+  log "invalidating: ", session.pretty

  # TODO: This isn't sufficient, but it works for now
  let idx = sessionPool.find(session)
@@ -171,7 +170,7 @@ proc getSession*(api: Api): Future[Session] {.async.} =
 proc setLimited*(session: Session; api: Api) =
  session.limited = true
  session.limitedAt = epochTime().int
-  log "rate limited by api: ", api, ", reqs left: ", session.apis[api].remaining, ", id: ", session.id
+  log "rate limited by api: ", api, ", reqs left: ", session.apis[api].remaining, ", ", session.pretty

 proc setRateLimit*(session: Session; api: Api; remaining, reset, limit: int) =
  # avoid undefined behavior in race conditions
--- a/src/consts.nim
+++ b/src/consts.nim
@@ -9,16 +9,19 @@ const

  graphUser* = gql / "u7wQyGi6oExe8_TRWGMq4Q/UserResultByScreenNameQuery"
  graphUserById* = gql / "oPppcargziU1uDQHAUmH-A/UserResultByIdQuery"
-  graphUserTweets* = gql / "JLApJKFY0MxGTzCoK6ps8Q/UserWithProfileTweetsQueryV2"
-  graphUserTweetsAndReplies* = gql / "Y86LQY7KMvxn5tu3hFTyPg/UserWithProfileTweetsAndRepliesQueryV2"
+  graphUserTweetsV2* = gql / "JLApJKFY0MxGTzCoK6ps8Q/UserWithProfileTweetsQueryV2"
+  graphUserTweetsAndRepliesV2* = gql / "Y86LQY7KMvxn5tu3hFTyPg/UserWithProfileTweetsAndRepliesQueryV2"
+  graphUserTweets* = gql / "oRJs8SLCRNRbQzuZG93_oA/UserTweets"
+  graphUserTweetsAndReplies* = gql / "kkaJ0Mf34PZVarrxzLihjg/UserTweetsAndReplies"
  graphUserMedia* = gql / "36oKqyQ7E_9CmtONGjJRsA/UserMedia"
  graphUserMediaV2* = gql / "PDfFf8hGeJvUCiTyWtw4wQ/MediaTimelineV2"
  graphTweet* = gql / "Vorskcd2tZ-tc4Gx3zbk4Q/ConversationTimelineV2"
+  graphTweetDetail* = gql / "YVyS4SfwYW7Uw5qwy0mQCA/TweetDetail"
  graphTweetResult* = gql / "sITyJdhRPpvpEjg4waUmTA/TweetResultByIdQuery"
-  graphSearchTimeline* = gql / "KI9jCXUx3Ymt-hDKLOZb9Q/SearchTimeline"
-  graphListById* = gql / "oygmAig8kjn0pKsx_bUadQ/ListByRestId"
-  graphListBySlug* = gql / "88GTz-IPPWLn1EiU8XoNVg/ListBySlug"
-  graphListMembers* = gql / "kSmxeqEeelqdHSR7jMnb_w/ListMembers"
+  graphSearchTimeline* = gql / "7r8ibjHuK3MWUyzkzHNMYQ/SearchTimeline"
+  graphListById* = gql / "cIUpT1UjuGgl_oWiY7Snhg/ListByRestId"
+  graphListBySlug* = gql / "K6wihoTiTrzNzSF8y1aeKQ/ListBySlug"
+  graphListMembers* = gql / "fuVHh5-gFn8zDBBxb8wOMA/ListMembers"
  graphListTweets* = gql / "BbGLL1ZfMibdFNWlk7a0Pw/ListTimeline"

  gqlFeatures* = """{
@@ -96,24 +99,20 @@ const
  "withV2Timeline": true
 }""".replace(" ", "").replace("\n", "")

-#   oldUserTweetsVariables* = """{
-#   "userId": "$1", $2
-#   "count": 20,
-#   "includePromotedContent": false,
-#   "withDownvotePerspective": false,
-#   "withReactionsMetadata": false,
-#   "withReactionsPerspective": false,
-#   "withVoice": false,
-#   "withV2Timeline": true
-# }
-# """
+  tweetDetailVariables* = """{
+  "focalTweetId": "$1",
+  $2
+  "referrer": "profile",
+  "with_rux_injections": false,
+  "rankingMode": "Relevance",
+  "includePromotedContent": true,
+  "withCommunity": true,
+  "withQuickPromoteEligibilityTweetFields": true,
+  "withBirdwatchNotes": true,
+  "withVoice": true
+}""".replace(" ", "").replace("\n", "")

-  userTweetsVariables* = """{
-  "rest_id": "$1", $2
-  "count": 20
-}"""
-
-  listTweetsVariables* = """{
+  restIdVariables* = """{
  "rest_id": "$1", $2
  "count": 20
 }"""
@@ -126,3 +125,22 @@ const
  "withBirdwatchNotes": false,
  "withVoice": true
 }""".replace(" ", "").replace("\n", "")
+
+  userTweetsVariables* = """{
+  "userId": "$1", $2
+  "count": 20,
+  "includePromotedContent": false,
+  "withQuickPromoteEligibilityTweetFields": true,
+  "withVoice": true
+}""".replace(" ", "").replace("\n", "")
+
+  userTweetsAndRepliesVariables* = """{
+  "userId": "$1", $2
+  "count": 20,
+  "includePromotedContent": false,
+  "withCommunity": true,
+  "withVoice": true
+}""".replace(" ", "").replace("\n", "")
+
+  fieldToggles* = """{"withArticlePlainText":false}"""
+  tweetDetailFieldToggles* = """{"withArticleRichContentState":true,"withArticlePlainText":false,"withGrokAnalyze":false,"withDisallowedReplyControls":false}"""
--- a/src/experimental/parser/graphql.nim
+++ b/src/experimental/parser/graphql.nim
@@ -1,21 +1,39 @@
-import options
+import options, strutils
 import jsony
 import user, ../types/[graphuser, graphlistmembers]
 from ../../types import User, VerifiedType, Result, Query, QueryKind

+proc parseUserResult*(userResult: UserResult): User =
+  result = userResult.legacy
+
+  if result.verifiedType == none and userResult.isBlueVerified:
+    result.verifiedType = blue
+
+  if result.username.len == 0 and userResult.core.screenName.len > 0:
+    result.id = userResult.restId
+    result.username = userResult.core.screenName
+    result.fullname = userResult.core.name
+    result.userPic = userResult.avatar.imageUrl.replace("_normal", "")
+
+    if userResult.verification.isSome:
+      let v = userResult.verification.get
+      if v.verifiedType != VerifiedType.none:
+        result.verifiedType = v.verifiedType
+
+    if userResult.profileBio.isSome:
+      result.bio = userResult.profileBio.get.description
+
 proc parseGraphUser*(json: string): User =
  if json.len == 0 or json[0] != '{':
    return

  let raw = json.fromJson(GraphUser)
+  let userResult = raw.data.userResult.result

-  if raw.data.userResult.result.unavailableReason.get("") == "Suspended":
+  if userResult.unavailableReason.get("") == "Suspended":
    return User(suspended: true)

-  result = raw.data.userResult.result.legacy
-  result.id = raw.data.userResult.result.restId
-  if result.verifiedType == VerifiedType.none and raw.data.userResult.result.isBlueVerified:
-    result.verifiedType = blue
+  result = parseUserResult(userResult)

 proc parseGraphListMembers*(json, cursor: string): Result[User] =
  result = Result[User](
@@ -31,7 +49,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 parseUserResult(userResult)
        of TimelineTimelineCursor:
          if entry.content.cursorType == "Bottom":
            result.bottom = entry.content.value
--- a/src/experimental/parser/session.nim
+++ b/src/experimental/parser/session.nim
@@ -13,6 +13,7 @@ proc parseSession*(raw: string): Session =
    result = Session(
      kind: SessionKind.oauth,
      id: parseBiggestInt(id),
+      username: session.username,
      oauthToken: session.oauthToken,
      oauthSecret: session.oauthTokenSecret
    )
@@ -21,6 +22,7 @@ proc parseSession*(raw: string): Session =
    result = Session(
      kind: SessionKind.cookie,
      id: id,
+      username: session.username,
      authToken: session.authToken,
      ct0: session.ct0
    )
--- a/src/experimental/parser/unifiedcard.nim
+++ b/src/experimental/parser/unifiedcard.nim
@@ -1,6 +1,7 @@
 import std/[options, tables, strutils, strformat, sugar]
 import jsony
 import user, ../types/unifiedcard
+import ../../formatters
 from ../../types import Card, CardKind, Video
 from ../../utils import twimg, https

@@ -77,6 +78,18 @@ proc parseMedia(component: Component; card: UnifiedCard; result: var Card) =
  of model3d:
    result.title = "Unsupported 3D model ad"

+proc parseGrokShare(data: ComponentData; card: UnifiedCard; result: var Card) =
+  result.kind = summaryLarge
+
+  data.destination.parseDestination(card, result)
+  result.dest = "Answer by Grok"
+
+  for msg in data.conversationPreview:
+    if msg.sender == "USER":
+      result.title = msg.message.shorten(70)
+    elif msg.sender == "AGENT":
+      result.text = msg.message.shorten(500)
+
 proc parseUnifiedCard*(json: string): Card =
  let card = json.fromJson(UnifiedCard)

@@ -92,6 +105,8 @@ proc parseUnifiedCard*(json: string): Card =
      component.parseMedia(card, result)
    of buttonGroup:
      discard
+    of grokShare:
+      component.data.parseGrokShare(card, result)
    of ComponentType.jobDetails:
      component.data.parseJobDetails(card, result)
    of ComponentType.hidden:
--- a/src/experimental/parser/user.nim
+++ b/src/experimental/parser/user.nim
@@ -72,21 +72,3 @@ 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
-    of suspended: return User(username: username, suspended: true)
-    of userNotFound: return
-    else: echo "[error - parseUser]: ", error
-
-  result = json.fromJson(User)
-
-proc parseUsers*(json: string; after=""): Result[User] =
-  result = Result[User](beginning: after.len == 0)
-
-  # starting with '{' means it's an error
-  if json[0] == '[':
-    let raw = json.fromJson(seq[RawUser])
-    for user in raw:
-      result.content.add user.toUser
--- a/src/experimental/types/graphuser.nim
+++ b/src/experimental/types/graphuser.nim
@@ -1,5 +1,5 @@
-import options
-from ../../types import User
+import options, strutils
+from ../../types import User, VerifiedType

 type
  GraphUser* = object
@@ -8,8 +8,32 @@ type
  UserData* = object
    result*: UserResult

-  UserResult = object
+  UserCore* = object
+    name*: string
+    screenName*: string
+    createdAt*: string
+
+  UserBio* = object
+    description*: string
+
+  UserAvatar* = object
+    imageUrl*: string
+
+  Verification* = object
+    verifiedType*: VerifiedType
+
+  UserResult* = object
    legacy*: User
    restId*: string
    isBlueVerified*: bool
    unavailableReason*: Option[string]
+    core*: UserCore
+    avatar*: UserAvatar
+    profileBio*: Option[UserBio]
+    verification*: Option[Verification]
+
+proc enumHook*(s: string; v: var VerifiedType) =
+  v = try:
+    parseEnum[VerifiedType](s)
+  except:
+    VerifiedType.none
--- a/src/experimental/types/session.nim
+++ b/src/experimental/types/session.nim
@@ -1,8 +1,8 @@
 type
  RawSession* = object
    kind*: string
-    username*: string
    id*: string
+    username*: string
    oauthToken*: string
    oauthTokenSecret*: string
    authToken*: string
--- a/src/experimental/types/timeline.nim
+++ b/src/experimental/types/timeline.nim
@@ -1,23 +0,0 @@
-import std/tables
-from ../../types import User
-
-type
-  Search* = object
-    globalObjects*: GlobalObjects
-    timeline*: Timeline
-
-  GlobalObjects = object
-    users*: Table[string, User]
-
-  Timeline = object
-    instructions*: seq[Instructions]
-
-  Instructions = object
-    addEntries*: tuple[entries: seq[Entry]]
-
-  Entry = object
-    entryId*: string
-    content*: tuple[operation: Operation]
-
-  Operation = object
-    cursor*: tuple[value, cursorType: string]
--- a/src/experimental/types/unifiedcard.nim
+++ b/src/experimental/types/unifiedcard.nim
@@ -22,6 +22,7 @@ type
    communityDetails
    mediaWithDetailsHorizontal
    hidden
+    grokShare
    unknown

  Component* = object
@@ -42,6 +43,7 @@ type
    topicDetail*: tuple[title: Text]
    profileUser*: User
    shortDescriptionText*: string
+    conversationPreview*: seq[GrokConversation]

  MediaItem* = object
    id*: string
@@ -76,6 +78,10 @@ type
    title*: Text
    category*: Text

+  GrokConversation* = object
+    message*: string
+    sender*: string
+
  TypeField = Component | Destination | MediaEntity | AppStoreData

 converter fromText*(text: Text): string = string(text)
@@ -96,6 +102,7 @@ proc enumHook*(s: string; v: var ComponentType) =
      of "community_details": communityDetails
      of "media_with_details_horizontal": mediaWithDetailsHorizontal
      of "commerce_drop_details": hidden
+      of "grok_share": grokShare
      else: echo "ERROR: Unknown enum value (ComponentType): ", s; unknown

 proc enumHook*(s: string; v: var AppType) =
--- a/src/formatters.nim
+++ b/src/formatters.nim
@@ -33,10 +33,13 @@ proc getUrlPrefix*(cfg: Config): string =
  if cfg.useHttps: https & cfg.hostname
  else: "http://" & cfg.hostname

-proc shortLink*(text: string; length=28): string =
-  result = text.replace(wwwRegex, "")
+proc shorten*(text: string; length=28): string =
+  result = text
  if result.len > length:
    result = result[0 ..< length] & "…"
+
+proc shortLink*(text: string; length=28): string =
+  result = text.replace(wwwRegex, "").shorten(length)
    
 proc stripHtml*(text: string; shorten=false): string =
  var html = parseHtml(text)
--- a/src/parser.nim
+++ b/src/parser.nim
@@ -42,16 +42,16 @@ proc parseGraphUser(js: JsonNode): User =
  result = parseUser(user{"legacy"}, user{"rest_id"}.getStr)

  # fallback to support UserMedia/recent GraphQL updates
-  if result.username.len == 0 and user{"core", "screen_name"}.notNull:
+  if result.username.len == 0:
    result.username = user{"core", "screen_name"}.getStr
    result.fullname = user{"core", "name"}.getStr
    result.userPic = user{"avatar", "image_url"}.getImageStr.replace("_normal", "")

    if user{"is_blue_verified"}.getBool(false):
      result.verifiedType = blue
-    elif user{"verification", "verified_type"}.notNull:
-      let verifiedType = user{"verification", "verified_type"}.getStr("None")
-      result.verifiedType = parseEnum[VerifiedType](verifiedType)
+
+    with verifiedType, user{"verification", "verified_type"}:
+      result.verifiedType = parseEnum[VerifiedType](verifiedType.getStr)

 proc parseGraphList*(js: JsonNode): List =
  if js.isNull: return
@@ -231,7 +231,8 @@ proc parseTweet(js: JsonNode; jsCard: JsonNode = newJNull()): Tweet =
      replies: js{"reply_count"}.getInt,
      retweets: js{"retweet_count"}.getInt,
      likes: js{"favorite_count"}.getInt,
-      quotes: js{"quote_count"}.getInt
+      quotes: js{"quote_count"}.getInt,
+      views: js{"views_count"}.getInt
    )
  )

@@ -339,6 +340,9 @@ proc parseGraphTweet(js: JsonNode; isLegacy=false): Tweet =
  result.id = js{"rest_id"}.getId
  result.user = parseGraphUser(js{"core"})

+  with count, js{"views", "count"}:
+    result.stats.views = count.getStr("0").parseInt
+
  with noteTweet, js{"note_tweet", "note_tweet_results", "result"}:
    result.expandNoteTweetEntities(noteTweet)

@@ -368,10 +372,10 @@ proc parseGraphTweetResult*(js: JsonNode): Tweet =
  with tweet, js{"data", "tweet_result", "result"}:
    result = parseGraphTweet(tweet, false)

-proc parseGraphConversation*(js: JsonNode; tweetId: string; v2=true): Conversation =
+proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
  result = Conversation(replies: Result[Chain](beginning: true))
-
  let
+    v2 = js{"data", "timeline_response"}.notNull
    rootKey = if v2: "timeline_response" else: "threaded_conversation_with_injections_v2"
    contentKey = if v2: "content" else: "itemContent"
    resultKey = if v2: "tweetResult" else: "tweet_results"
@@ -381,7 +385,8 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string; v2=true): Conversati
    return

  for i in instructions:
-    if i{"__typename"}.getStr == "TimelineAddEntries":
+    let instrType = i{"type"}.getStr(i{"__typename"}.getStr)
+    if instrType == "TimelineAddEntries":
      for e in i{"entries"}:
        let entryId = e{"entryId"}.getStr
        if entryId.startsWith("tweet"):
@@ -416,21 +421,24 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string; v2=true): Conversati
        elif entryId.startsWith("cursor-bottom"):
          result.replies.bottom = e{"content", contentKey, "value"}.getStr

-proc extractTweetsFromEntry*(e: JsonNode; entryId: string): seq[Tweet] =
-  if e{"content", "items"}.notNull:
-    for item in e{"content", "items"}:
-      with tweetResult, item{"item", "itemContent", "tweet_results", "result"}:
-        var tweet = parseGraphTweet(tweetResult, false)
-        if not tweet.available:
-          tweet.id = parseBiggestInt(item{"entryId"}.getStr.getId())
-        result.add tweet
-    return
+proc extractTweetsFromEntry*(e: JsonNode): seq[Tweet] =
+  var tweetResult = e{"content", "itemContent", "tweet_results", "result"}
+  if tweetResult.isNull:
+    tweetResult = e{"content", "content", "tweetResult", "result"}

-  with tweetResult, e{"content", "content", "tweetResult", "result"}:
+  if tweetResult.notNull:
    var tweet = parseGraphTweet(tweetResult, false)
    if not tweet.available:
-      tweet.id = parseBiggestInt(entryId.getId())
+      tweet.id = parseBiggestInt(e.getEntryId())
    result.add tweet
+    return
+
+  for item in e{"content", "items"}:
+    with tweetResult, item{"item", "itemContent", "tweet_results", "result"}:
+      var tweet = parseGraphTweet(tweetResult, false)
+      if not tweet.available:
+        tweet.id = parseBiggestInt(item{"entryId"}.getStr.getId())
+      result.add tweet

 proc parseGraphTimeline*(js: JsonNode; after=""): Profile =
  result = Profile(tweets: Timeline(beginning: after.len == 0))
@@ -461,7 +469,7 @@ proc parseGraphTimeline*(js: JsonNode; after=""): Profile =
      for e in i{"entries"}:
        let entryId = e{"entryId"}.getStr
        if entryId.startsWith("tweet") or entryId.startsWith("profile-grid"):
-          for tweet in extractTweetsFromEntry(e, entryId):
+          for tweet in extractTweetsFromEntry(e):
            result.tweets.content.add tweet
        elif "-conversation-" in entryId or entryId.startsWith("homeConversation"):
          let (thread, self) = parseGraphThread(e)
@@ -469,15 +477,14 @@ proc parseGraphTimeline*(js: JsonNode; after=""): Profile =
        elif entryId.startsWith("cursor-bottom"):
          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)
-        tweet.pinned = true
-        if not tweet.available and tweet.tombstone.len == 0:
-          let entryId = i{"entry", "entryId"}.getEntryId
-          if entryId.len > 0:
-            tweet.id = parseBiggestInt(entryId)
-        result.pinned = some tweet
+    if after.len == 0:
+      let instrType = i{"type"}.getStr(i{"__typename"}.getStr)
+      if instrType == "TimelinePinEntry":
+        let tweets = extractTweetsFromEntry(i{"entry"})
+        if tweets.len > 0:
+          var tweet = tweets[0]
+          tweet.pinned = true
+          result.pinned = some tweet

 proc parseGraphPhotoRail*(js: JsonNode): PhotoRail =
  result = @[]
@@ -515,7 +522,7 @@ proc parseGraphPhotoRail*(js: JsonNode): PhotoRail =
    for e in i{"entries"}:
      let entryId = e{"entryId"}.getStr
      if entryId.startsWith("tweet") or entryId.startsWith("profile-grid"):
-        for t in extractTweetsFromEntry(e, entryId):
+        for t in extractTweetsFromEntry(e):
          let photo = extractGalleryPhoto(t)
          if photo.url.len > 0:
            result.add photo
--- a/src/sass/tweet/card.scss
+++ b/src/sass/tweet/card.scss
@@ -42,6 +42,7 @@

 .card-description {
    margin: 0.3em 0;
+    white-space: pre-wrap;
 }

 .card-destination {
--- a/src/types.nim
+++ b/src/types.nim
@@ -38,6 +38,7 @@ type

  Session* = ref object
    id*: int64
+    username*: string
    pending*: int
    limited*: bool
    limitedAt*: int
@@ -202,6 +203,7 @@ type
    retweets*: int
    likes*: int
    quotes*: int
+    views*: int

  Tweet* = ref object
    id*: int64
--- a/src/views/general.nim
+++ b/src/views/general.nim
@@ -30,7 +30,7 @@ proc renderNavbar(cfg: Config; req: Request; rss, canonical: string): VNode =
      tdiv(class="nav-item right"):
        icon "search", title="Search", href="/search"
        if cfg.enableRss and rss.len > 0:
-          icon "rss-feed", title="RSS Feed", href=rss
+          icon "rss", title="RSS Feed", href=rss
        icon "bird", title="Open in Twitter", href=canonical
        a(href="https://liberapay.com/zedeus"): verbatim lp
        icon "info", title="About", href="/about"
@@ -53,7 +53,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";

  buildHtml(head):
    link(rel="stylesheet", type="text/css", href="/css/style.css?v=19")
-    link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=2")
+    link(rel="stylesheet", type="text/css", href="/css/fontello.css?v=3")

    if theme.len > 0:
      link(rel="stylesheet", type="text/css", href=(&"/css/themes/{theme}.css"))
@@ -119,7 +119,7 @@ proc renderHead*(prefs: Prefs; cfg: Config; req: Request; titleText=""; desc="";
    # this is last so images are also preloaded
    # if this is done earlier, Chrome only preloads one image for some reason
    link(rel="preload", type="font/woff2", `as`="font",
-         href="/fonts/fontello.woff2?21002321", crossorigin="anonymous")
+         href="/fonts/fontello.woff2?61663884", crossorigin="anonymous")

 proc renderMain*(body: VNode; req: Request; cfg: Config; prefs=defaultPrefs;
                 titleText=""; desc=""; ogTitle=""; rss=""; video="";
--- a/src/views/tweet.nim
+++ b/src/views/tweet.nim
@@ -184,6 +184,8 @@ proc renderStats(tweet_id: int64; stats: TweetStats; views: string): VNode =
    span(class="tweet-stat"): icon "retweet", formatStat(stats.retweets)
    a(class="tweet-stat", href=("/search?q=" & encodeUrl(&"-from:quotedreplies url:{tweet_id}") & "&e-nativeretweets=on")): icon "quote", formatStat(stats.quotes)
    span(class="tweet-stat"): icon "heart", formatStat(stats.likes)
+    if stats.views > 0:
+      span(class="tweet-stat"): icon "views", formatStat(stats.views)
    if views.len > 0:
      span(class="tweet-stat"): icon "play", insertSep(views, ',')