Add config options to hide issue events

options/locale/locale_en-US.ini

@@ -541,6 +541,23 @@ continue = Continue
 cancel = Cancel
 language = Language
 ui = Theme
+shown_comments = Hidden comment types
+comment_type_ref = References
+comment_type_changed_labels = Changed labels
+comment_type_changed_milestone = Changed milestone
+comment_type_changed_assignees = Changed assignees
+comment_type_changed_title = Changed title
+comment_type_delete_branch = Delete branch
+comment_type_changed_time = Changed time
+comment_type_changed_deadline = Changed deadline
+comment_type_changed_dependencies = Changed dependencies
+comment_type_changed_lock_status = Changed lock status
+comment_type_changed_target = Changed target branch
+comment_type_review_request = Review requests
+comment_type_pr_push = Added commits
+comment_type_changed_project = Changed project
+comment_type_changed_ref = Changed reference
+saved_successfully = Your settings were saved successfully.
 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

routers/web/repo/issue.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math/big"
 	"net/http"
 	"net/url"
 	"path"
@@ -1635,6 +1636,28 @@ func ViewIssue(ctx *context.Context) {
 	ctx.Data["HasProjectsWritePermission"] = ctx.Repo.CanWrite(unit.TypeProjects)
 	ctx.Data["IsRepoAdmin"] = ctx.IsSigned && (ctx.Repo.IsAdmin() || ctx.User.IsAdmin)
 	ctx.Data["LockReasons"] = setting.Repository.Issue.LockReasons
+	var hiddenEvents *big.Int
+	if ctx.IsSigned {
+		eventsRaw, err := user_model.GetSettings(ctx.User.ID, []string{"hidden_comment_types"})
+		if err != nil {
+			ctx.ServerError("GetSettings", err)
+			return
+		}
+		if eventsRaw["hidden_comment_types"] != nil && eventsRaw["hidden_comment_types"].SettingValue != "" {
+			var ok bool
+			hiddenEvents, ok = new(big.Int).SetString(eventsRaw["hidden_comment_types"].SettingValue, 10)
+			if !ok {
+				hiddenEvents = nil
+				log.Error("SetString: error")
+			}
+		}
+	}
+	ctx.Data["IsEventShown"] = func(commentType models.CommentType) bool {
+		if hiddenEvents == nil {
+			return true
+		}
+		return hiddenEvents.Bit(int(commentType)) == 0
+	}
 	ctx.Data["RefEndName"] = git.RefEndName(issue.Ref)
 	ctx.HTML(http.StatusOK, tplIssueView)
 }

routers/web/user/setting/profile.go

@@ -9,6 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"math/big"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -357,6 +358,28 @@ func Appearance(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("settings")
 	ctx.Data["PageIsSettingsAppearance"] = true
 
+	var hiddenEvents *big.Int
+	eventsRaw, err := user_model.GetSettings(ctx.User.ID, []string{"hidden_comment_types"})
+	if err != nil {
+		ctx.ServerError("GetSettings", err)
+		return
+	}
+	if eventsRaw["hidden_comment_types"] != nil && eventsRaw["hidden_comment_types"].SettingValue != "" {
+		var ok bool
+		hiddenEvents, ok = new(big.Int).SetString(eventsRaw["hidden_comment_types"].SettingValue, 10)
+		if !ok {
+			hiddenEvents = nil
+			log.Error("SetString: error")
+		}
+	}
+
+	ctx.Data["IsHidden"] = func(commentType int) bool {
+		if hiddenEvents == nil {
+			return false
+		}
+		return hiddenEvents.Bit(commentType) != 0
+	}
+
 	ctx.HTML(http.StatusOK, tplSettingsAppearance)
 }
 
@@ -416,3 +439,23 @@ func UpdateUserLang(ctx *context.Context) {
 	ctx.Redirect(setting.AppSubURL + "/user/settings/appearance")
 
 }
