Salastil/nitter
1
0
Fork 0
mirror of https://github.com/zedeus/nitter.git synced 2025-12-06 03:55:36 -05:00
Code Activity

Fix broken pinned tweet parsing

Browse Source
This commit is contained in:
Zed
2025-11-17 11:21:21 +01:00
parent 6b655cddd8
commit e8de18317e
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/parser.nim
View File

@@ -385,7 +385,7 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
return return
for i in instructions: for i in instructions:
let instrType = i{"__typename"}.getStr(i{"type"}.getStr) let instrType = i{"type"}.getStr(i{"__typename"}.getStr)
if instrType == "TimelineAddEntries": if instrType == "TimelineAddEntries":
for e in i{"entries"}: for e in i{"entries"}:
let entryId = e{"entryId"}.getStr let entryId = e{"entryId"}.getStr
@@ -421,7 +421,7 @@ proc parseGraphConversation*(js: JsonNode; tweetId: string): Conversation =
elif entryId.startsWith("cursor-bottom"): elif entryId.startsWith("cursor-bottom"):
result.replies.bottom = e{"content", contentKey, "value"}.getStr result.replies.bottom = e{"content", contentKey, "value"}.getStr
proc extractTweetsFromEntry*(e: JsonNode; entryId: string): seq[Tweet] = proc extractTweetsFromEntry*(e: JsonNode): seq[Tweet] =
var tweetResult = e{"content", "itemContent", "tweet_results", "result"} var tweetResult = e{"content", "itemContent", "tweet_results", "result"}
if tweetResult.isNull: if tweetResult.isNull:
tweetResult = e{"content", "content", "tweetResult", "result"} tweetResult = e{"content", "content", "tweetResult", "result"}
@@ -429,7 +429,7 @@ proc extractTweetsFromEntry*(e: JsonNode; entryId: string): seq[Tweet] =
if tweetResult.notNull: if tweetResult.notNull:
var tweet = parseGraphTweet(tweetResult, false) var tweet = parseGraphTweet(tweetResult, false)
if not tweet.available: if not tweet.available:
tweet.id = parseBiggestInt(entryId.getId()) tweet.id = parseBiggestInt(e.getEntryId())
result.add tweet result.add tweet
return return
@@ -469,7 +469,7 @@ proc parseGraphTimeline*(js: JsonNode; after=""): Profile =
for e in i{"entries"}: for e in i{"entries"}:
let entryId = e{"entryId"}.getStr let entryId = e{"entryId"}.getStr
if entryId.startsWith("tweet") or entryId.startsWith("profile-grid"): 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 result.tweets.content.add tweet
elif "-conversation-" in entryId or entryId.startsWith("homeConversation"): elif "-conversation-" in entryId or entryId.startsWith("homeConversation"):
let (thread, self) = parseGraphThread(e) let (thread, self) = parseGraphThread(e)
@@ -477,14 +477,13 @@ proc parseGraphTimeline*(js: JsonNode; after=""): Profile =
elif entryId.startsWith("cursor-bottom"): elif entryId.startsWith("cursor-bottom"):
result.tweets.bottom = e{"content", "value"}.getStr result.tweets.bottom = e{"content", "value"}.getStr
if after.len == 0 and i{"__typename"}.getStr == "TimelinePinEntry": if after.len == 0:
with tweetResult, i{"entry", "content", "content", "tweetResult", "result"}: let instrType = i{"type"}.getStr(i{"__typename"}.getStr)
let tweet = parseGraphTweet(tweetResult, false) if instrType == "TimelinePinEntry":
let tweets = extractTweetsFromEntry(i{"entry"})
if tweets.len > 0:
var tweet = tweets[0]
tweet.pinned = true 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 result.pinned = some tweet
proc parseGraphPhotoRail*(js: JsonNode): PhotoRail = proc parseGraphPhotoRail*(js: JsonNode): PhotoRail =
@@ -523,7 +522,7 @@ proc parseGraphPhotoRail*(js: JsonNode): PhotoRail =
for e in i{"entries"}: for e in i{"entries"}:
let entryId = e{"entryId"}.getStr let entryId = e{"entryId"}.getStr
if entryId.startsWith("tweet") or entryId.startsWith("profile-grid"): if entryId.startsWith("tweet") or entryId.startsWith("profile-grid"):
for t in extractTweetsFromEntry(e, entryId): for t in extractTweetsFromEntry(e):
let photo = extractGalleryPhoto(t) let photo = extractGalleryPhoto(t)
if photo.url.len > 0: if photo.url.len > 0:
result.add photo result.add photo