From cdd30b376f6878839ec38342939bd6f54c4384ff Mon Sep 17 00:00:00 2001
From: Aravinth Manivannan <realaravinth@batsense.net>
Date: Fri, 29 Mar 2024 14:07:57 +0530
Subject: [PATCH] fix: webfinger before loading search results for
 /explore/users/

---
 routers/web/explore/user.go | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go
index 125b7ee3b..41e88a885 100644
--- a/routers/web/explore/user.go
+++ b/routers/web/explore/user.go
@@ -93,13 +93,6 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
 
 	opts.Keyword = ctx.FormTrim("q")
 	opts.OrderBy = orderBy
-	if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) {
-		users, count, err = user_model.SearchUsers(ctx, opts)
-		if err != nil {
-			ctx.ServerError("SearchUsers", err)
-			return
-		}
-	}
 
 	if len(opts.Keyword) > 0 && forgefed.IsFingerable(opts.Keyword) {
 		webfingerRes, err := forgefed.WebFingerLookup(opts.Keyword)
@@ -125,6 +118,14 @@ func RenderUserSearch(ctx *context.Context, opts *user_model.SearchUserOptions,
 		//		}
 	}
 
+	if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) {
+		users, count, err = user_model.SearchUsers(ctx, opts)
+		if err != nil {
+			ctx.ServerError("SearchUsers", err)
+			return
+		}
+	}
+
 	if isSitemap {
 		m := sitemap.NewSitemap()
 		for _, item := range users {