+
+// UpdateUserShownComments update a user's shown comment types
+func UpdateUserShownComments(ctx *context.Context) {
+	form := web.GetForm(ctx).(*forms.UpdateCommentTypeForm)
+	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["PageIsSettingsAppearance"] = true
+
+	bitset := form.Bitset()
+	json := bitset.String()
+	err := user_model.SetSetting(&user_model.Setting{UserID: ctx.User.ID, SettingKey: "hidden_comment_types", SettingValue: string(json)})
+	if err != nil {
+		ctx.ServerError("SetSetting", err)
+		return
+	}
+
+	log.Trace("User settings updated: %s", ctx.User.Name)
+	ctx.Flash.Success(ctx.Tr("settings.saved_successfully"))
+	ctx.Redirect(setting.AppSubURL + "/user/settings/appearance")
+
+}

routers/web/web.go

@@ -326,6 +326,7 @@ func RegisterRoutes(m *web.Route) {
 		m.Group("/appearance", func() {
 			m.Get("", userSetting.Appearance)
 			m.Post("/language", bindIgnErr(forms.UpdateLanguageForm{}), userSetting.UpdateUserLang)
+			m.Post("/shown_comments", bindIgnErr(forms.UpdateCommentTypeForm{}), userSetting.UpdateUserShownComments)
 			m.Post("/theme", bindIgnErr(forms.UpdateThemeForm{}), userSetting.UpdateUIThemePost)
 		})
 		m.Group("/security", func() {

services/forms/user_form.go

@@ -6,6 +6,7 @@
 package forms
 
 import (
+	"math/big"
 	"mime/multipart"
 	"net/http"
 	"strings"
@@ -267,6 +268,117 @@ func (f *UpdateLanguageForm) Validate(req *http.Request, errs binding.Errors) bi
 	return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
 }
 
+// UpdateCommentTypeForm form for updating profile
+type UpdateCommentTypeForm struct {
+	Reference    bool
+	Labels       bool
+	Milestone    bool
+	Assignee     bool
+	Title        bool
+	Branch       bool // delete branch
+	Time         bool
+	Deadline     bool
+	Dependencies bool
+	Lock         bool
+	Target       bool // target branch
+	Requests     bool // review requests
+	Push         bool // push to PR
+	Project      bool
+	Ref          bool // issue ref
+}
+
+// Validate validates the fields
+func (f *UpdateCommentTypeForm) Validate(req *http.Request, errs binding.Errors) binding.Errors {
+	ctx := context.GetContext(req)
+	return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
+}
+
+// IsHidden checks if the given commentType is visible
+func (f *UpdateCommentTypeForm) IsHidden(commentType int) bool {
+	bitset := f.Bitset()
+	return bitset.Bit(commentType) != 0
+}
+
+// Bitset created the bitset to the update comment form
+func (f *UpdateCommentTypeForm) Bitset() big.Int {
+	var bitset big.Int
+	types := []struct {
+		variable bool
+		types    []int
+	}{
+		{
+			variable: f.Reference,
+			types:    []int{3, 4, 5, 6},
+		},
+		{
+			variable: f.Labels,
+			types:    []int{7},
+		},
+		{
+			variable: f.Milestone,
+			types:    []int{8},
+		},
+		{
+			variable: f.Assignee,
+			types:    []int{9},
+		},
+		{
+			variable: f.Title,
+			types:    []int{10},
+		},
+		{
+			variable: f.Branch,
+			types:    []int{11},
+		},
+		{
+			variable: f.Time,
+			types:    []int{12, 13, 14, 15, 26},
+		},
+		{
+			variable: f.Deadline,
+			types:    []int{16, 17, 18},
+		},
+		{
+			variable: f.Dependencies,
+			types:    []int{19, 20},
+		},
+		{
+			variable: f.Lock,
+			types:    []int{23, 24},
+		},
+		{
+			variable: f.Target,
+			types:    []int{25},
+		},
+		{
+			variable: f.Requests,
+			types:    []int{27},
+		},
+		{
+			variable: f.Push,
+			types:    []int{29},
+		},
+		{
+			variable: f.Project,
+			types:    []int{30, 31},
+		},
+		{
+			variable: f.Ref,
+			types:    []int{33},
+		},
+	}
+	for _, v := range types {
+		for _, w := range v.types {
+			var bitSetVar uint
+			if v.variable {
+				bitSetVar = 1
+			}
+			bitset.SetBit(&bitset, w, bitSetVar)
+		}
+	}
+	return bitset
+}
+
 // Avatar types
 const (
 	AvatarLocal  string = "local"