diff options
| author | l-jonas <43265000+l-jonas@users.noreply.github.com> | 2020-06-05 22:01:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-05 16:01:53 -0400 |
| commit | aa3c0f8eba9b75b3d4206fbcf3fcfc23929ade2f (patch) | |
| tree | d504c127ed722a93889f954da2799d11c9f148c3 /models/action.go | |
| parent | ac0741801101d56b6bccd1089ffedf2b3480758b (diff) | |
| download | gitea-aa3c0f8eba9b75b3d4206fbcf3fcfc23929ade2f.tar.gz gitea-aa3c0f8eba9b75b3d4206fbcf3fcfc23929ade2f.zip | |
Add hide activity option (#11353)
* Add hide activity option
This closes https://github.com/go-gitea/gitea/issues/7927
* Adjust for linter
* Adjust for linter
* Add tests
* Remove info that admins can view the activity
* Adjust new tests for linter
* Rename v139.go to v140.go
* Rename v140.go to v141.go
* properly indent
* gofmt
Co-authored-by: Jonas Lochmann <git@inkompetenz.org>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'models/action.go')
| -rw-r--r-- | models/action.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/models/action.go b/models/action.go index fd49c6d4ed..59ccdb2d4c 100644 --- a/models/action.go +++ b/models/action.go @@ -319,6 +319,12 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) { cond = cond.And(builder.In("repo_id", AccessibleRepoIDsQuery(opts.Actor))) } + if opts.Actor == nil || !opts.Actor.IsAdmin { + if opts.RequestedUser.KeepActivityPrivate && actorID != opts.RequestedUser.ID { + return make([]*Action, 0), nil + } + } + cond = cond.And(builder.Eq{"user_id": opts.RequestedUser.ID}) if opts.OnlyPerformedBy { |