diff options
Diffstat (limited to 'models/action.go')
-rw-r--r-- | models/action.go | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/models/action.go b/models/action.go index 1754c2a353..1a6ff75603 100644 --- a/models/action.go +++ b/models/action.go @@ -284,11 +284,11 @@ func (a *Action) GetIssueContent() string { // GetFeedsOptions options for retrieving feeds type GetFeedsOptions struct { - RequestedUser *User - RequestingUserID int64 - IncludePrivate bool // include private actions - OnlyPerformedBy bool // only actions performed by requested user - IncludeDeleted bool // include deleted actions + RequestedUser *User // the user we want activity for + Actor *User // the user viewing the activity + IncludePrivate bool // include private actions + OnlyPerformedBy bool // only actions performed by requested user + IncludeDeleted bool // include deleted actions } // GetFeeds returns actions according to the provided options @@ -296,8 +296,14 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) { cond := builder.NewCond() var repoIDs []int64 + var actorID int64 + + if opts.Actor != nil { + actorID = opts.Actor.ID + } + if opts.RequestedUser.IsOrganization() { - env, err := opts.RequestedUser.AccessibleReposEnv(opts.RequestingUserID) + env, err := opts.RequestedUser.AccessibleReposEnv(actorID) if err != nil { return nil, fmt.Errorf("AccessibleReposEnv: %v", err) } @@ -306,6 +312,8 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) { } cond = cond.And(builder.In("repo_id", repoIDs)) + } else if opts.Actor != nil { + cond = cond.And(builder.In("repo_id", opts.Actor.AccessibleRepoIDsQuery())) } cond = cond.And(builder.Eq{"user_id": opts.RequestedUser.ID}) |