From a23fd4afafe4d7609ae003b3d1e8598969871cb5 Mon Sep 17 00:00:00 2001
From: r <r@freesoftwareextremist.com>
Date: Mon, 19 Oct 2020 06:05:59 +0000
Subject: Avoid search call for empty query

---
 service/service.go | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'service')

diff --git a/service/service.go b/service/service.go
index 8db94f8..447f186 100644
--- a/service/service.go
+++ b/service/service.go
@@ -583,9 +583,14 @@ func (svc *service) ServeUserSearchPage(c *model.Client,
 		return
 	}
 
-	results, err := c.Search(ctx, q, "statuses", 20, true, offset, id)
-	if err != nil {
-		return
+	var results *mastodon.Results
+	if len(q) > 0 {
+		results, err = c.Search(ctx, q, "statuses", 20, true, offset, id)
+		if err != nil {
+			return err
+		}
+	} else {
+		results = &mastodon.Results{}
 	}
 
 	if len(results.Statuses) == 20 {
@@ -643,9 +648,14 @@ func (svc *service) ServeSearchPage(c *model.Client,
 	var nextLink string
 	var title = "search"
 
-	results, err := c.Search(ctx, q, qType, 20, true, offset, "")
-	if err != nil {
-		return
+	var results *mastodon.Results
+	if len(q) > 0 {
+		results, err = c.Search(ctx, q, qType, 20, true, offset, "")
+		if err != nil {
+			return err
+		}
+	} else {
+		results = &mastodon.Results{}
 	}
 
 	if (qType == "accounts" && len(results.Accounts) == 20) ||
-- 
cgit v1.2.3