Add Visible modes function from Organisation to Users too

models/migrations/migrations.go

@@ -311,6 +311,8 @@ var migrations = []Migration{
 	NewMigration("Convert avatar url to text", convertAvatarURLToText),
 	// v180 -> v181
 	NewMigration("Delete credentials from past migrations", deleteMigrationCredentials),
+	// v181 -> v182
+	NewMigration("Add column to User to allow them hide self from explore/users page", addHideFromExplorePageUserColumn),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v181.go

@@ -0,0 +1,21 @@
+// Copyright 2021 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"fmt"
+
+	"xorm.io/xorm"
+)
+
+func addHideFromExplorePageUserColumn(x *xorm.Engine) error {
+	type User struct {
+		HideFromExplorePage bool `xorm:"NOT NULL DEFAULT false"`
+	}
+	if err := x.Sync2(new(User)); err != nil {
+		return fmt.Errorf("Sync2: %v", err)
+	}
+	return nil
+}

models/user.go

@@ -166,6 +166,8 @@ type User struct {
 	DiffViewStyle       string `xorm:"NOT NULL DEFAULT ''"`
 	Theme               string `xorm:"NOT NULL DEFAULT ''"`
 	KeepActivityPrivate bool   `xorm:"NOT NULL DEFAULT false"`
+	// Users may don't want to appear on /explore/users page.
+	HideFromExplorePage bool `xorm:"NOT NULL DEFAULT false"`
 }
 
 // SearchOrganizationsOptions options to filter organizations

modules/structs/admin_user.go

@@ -16,9 +16,10 @@ type CreateUserOption struct {
 	// swagger:strfmt email
 	Email string `json:"email" binding:"Required;Email;MaxSize(254)"`
 	// required: true
-	Password           string `json:"password" binding:"Required;MaxSize(255)"`
-	MustChangePassword *bool  `json:"must_change_password"`
-	SendNotify         bool   `json:"send_notify"`
+	Password            string `json:"password" binding:"Required;MaxSize(255)"`
+	MustChangePassword  *bool  `json:"must_change_password"`
+	SendNotify          bool   `json:"send_notify"`
+	HideFromExplorePage *bool  `json:"hide_from_explore_page"`
 }
 
 // EditUserOption edit user options
@@ -43,4 +44,5 @@ type EditUserOption struct {
 	ProhibitLogin           *bool   `json:"prohibit_login"`
 	AllowCreateOrganization *bool   `json:"allow_create_organization"`
 	Restricted              *bool   `json:"restricted"`
+	HideFromExplorePage     *bool   `json:"hide_from_explore_page"`
 }

options/locale/locale_en-US.ini

@@ -473,6 +473,8 @@ ui = Theme
 privacy = Privacy
 keep_activity_private = Hide the activity from the profile page
 keep_activity_private_popup = Makes the activity visible only for you and the admins
+hide_from_explore_page = Hide user from explorabale service users page
+hide_from_explore_page_popup = Makes user visible only if mentioned in repo, commit, etc.
 
 lookup_avatar_by_mail = Look Up Avatar by Email Address
 federated_avatar_lookup = Federated Avatar Lookup
@@ -2236,6 +2238,8 @@ users.still_own_repo = This user still owns one or more repositories. Delete or
 users.still_has_org = This user is a member of an organization. Remove the user from any organizations first.
 users.deletion_success = The user account has been deleted.
 users.reset_2fa = Reset 2FA
+users.hide_from_explore_page = User do not appear on service explore page
+users.hide_from_explore_page_tooltip = Users may do not want to be anounced publicly. So they can be hided from that page. But they profile will be accesible by mentioning in commit, issue, etc.
 
 emails.email_manage_panel = User Email Management
 emails.primary = Primary

routers/api/v1/admin/user.go

