mirror of
https://github.com/zedeus/nitter.git
synced 2024-12-13 11:36:34 +00:00
Refactor instruction parsing
This commit is contained in:
parent
67313ac12a
commit
be74cec48a
1 changed files with 18 additions and 16 deletions
|
@ -347,6 +347,22 @@ proc parseConversation*(js: JsonNode; tweetId: string): Conversation =
|
||||||
elif "cursor-bottom" in entry:
|
elif "cursor-bottom" in entry:
|
||||||
result.replies.bottom = e.getCursor
|
result.replies.bottom = e.getCursor
|
||||||
|
|
||||||
|
proc parseInstructions[T](res: var Result[T]; global: GlobalObjects; js: JsonNode) =
|
||||||
|
if js.kind != JArray or js.len == 0:
|
||||||
|
return
|
||||||
|
|
||||||
|
for i in js:
|
||||||
|
when T is Tweet:
|
||||||
|
if res.beginning and i{"pinEntry"}.notNull:
|
||||||
|
with pin, parsePin(i, global):
|
||||||
|
res.content.add pin
|
||||||
|
|
||||||
|
with r, i{"replaceEntry", "entry"}:
|
||||||
|
if "top" in r{"entryId"}.getStr:
|
||||||
|
res.top = r.getCursor
|
||||||
|
elif "bottom" in r{"entryId"}.getStr:
|
||||||
|
res.bottom = r.getCursor
|
||||||
|
|
||||||
proc parseUsers*(js: JsonNode; after=""): Result[Profile] =
|
proc parseUsers*(js: JsonNode; after=""): Result[Profile] =
|
||||||
result = Result[Profile](beginning: after.len == 0)
|
result = Result[Profile](beginning: after.len == 0)
|
||||||
let global = parseGlobalObjects(? js)
|
let global = parseGlobalObjects(? js)
|
||||||
|
@ -354,12 +370,7 @@ proc parseUsers*(js: JsonNode; after=""): Result[Profile] =
|
||||||
let instructions = ? js{"timeline", "instructions"}
|
let instructions = ? js{"timeline", "instructions"}
|
||||||
if instructions.len == 0: return
|
if instructions.len == 0: return
|
||||||
|
|
||||||
for i in instructions:
|
result.parseInstructions(global, instructions)
|
||||||
with r, i{"replaceEntry", "entry"}:
|
|
||||||
if "top" in r{"entryId"}.getStr:
|
|
||||||
result.top = r.getCursor
|
|
||||||
elif "bottom" in r{"entryId"}.getStr:
|
|
||||||
result.bottom = r.getCursor
|
|
||||||
|
|
||||||
for e in instructions[0]{"addEntries", "entries"}:
|
for e in instructions[0]{"addEntries", "entries"}:
|
||||||
let entry = e{"entryId"}.getStr
|
let entry = e{"entryId"}.getStr
|
||||||
|
@ -379,16 +390,7 @@ proc parseTimeline*(js: JsonNode; after=""): Timeline =
|
||||||
let instructions = ? js{"timeline", "instructions"}
|
let instructions = ? js{"timeline", "instructions"}
|
||||||
if instructions.len == 0: return
|
if instructions.len == 0: return
|
||||||
|
|
||||||
for i in instructions:
|
result.parseInstructions(global, instructions)
|
||||||
if result.beginning and i{"pinEntry"}.notNull:
|
|
||||||
with pin, parsePin(i, global):
|
|
||||||
result.content.add pin
|
|
||||||
else:
|
|
||||||
with r, i{"replaceEntry", "entry"}:
|
|
||||||
if "top" in r{"entryId"}.getStr:
|
|
||||||
result.top = r.getCursor
|
|
||||||
elif "bottom" in r{"entryId"}.getStr:
|
|
||||||
result.bottom = r.getCursor
|
|
||||||
|
|
||||||
for e in instructions[0]{"addEntries", "entries"}:
|
for e in instructions[0]{"addEntries", "entries"}:
|
||||||
let entry = e{"entryId"}.getStr
|
let entry = e{"entryId"}.getStr
|
||||||
|
|
Loading…
Reference in a new issue