Fix crash on unavailable tweets

zedeus · Feb 25, 2023 · 2751504 · 2751504
1 parent 85f14c9
commit 2751504
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/parser.nim b/src/parser.nim
@@ -372,7 +372,7 @@ proc parsePhotoRail*(js: JsonNode): PhotoRail =
  result.add GalleryPhoto(url: url, tweetId: $t.id)
 
 proc parseGraphTweet(js: JsonNode): Tweet =
- if js.kind == JNull:
+ if js.kind == JNull or js{"__typename"}.getStr == "TweetUnavailable":
  return Tweet(available: false)
 
  var jsCard = copy(js{"card", "legacy"})
@@ -416,6 +416,9 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
  if entryId.startsWith("tweet"):
  let tweet = parseGraphTweet(e{"content", "itemContent", "tweet_results", "result"})
 
+ if not tweet.available:
+ tweet.id = parseBiggestInt(entryId.getId())
+
  if $tweet.id == tweetId:
  result.tweet = tweet
  else:

diff --git a/src/types.nim b/src/types.nim
@@ -177,7 +177,7 @@ type
  available*: bool
  tombstone*: string
  location*: string
- ## Unused, needed for backwards compat
+ # Unused, needed for backwards compat
  source*: string
  stats*: TweetStats
  retweet*: Option[Tweet]

diff --git a/tests/test_card.py b/tests/test_card.py
@@ -42,7 +42,7 @@
 
  ['nim_lang/status/1082989146040340480',
  'Nim in 2018: A short recap',
- 'Posted in r/programming by u/miran1',
+ '36 votes and 46 comments so far on Reddit',
  'reddit.com']
 ]