@@ -67,17 +67,21 @@ func CreateUser(ctx *context.APIContext) {
 	//     "$ref": "#/responses/validationError"
 	form := web.GetForm(ctx).(*api.CreateUserOption)
 	u := &models.User{
-		Name:               form.Username,
-		FullName:           form.FullName,
-		Email:              form.Email,
-		Passwd:             form.Password,
-		MustChangePassword: true,
-		IsActive:           true,
-		LoginType:          models.LoginPlain,
+		Name:                form.Username,
+		FullName:            form.FullName,
+		Email:               form.Email,
+		Passwd:              form.Password,
+		MustChangePassword:  true,
+		IsActive:            true,
+		LoginType:           models.LoginPlain,
+		HideFromExplorePage: false,
 	}
 	if form.MustChangePassword != nil {
 		u.MustChangePassword = *form.MustChangePassword
 	}
+	if form.HideFromExplorePage != nil {
+		u.HideFromExplorePage = *form.HideFromExplorePage
+	}
 
 	parseLoginSource(ctx, u, form.SourceID, form.LoginName)
 	if ctx.Written() {
@@ -230,6 +234,9 @@ func EditUser(ctx *context.APIContext) {
 	if form.Restricted != nil {
 		u.IsRestricted = *form.Restricted
 	}
+	if form.HideFromExplorePage != nil {
+		u.HideFromExplorePage = *form.HideFromExplorePage
+	}
 
 	if err := models.UpdateUser(u); err != nil {
 		if models.IsErrEmailAlreadyUsed(err) || models.IsErrEmailInvalid(err) {

routers/user/setting/profile.go

@@ -113,6 +113,7 @@ func ProfilePost(ctx *context.Context) {
 	}
 	ctx.User.Description = form.Description
 	ctx.User.KeepActivityPrivate = form.KeepActivityPrivate
+	ctx.User.HideFromExplorePage = form.HideFromExplorePage
 	if err := models.UpdateUserSetting(ctx.User); err != nil {
 		if _, ok := err.(models.ErrEmailAlreadyUsed); ok {
 			ctx.Flash.Error(ctx.Tr("form.email_been_used"))

services/forms/admin.go

@@ -15,13 +15,14 @@ import (
 
 // AdminCreateUserForm form for admin to create user
 type AdminCreateUserForm struct {
-	LoginType          string `binding:"Required"`
-	LoginName          string
-	UserName           string `binding:"Required;AlphaDashDot;MaxSize(40)"`
-	Email              string `binding:"Required;Email;MaxSize(254)"`
-	Password           string `binding:"MaxSize(255)"`
-	SendNotify         bool
-	MustChangePassword bool
+	LoginType           string `binding:"Required"`
+	LoginName           string
+	UserName            string `binding:"Required;AlphaDashDot;MaxSize(40)"`
+	Email               string `binding:"Required;Email;MaxSize(254)"`
+	Password            string `binding:"MaxSize(255)"`
+	SendNotify          bool
+	MustChangePassword  bool
+	HideFromExplorePage bool
 }
 
 // Validate validates form fields
@@ -49,6 +50,7 @@ type AdminEditUserForm struct {
 	AllowCreateOrganization bool
 	ProhibitLogin           bool
 	Reset2FA                bool `form:"reset_2fa"`
+	HideFromExplorePage     bool
 }
 
 // Validate validates form fields

services/forms/user_form.go

@@ -231,6 +231,7 @@ type UpdateProfileForm struct {
 	Language            string
 	Description         string `binding:"MaxSize(255)"`
 	KeepActivityPrivate bool
+	HideFromExplorePage bool
 }
 
 // Validate validates the fields

templates/admin/user/edit.tmpl

@@ -120,6 +120,13 @@
 				</div>
 				{{end}}
 
+				<div class="inline field">
+					<div class="ui checkbox poping up" data-content="{{.i18n.Tr "admin.users.hide_from_explore_page_tooltip"}}" data-variation="very wide">
+						<label><strong>{{.i18n.Tr "admin.users.hide_from_explore_page"}}</strong></label>
+						<input name="hide_from_explore_page" type="checkbox" {{if .User.HideFromExplorePage}}checked{{end}}>
+					</div>
+				</div>
+
 				<div class="ui divider"></div>
 
 				<div class="field">

templates/admin/user/new.tmpl

@@ -59,6 +59,13 @@
 					</div>
 				{{end}}
 
+				<div class="inline field">
+					<div class="ui checkbox poping up" data-content="{{.i18n.Tr "admin.users.hide_from_explore_page_tooltip"}}" data-variation="very wide">
+						<label><strong>{{.i18n.Tr "admin.users.hide_from_explore_page"}}</strong></label>
+						<input name="hide_from_explore_page" type="checkbox" {{if .User.HideFromExplorePage}}checked{{end}}>
+					</div>
+				</div>
+
 				<div class="field">
 					<button class="ui green button">{{.i18n.Tr "admin.users.new_account"}}</button>
 				</div>

templates/explore/users.tmpl

@@ -6,6 +6,7 @@
 
 		<div class="ui user list">
 			{{range .Users}}
+				{{if not .HideFromExplorePage}}
 				<div class="item">
 					{{avatar .}}
 					<div class="content">
@@ -22,6 +23,7 @@
 						</div>
 					</div>
 				</div>
+				{{end}}
 			{{else}}
 				<div>{{$.i18n.Tr "explore.user_no_results"}}</div>
 			{{end}}

templates/swagger/v1_json.tmpl

@@ -13014,6 +13014,10 @@
           "type": "string",
           "x-go-name": "FullName"
         },
+        "hide_from_explore_page": {
+          "type": "boolean",
+          "x-go-name": "HideFromExplorePage"
+        },
         "login_name": {
           "type": "string",
           "x-go-name": "LoginName"
@@ -13813,6 +13817,10 @@
           "type": "string",
           "x-go-name": "FullName"
         },
+        "hide_from_explore_page": {
+          "type": "boolean",
+          "x-go-name": "HideFromExplorePage"
+        },
         "location": {
           "type": "string",
           "x-go-name": "Location"

templates/user/settings/profile.tmpl

@@ -68,6 +68,13 @@
 						<input name="keep_activity_private" type="checkbox" {{if .SignedUser.KeepActivityPrivate}}checked{{end}}>
 					</div>
 				</div>
+				<div class="field">
+					<!-- continue of privacy settings -->
+					<div class="ui checkbox" id="hide_from_explore_page">
+						<label class="poping up" data-content="{{.i18n.Tr "settings.hide_from_explore_page_popup"}}"><strong>{{.i18n.Tr "settings.hide_from_explore_page"}}</strong></label>
+						<input name="hide_from_explore_page" type="checkbox" {{if .SignedUser.HideFromExplorePage}}checked{{end}}>
+					</div>
+				</div>
 				<div class="field">
 					<button class="ui green button">{{$.i18n.Tr "settings.update_profile"}}</button>
 				</div>