Revert "Switch to using typeahead for user search"

This reverts commit a3e11e3272.

src/api.nim

@@ -115,16 +115,22 @@ proc getGraphTweetSearch*(query: Query; after=""): Future[Timeline] {.async.} =
   result = parseGraphSearch(await fetch(url, Api.search), after)
   result.query = query
 
-proc getUserSearch*(query: Query): Future[Result[User]] {.async.} =
+proc getUserSearch*(query: Query; page="1"): Future[Result[User]] {.async.} =
   if query.text.len == 0:
     return Result[User](query: query, beginning: true)
 
   let
-    url = userSearch ? genParams({"q": query.text, "result_type": "users"})
+    page = if page.len == 0: "1" else: page
+    url = userSearch ? genParams({"q": query.text, "skip_status": "1", "page": page})
     js = await fetchRaw(url, Api.userSearch)
 
-  result = parseTypeahead(js)
+  result = parseUsers(js)
+
   result.query = query
+  if page.len == 0:
+    result.bottom = "2"
+  elif page.allCharsInSet(Digits):
+    result.bottom = $(parseInt(page) + 1)
 
 proc getPhotoRail*(name: string): Future[PhotoRail] {.async.} =
   if name.len == 0: return

src/consts.nim

@@ -9,7 +9,7 @@ const
   activate* = $(api / "1.1/guest/activate.json")
 
   photoRail* = api / "1.1/statuses/media_timeline.json"
-  userSearch* = api / "1.1/search/typeahead.json"
+  userSearch* = api / "1.1/users/search.json"
 
   graphql = api / "graphql"
   graphUser* = graphql / "u7wQyGi6oExe8_TRWGMq4Q/UserResultByScreenNameQuery"

src/experimental/parser/user.nim

@@ -85,10 +85,3 @@ proc parseUsers*(json: string; after=""): Result[User] =
     let raw = json.fromJson(seq[RawUser])
     for user in raw:
       result.content.add user.toUser
-
-proc parseTypeahead*(json: string): Result[User] =
-  result = Result[User](beginning: true)
-
-  let raw = json.fromJson(Typeahead)
-  for user in raw.users:
-    result.content.add user.toUser

src/experimental/types/user.nim

@@ -42,6 +42,3 @@ type
 
   Color* = object
     red*, green*, blue*: int
-
-  Typeahead* = object
-    users*: seq[RawUser]

src/routes/search.nim

@@ -29,7 +29,7 @@ proc createSearchRouter*(cfg: Config) =
           redirect("/" & q)
         var users: Result[User]
         try:
-          users = await getUserSearch(query)
+          users = await getUserSearch(query, getCursor())
         except InternalError:
           users = Result[User](beginning: true, query: query)
         resp renderMain(renderUserSearch(users, prefs), request, cfg, prefs, title)