From ac9fa2ce1db03e57fd4e463b8b0edf655b951888 Mon Sep 17 00:00:00 2001
From: Zed <zedeus@pm.me>
Date: Sat, 21 Sep 2019 01:11:03 +0200
Subject: [PATCH] Simplify query parameters

---
 src/query.nim          | 2 +-
 src/views/timeline.nim | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/query.nim b/src/query.nim
index 5561169..916f049 100644
--- a/src/query.nim
+++ b/src/query.nim
@@ -93,7 +93,7 @@ proc genQueryUrl*(query: Query): string =
     params.add "f-" & f & "=on"
   for e in query.excludes:
     params.add "e-" & e & "=on"
-  for i in query.includes:
+  for i in query.includes.filterIt(it != "nativeretweets"):
     params.add "i-" & i & "=on"
 
   if query.since.len > 0:
diff --git a/src/views/timeline.nim b/src/views/timeline.nim
index a4072b9..833a2eb 100644
--- a/src/views/timeline.nim
+++ b/src/views/timeline.nim
@@ -11,8 +11,10 @@ proc getQuery(query: Query): string =
     result &= "&"
 
 proc renderNewer(query: Query; path: string): VNode =
+  let q = genQueryUrl(query)
+  let url = if q.len > 0: "?" & q else: ""
   buildHtml(tdiv(class="timeline-item show-more")):
-    a(href=(&"{path}?{genQueryUrl(query)}")):
+    a(href=(path & url)):
       text "Load newest"
 
 proc renderMore(query: Query; minId: string): VNode =