Add user search

src/api/search.nim

@@ -1,32 +1,56 @@
 import httpclient, asyncdispatch, htmlparser
 import sequtils, strutils, json, xmltree, uri
 
-import ".."/[types, parser, parserutils, formatters, search]
+import ".."/[types, parser, parserutils, formatters, query]
 import utils, consts, media, timeline
 
-proc getTimelineSearch*(query: Query; after, agent: string): Future[Timeline] {.async.} =
-  let queryParam = genQueryParam(query)
-  let queryEncoded = encodeUrl(queryParam, usePlus=false)
+proc getResult[T](json: JsonNode; query: Query; after: string): Result[T] =
+  Result[T](
+    hasMore: json["has_more_items"].to(bool),
+    maxId: json.getOrDefault("max_position").getStr(""),
+    minId: json.getOrDefault("min_position").getStr("").cleanPos(),
+    query: query.some,
+    beginning: after.len == 0
+  )
 
-  let headers = newHttpHeaders({
-    "Accept": jsonAccept,
-    "Referer": $(base / ("search?f=tweets&vertical=default&q=$1&src=typd" % queryEncoded)),
-    "User-Agent": agent,
-    "X-Requested-With": "XMLHttpRequest",
-    "Authority": "twitter.com",
-    "Accept-Language": lang
-  })
+proc getSearch*[T](query: Query; after, agent: string): Future[Result[T]] {.async.} =
+  let
+    kind = if query.kind == users: "users" else: "tweets"
+    pos = when T is Tweet: genPos(after) else: after
 
-  let params = {
-    "f": "tweets",
-    "vertical": "default",
-    "q": queryParam,
-    "src": "typd",
-    "include_available_features": "1",
-    "include_entities": "1",
-    "max_position": if after.len > 0: genPos(after) else: "0",
-    "reset_error_state": "false"
-  }
+    param = genQueryParam(query)
+    encoded = encodeUrl(param, usePlus=false)
+
+    headers = newHttpHeaders({
+      "Accept": jsonAccept,
+      "Referer": $(base / ("search?f=$1&q=$2&src=typd" % [kind, encoded])),
+      "User-Agent": agent,
+      "X-Requested-With": "XMLHttpRequest",
+      "Authority": "twitter.com",
+      "Accept-Language": lang
+    })
+
+    params = {
+      "f": kind,
+      "vertical": "default",
+      "q": param,
+      "src": "typd",
+      "include_available_features": "1",
+      "include_entities": "1",
+      "max_position": if pos.len > 0: pos else: "0",
+      "reset_error_state": "false"
+    }
 
   let json = await fetchJson(base / searchUrl ? params, headers)
-  result = await finishTimeline(json, some(query), after, agent)
+  if json == nil: return Result[T]()
+
+  result = getResult[T](json, query, after)
+  if not json.hasKey("items_html"): return
+  let html = parseHtml(json["items_html"].to(string))
+
+  when T is Tweet:
+    result = await finishTimeline(json, some(query), after, agent)
+  elif T is Profile:
+    result.hasMore = json["items_html"].to(string) != "\n"
+    for p in html.selectAll(".js-stream-item"):
+      result.content.add parsePopupProfile(p, ".ProfileCard")

src/api/timeline.nim

@@ -1,7 +1,7 @@
 import httpclient, asyncdispatch, htmlparser
 import sequtils, strutils, json, xmltree, uri
 
-import ".."/[types, parser, parserutils, formatters, search]
+import ".."/[types, parser, parserutils, formatters, query]
 import utils, consts, media
 
 proc finishTimeline*(json: JsonNode; query: Option[Query]; after, agent: string): Future[Timeline] {.async.} =