Add user search

src/views/general.nim

@@ -60,13 +60,6 @@ proc renderMain*(body: VNode; prefs: Prefs; title="Nitter"; titleText=""; desc="
 
   result = doctype & $node
 
-proc renderSearch*(): VNode =
-  buildHtml(tdiv(class="panel-container")):
-    tdiv(class="search-panel"):
-      form(`method`="post", action="/search"):
-        input(`type`="text", name="query", autofocus="", placeholder="Enter usernames...")
-        button(`type`="submit"): icon "search"
-
 proc renderError*(error: string): VNode =
   buildHtml(tdiv(class="panel-container")):
     tdiv(class="error-panel"):

src/views/profile.nim

@@ -98,5 +98,5 @@ proc renderProfile*(profile: Profile; timeline: Timeline;
       if profile.protected:
         renderProtected(profile.username)
       else:
-        renderProfileTabs(timeline, profile.username)
+        renderProfileTabs(timeline.query, profile.username)
         renderTimelineTweets(timeline, prefs, path)

src/views/search.nim

@@ -0,0 +1,38 @@
+import strutils, strformat
+import karax/[karaxdsl, vdom, vstyles]
+
+import renderutils, timeline
+import ".."/[types, formatters, query]
+
+proc renderSearch*(): VNode =
+  buildHtml(tdiv(class="panel-container")):
+    tdiv(class="search-panel"):
+      form(`method`="get", action="/search"):
+        verbatim "<input name=\"kind\" style=\"display: none\" value=\"users\"/>"
+        input(`type`="text", name="text", autofocus="", placeholder="Enter username...")
+        button(`type`="submit"): icon "search"
+
+proc renderTweetSearch*(timeline: Timeline; prefs: Prefs; path: string): VNode =
+  let users = get(timeline.query).fromUser
+  buildHtml(tdiv(class="timeline-container")):
+    tdiv(class="timeline-header"):
+      text users.join(" | ")
+
+    renderProfileTabs(timeline.query, users.join(","))
+    renderTimelineTweets(timeline, prefs, path)
+
+proc renderUserSearch*(users: Result[Profile]; prefs: Prefs): VNode =
+  let searchText =
+    if users.query.isSome: get(users.query).text
+    else: ""
+
+  buildHtml(tdiv(class="timeline-container")):
+    tdiv(class="timeline-header"):
+      form(`method`="get", action="/search"):
+        verbatim "<input name=\"kind\" style=\"display: none\" value=\"users\"/>"
+        verbatim "<input type=\"text\" name=\"text\" value=\"$1\"/>" % searchText
+        button(`type`="submit"): icon "search"
+
+    renderSearchTabs(users.query)
+
+    renderTimelineUsers(users, prefs)

src/views/timeline.nim

@@ -12,27 +12,35 @@ proc getQuery(query: Option[Query]): string =
     if result[^1] != '?':
       result &= "&"
 
-proc getTabClass(results: Result; tab: string): string =
+proc getTabClass(query: Option[Query]; tab: string): string =
   var classes = @["tab-item"]
 
-  if results.query.isNone or get(results.query).kind == multi:
+  if query.isNone or get(query).kind == multi:
     if tab == "posts":
       classes.add "active"
-  elif $get(results.query).kind == tab:
+  elif $get(query).kind == tab:
     classes.add "active"
 
   return classes.join(" ")
 
-proc renderProfileTabs*(timeline: Timeline; username: string): VNode =
+proc renderProfileTabs*(query: Option[Query]; username: string): VNode =
   let link = "/" & username
   buildHtml(ul(class="tab")):
-    li(class=timeline.getTabClass("posts")):
+    li(class=query.getTabClass("posts")):
       a(href=link): text "Tweets"
-    li(class=timeline.getTabClass("replies")):
+    li(class=query.getTabClass("replies")):
       a(href=(link & "/replies")): text "Tweets & Replies"
-    li(class=timeline.getTabClass("media")):
+    li(class=query.getTabClass("media")):
       a(href=(link & "/media")): text "Media"
 
+proc renderSearchTabs*(query: Option[Query]): VNode =
+  var q = if query.isSome: get(query) else: Query()
+
+  buildHtml(ul(class="tab")):
+    li(class=query.getTabClass("users")):
+      q.kind = users
+      a(href=genQueryUrl(q)): text "Users"
+
 proc renderNewer(query: Option[Query]): VNode =
   buildHtml(tdiv(class="timeline-item show-more")):
     a(href=(getQuery(query).strip(chars={'?', '&'}))):
@@ -62,6 +70,34 @@ proc renderThread(thread: seq[Tweet]; prefs: Prefs; path: string): VNode =
 proc threadFilter(it: Tweet; tweetThread: string): bool =
   it.retweet.isNone and it.reply.len == 0 and it.threadId == tweetThread
 
+proc renderUser(user: Profile; prefs: Prefs): VNode =
+  buildHtml(tdiv(class="timeline-item")):
+    tdiv(class="tweet-body profile-result"):
+      tdiv(class="tweet-header"):
+        a(class="tweet-avatar", href=("/" & user.username)):
+          genImg(user.getUserpic("_bigger"), class="avatar")
+
+        tdiv(class="tweet-name-row"):
+          tdiv(class="fullname-and-username"):
+            linkUser(user, class="fullname")
+        linkUser(user, class="username")
+
+      tdiv(class="tweet-content media-body"):
+        verbatim linkifyText(user.bio, prefs)
+
+proc renderTimelineUsers*(results: Result[Profile]; prefs: Prefs): VNode =
+  buildHtml(tdiv(class="timeline")):
+    if not results.beginning:
+      renderNewer(results.query)
+
+    if results.content.len > 0:
+      for user in results.content:
+        renderUser(user, prefs)
+      renderOlder(results.query, results.minId)
+    elif results.beginning:
+      renderNoneFound()
+    else:
+      renderNoMore()
 
 proc renderTimelineTweets*(results: Result[Tweet]; prefs: Prefs; path: string): VNode =
   buildHtml(tdiv(class="timeline")):