parent
6b16ad2ce0
commit
ba57511a01
10 changed files with 43 additions and 21 deletions
16
src/api/cookie.nim
Normal file
16
src/api/cookie.nim
Normal file
|
@ -0,0 +1,16 @@
|
|||
import httpclient, strutils
|
||||
|
||||
proc getGuestId*(): string =
|
||||
let client = newHttpClient()
|
||||
for i in 0 .. 10:
|
||||
try:
|
||||
let req = client.get("https://twitter.com")
|
||||
if "react-root" in req.body: continue
|
||||
for k, v in req.headers:
|
||||
if "guest_id" in v:
|
||||
return v[v.find("=") + 1 .. v.find(";")]
|
||||
except:
|
||||
discard
|
||||
finally:
|
||||
try: client.close()
|
||||
except: discard
|
|
@ -54,7 +54,7 @@ proc getListMembers*(username, list, after, agent: string): Future[Result[Profil
|
|||
|
||||
let
|
||||
url = base / (listMembersUrl % [username, list])
|
||||
html = await fetchHtml(url, genHeaders(agent, url))
|
||||
html = await fetchHtml(url, genHeaders(agent, url, guestId=true))
|
||||
|
||||
result = Result[Profile](
|
||||
minId: html.selectAttr(".stream-container", "data-min-position"),
|
||||
|
|
|
@ -34,7 +34,7 @@ proc getProfile*(username, agent: string): Future[Profile] {.async.} =
|
|||
proc getProfileFull*(username, agent: string): Future[Profile] {.async.} =
|
||||
let
|
||||
url = base / username
|
||||
headers = genHeaders(agent, url, auth=true)
|
||||
headers = genHeaders(agent, url, auth=true, guestId=true)
|
||||
html = await fetchHtml(url, headers)
|
||||
|
||||
if html == nil: return
|
||||
|
|
|
@ -14,7 +14,8 @@ proc getResult*[T](json: JsonNode; query: Query; after: string): Result[T] =
|
|||
beginning: after.len == 0
|
||||
)
|
||||
|
||||
proc getSearch*[T](query: Query; after, agent: string; media=true): Future[Result[T]] {.async.} =
|
||||
proc getSearch*[T](query: Query; after, agent: string;
|
||||
media=true): Future[Result[T]] {.async.} =
|
||||
let
|
||||
kind = if query.kind == users: "users" else: "tweets"
|
||||
|
||||
|
@ -22,7 +23,7 @@ proc getSearch*[T](query: Query; after, agent: string; media=true): Future[Resul
|
|||
encoded = encodeUrl(param, usePlus=false)
|
||||
|
||||
referer = base / ("search?f=$1&q=$2&src=typd" % [kind, encoded])
|
||||
headers = genHeaders(agent, referer, auth=true, xml=true)
|
||||
headers = genHeaders(agent, referer, auth=true, xml=true, guestId=true)
|
||||
|
||||
params = {
|
||||
"f": kind,
|
||||
|
|
|
@ -30,12 +30,12 @@ proc getProfileAndTimeline*(username, after, agent: string;
|
|||
url = url ? {"max_position": after}
|
||||
|
||||
let
|
||||
headers = genHeaders(agent, base / username, auth=true)
|
||||
headers = genHeaders(agent, base / username, auth=true, guestId=true)
|
||||
html = await fetchHtml(url, headers)
|
||||
timeline = parseTimeline(html.select("#timeline > .stream-container"), after)
|
||||
profile = parseTimelineProfile(html)
|
||||
|
||||
if media: await getMedia(timeline, agent)
|
||||
if media and profile.username.len > 0: await getMedia(timeline, agent)
|
||||
result = (profile, timeline)
|
||||
|
||||
proc getTimeline*(username, after, agent: string;
|
||||
|
|
|
@ -8,7 +8,7 @@ proc getTweet*(username, id, after, agent: string): Future[Conversation] {.async
|
|||
headers = genHeaders({
|
||||
"pragma": "no-cache",
|
||||
"x-previous-page-name": "profile"
|
||||
}, agent, base, xml=true)
|
||||
}, agent, base, xml=true, guestId=true)
|
||||
|
||||
url = base / username / tweetUrl / id ? {"max_position": after}
|
||||
html = await fetchHtml(url, headers)
|
||||
|
|
|
@ -2,11 +2,13 @@ import httpclient, asyncdispatch, htmlparser, options
|
|||
import strutils, json, xmltree, uri
|
||||
|
||||
import ../types
|
||||
import consts
|
||||
import consts, cookie
|
||||
|
||||
var guestIdCookie = "guest_id=" & getGuestId()
|
||||
|
||||
proc genHeaders*(headers: openArray[tuple[key: string, val: string]];
|
||||
agent: string; referer: Uri; lang=true;
|
||||
auth=false; xml=false): HttpHeaders =
|
||||
auth=false; xml=false; guestId=false): HttpHeaders =
|
||||
result = newHttpHeaders({
|
||||
"referer": $referer,
|
||||
"user-agent": agent,
|
||||
|
@ -16,13 +18,14 @@ proc genHeaders*(headers: openArray[tuple[key: string, val: string]];
|
|||
if auth: result["authority"] = "twitter.com"
|
||||
if lang: result["accept-language"] = consts.lang
|
||||
if xml: result["x-requested-with"] = "XMLHttpRequest"
|
||||
if guestId: result["cookie"] = guestIdCookie
|
||||
|
||||
for (key, val) in headers:
|
||||
result[key] = val
|
||||
|
||||
proc genHeaders*(agent: string; referer: Uri; lang=true;
|
||||
auth=false; xml=false): HttpHeaders =
|
||||
genHeaders([], agent, referer, lang, auth, xml)
|
||||
auth=false; xml=false; guestId=false): HttpHeaders =
|
||||
genHeaders([], agent, referer, lang, auth, xml, guestId)
|
||||
|
||||
template newClient*() {.dirty.} =
|
||||
var client = newAsyncHttpClient()
|
||||
|
|
|
@ -41,7 +41,8 @@ proc hasCachedProfile*(username: string): Option[Profile] =
|
|||
except AssertionError, KeyError:
|
||||
result = none Profile
|
||||
|
||||
proc getCachedProfile*(username, agent: string; force=false): Future[Profile] {.async.} =
|
||||
proc getCachedProfile*(username, agent: string;
|
||||
force=false): Future[Profile] {.async.} =
|
||||
withDb:
|
||||
try:
|
||||
result.getOne("lower(username) = ?", toLower(username))
|
||||
|
|
|
@ -20,7 +20,8 @@ proc showRss*(req: Request; hostname: string; query: Query): Future[(string, str
|
|||
(profile, timeline) =
|
||||
await fetchSingleTimeline(names[0], after, getAgent(), query, media=false)
|
||||
else:
|
||||
timeline = await fetchMultiTimeline(names, after, getAgent(), query, media=false)
|
||||
let multiQuery = query.getMultiQuery(names)
|
||||
timeline = await getSearch[Tweet](multiQuery, after, getAgent(), media=false)
|
||||
# this is kinda dumb
|
||||
profile = Profile(
|
||||
username: name,
|
||||
|
|
|
@ -45,13 +45,11 @@ proc fetchSingleTimeline*(name, after, agent: string; query: Query;
|
|||
if profile.username.len == 0: return
|
||||
return (profile, timeline)
|
||||
|
||||
proc fetchMultiTimeline*(names: seq[string]; after, agent: string; query: Query;
|
||||
media=true): Future[Timeline] {.async.} =
|
||||
var q = query
|
||||
q.fromUser = names
|
||||
proc getMultiQuery*(q: Query; names: seq[string]): Query =
|
||||
result = q
|
||||
result.fromUser = names
|
||||
if q.kind == posts and "replies" notin q.excludes:
|
||||
q.excludes.add "replies"
|
||||
return await getSearch[Tweet](q, after, agent, media)
|
||||
result.excludes.add "replies"
|
||||
|
||||
proc get*(req: Request; key: string): string =
|
||||
params(req).getOrDefault(key)
|
||||
|
@ -62,8 +60,10 @@ proc showTimeline*(request: Request; query: Query; cfg: Config; prefs: Prefs;
|
|||
let names = getNames(request.get("name"))
|
||||
|
||||
if names.len != 1:
|
||||
let timeline = await fetchMultiTimeline(names, after, agent, query)
|
||||
let html = renderTweetSearch(timeline, prefs, getPath())
|
||||
let
|
||||
multiQuery = query.getMultiQuery(names)
|
||||
timeline = await getSearch[Tweet](multiQuery, after, agent)
|
||||
html = renderTweetSearch(timeline, prefs, getPath())
|
||||
return renderMain(html, request, cfg, "Multi", rss=rss)
|
||||
|
||||
let
|
||||
|
|
Loading…
Reference in a new issue