Hide users from explore view who have no repos (unless searched for)

Author: ashimokawa

models/user.go

@@ -1590,6 +1590,7 @@ type SearchUserOptions struct {
 	Actor         *User // The user doing the search
 	IsActive      util.OptionalBool
 	SearchByEmail bool // Search by email as well as username/full name
+	HideNoRepos   util.OptionalBool
 }
 
 func (opts *SearchUserOptions) toConds() builder.Cond {
@@ -1643,6 +1644,10 @@ func (opts *SearchUserOptions) toConds() builder.Cond {
 		cond = cond.And(builder.Eq{"is_active": opts.IsActive.IsTrue()})
 	}
 
+	if opts.HideNoRepos.IsTrue() {
+		cond = cond.And(builder.Expr("num_repos > 0"));
+	}
+
 	return cond
 }
 

routers/home.go

@@ -233,6 +233,12 @@ func RenderUserSearch(ctx *context.Context, opts *models.SearchUserOptions, tplN
 	}
 
 	opts.Keyword = strings.Trim(ctx.Query("q"), " ")
+
+
+	if (opts.HideNoRepos == util.OptionalBoolTrue) && (opts.Keyword != "") {
+		opts.HideNoRepos = util.OptionalBoolFalse;
+        }
+
 	opts.OrderBy = orderBy
 	if len(opts.Keyword) == 0 || isKeywordValid(opts.Keyword) {
 		users, count, err = models.SearchUsers(opts)
@@ -272,6 +278,7 @@ func ExploreUsers(ctx *context.Context) {
 		ListOptions: models.ListOptions{PageSize: setting.UI.ExplorePagingNum},
 		IsActive:    util.OptionalBoolTrue,
 		Visible:     []structs.VisibleType{structs.VisibleTypePublic, structs.VisibleTypeLimited, structs.VisibleTypePrivate},
+		HideNoRepos: util.OptionalBoolTrue,
 	}, tplExploreUsers)
 }
 
@@ -293,6 +300,7 @@ func ExploreOrganizations(ctx *context.Context) {
 		Type:        models.UserTypeOrganization,
 		ListOptions: models.ListOptions{PageSize: setting.UI.ExplorePagingNum},
 		Visible:     visibleTypes,
+		HideNoRepos: util.OptionalBoolTrue,
 	}, tplExploreOrganizations)
 }