Include all public repositories in search result

Author: Morlinest

models/repo_list.go

@@ -105,6 +105,7 @@ type SearchRepoOptions struct {
 	Starred     bool          `json:"-"`
 	Page        int           `json:"-"`
 	IsProfile   bool          `json:"-"`
+	AllPublic   bool          `json:"-"` // Include also all public repositories
 	// Limit of result
 	//
 	// maximum: setting.ExplorePagingNum
@@ -149,11 +150,6 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 		starJoin = true
 	}
 
-	opts.Keyword = strings.ToLower(opts.Keyword)
-	if opts.Keyword != "" {
-		cond = cond.And(builder.Like{"lower_name", opts.Keyword})
-	}
-
 	// Append conditions
 	if !opts.Starred && opts.OwnerID > 0 {
 		var searcherReposCond builder.Cond = builder.Eq{"owner_id": opts.OwnerID}
@@ -184,6 +180,15 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos RepositoryList, coun
 		cond = cond.And(builder.Eq{"is_private": false})
 	}
 
+	if opts.OwnerID > 0 && opts.AllPublic {
+		cond = builder.Or(cond, builder.Eq{"is_private": false})
+	}
+
+	opts.Keyword = strings.ToLower(opts.Keyword)
+	if opts.Keyword != "" {
+		cond = cond.And(builder.Like{"lower_name", opts.Keyword})
+	}
+
 	if len(opts.OrderBy) == 0 {
 		opts.OrderBy = SearchOrderByAlphabetically
 	}

routers/home.go

@@ -60,6 +60,7 @@ func Swagger(ctx *context.Context) {
 
 // RepoSearchOptions when calling search repositories
 type RepoSearchOptions struct {
+	OwnerID  int64
 	Private  bool
 	PageSize int
 	TplName  base.TplName
@@ -113,11 +114,15 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	keyword := strings.Trim(ctx.Query("q"), " ")
 
 	repos, count, err = models.SearchRepositoryByName(&models.SearchRepoOptions{
-		Page:     page,
-		PageSize: opts.PageSize,
-		OrderBy:  orderBy,
-		Private:  opts.Private,
-		Keyword:  keyword,
+		Page:        page,
+		PageSize:    opts.PageSize,
+		OrderBy:     orderBy,
+		Private:     opts.Private,
+		Keyword:     keyword,
+		OwnerID:     opts.OwnerID,
+		Searcher:    ctx.User,
+		Collaborate: true,
+		AllPublic:   true,
 	})
 	if err != nil {
 		ctx.Handle(500, "SearchRepositoryByName", err)
@@ -137,9 +142,15 @@ func ExploreRepos(ctx *context.Context) {
 	ctx.Data["PageIsExplore"] = true
 	ctx.Data["PageIsExploreRepositories"] = true
 
+	var ownerID int64
+	if ctx.User != nil && !ctx.User.IsAdmin {
+		ownerID = ctx.User.ID
+	}
+
 	RenderRepoSearch(ctx, &RepoSearchOptions{
 		PageSize: setting.UI.ExplorePagingNum,
-		Private:  ctx.User != nil && ctx.User.IsAdmin,
+		OwnerID:  ownerID,
+		Private:  ctx.User != nil,
 		TplName:  tplExploreRepos,
 	})
 }