blankie
/
nitter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup api code

This commit is contained in:
Zed 2019-06-21 03:51:14 +02:00
parent 30d5360123
commit 6f0452621e
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/api.nim
View File

@ -4,15 +4,20 @@ import nimquery, regex
import ./types, ./parser import ./types, ./parser
const base = parseUri("https://twitter.com/") const
const agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36" base = parseUri("https://twitter.com/")
agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.98 Safari/537.36"
timelineUrl = "i/profiles/show/$1/timeline/tweets?include_available_features=1&include_entities=1&include_new_items_bar=true"
profilePopupUrl = "i/profiles/popup"
profileIntentUrl = "intent/user"
tweetUrl = "i/status/"
const timelineUrl = "i/profiles/show/$1/timeline/tweets?include_available_features=1&include_entities=1&include_new_items_bar=true" proc fetchHtml(url: Uri; headers: HttpHeaders; jsonKey = ""): Future[XmlNode] {.async.} =
const profilePopupUrl = "i/profiles/popup" var client = newAsyncHttpClient()
const profileIntentUrl = "intent/user" defer: client.close()
const tweetUrl = "i/status/"
client.headers = headers
proc fetchHtml(client: AsyncHttpClient; url: Uri; jsonKey = ""): Future[XmlNode] {.async.} =
var resp = "" var resp = ""
try: try:
resp = await client.getContent($url) resp = await client.getContent($url)
@ -25,19 +30,15 @@ proc fetchHtml(client: AsyncHttpClient; url: Uri; jsonKey = ""): Future[XmlNode]
else: else:
return parseHtml(resp) return parseHtml(resp)
proc getProfileFallback(username: string; client: AsyncHttpClient): Future[Profile] {.async.} = proc getProfileFallback(username: string; headers: HttpHeaders): Future[Profile] {.async.} =
let let
params = {"screen_name": username} url = base / profileIntentUrl ? {"screen_name": username}
url = base / profileIntentUrl ? params html = await fetchHtml(url, headers)
html = await client.fetchHtml(url)
result = parseIntentProfile(html) result = parseIntentProfile(html)
proc getProfile*(username: string): Future[Profile] {.async.} = proc getProfile*(username: string): Future[Profile] {.async.} =
let client = newAsyncHttpClient() let headers = newHttpHeaders({
defer: client.close()
client.headers = newHttpHeaders({
"Accept": "text/html,application/xhtml+xml,application/xml;q=0.9", "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9",
"Referer": $(base / username), "Referer": $(base / username),
"User-Agent": agent, "User-Agent": agent,
@ -53,18 +54,15 @@ proc getProfile*(username: string): Future[Profile] {.async.} =
"_": $(epochTime().int) "_": $(epochTime().int)
} }
url = base / profilePopupUrl ? params url = base / profilePopupUrl ? params
html = await client.fetchHtml(url, jsonKey="html") html = await fetchHtml(url, headers, jsonKey="html")
if not html.querySelector(".ProfileCard-sensitiveWarningContainer").isNil: if not html.querySelector(".ProfileCard-sensitiveWarningContainer").isNil:
return await getProfileFallback(username, client) return await getProfileFallback(username, headers)
result = parsePopupProfile(html) result = parsePopupProfile(html)
proc getTimeline*(username: string; after=""): Future[Tweets] {.async.} = proc getTimeline*(username: string; after=""): Future[Tweets] {.async.} =
let client = newAsyncHttpClient() let headers = newHttpHeaders({
defer: client.close()
client.headers = newHttpHeaders({
"Accept": "application/json, text/javascript, */*; q=0.01", "Accept": "application/json, text/javascript, */*; q=0.01",
"Referer": $(base / username), "Referer": $(base / username),
"User-Agent": agent, "User-Agent": agent,
@ -77,15 +75,12 @@ proc getTimeline*(username: string; after=""): Future[Tweets] {.async.} =
if after.len > 0: if after.len > 0:
url &= "&max_position=" & after url &= "&max_position=" & after
let html = await client.fetchHtml(base / url, jsonKey="items_html") let html = await fetchHtml(base / url, headers, jsonKey="items_html")
result = parseTweets(html) result = parseTweets(html)
proc getTweet*(id: string): Future[Conversation] {.async.} = proc getTweet*(id: string): Future[Conversation] {.async.} =
let client = newAsyncHttpClient() let headers = newHttpHeaders({
defer: client.close()
client.headers = newHttpHeaders({
"Accept": "application/json, text/javascript, */*; q=0.01", "Accept": "application/json, text/javascript, */*; q=0.01",
"Referer": $base, "Referer": $base,
"User-Agent": agent, "User-Agent": agent,
@ -98,6 +93,6 @@ proc getTweet*(id: string): Future[Conversation] {.async.} =
let let
url = base / tweetUrl / id url = base / tweetUrl / id
html = await client.fetchHtml(url) html = await fetchHtml(url, headers)
result = parseConversation(html) result = parseConversation(html)