domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Fix user profile activity feed (#1848)

Browse source 
* Fix user profile activity feed

* gofmt, and avoid overlapping database connections
This commit is contained in:
Ethan Koenig 2017-06-01 20:42:25 -04:00 • committed by Lunny Xiao
parent 5ca6867aaf
commit 4e5ee2b67a
5 changed files with 71 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

23
routers/user/home.go
View file

@ -53,19 +53,20 @@ func getDashboardContextUser(ctx *context.Context) *models.User {
return ctxUser
}
// retrieveFeeds loads feeds from database by given context user.
// The user could be organization so it is not always the logged in user,
// which is why we have to explicitly pass the context user ID.
func retrieveFeeds(ctx *context.Context, ctxUser *models.User, userID, offset int64, isProfile bool) {
actions, err := models.GetFeeds(ctxUser, userID, offset, isProfile)
// retrieveFeeds loads feeds for the specified user
func retrieveFeeds(ctx *context.Context, user *models.User, includePrivate, isProfile bool) {
actions, err := models.GetFeeds(models.GetFeedsOptions{
RequestedUser: user,
RequestingUserID: ctx.User.ID,
IncludePrivate: includePrivate,
OnlyPerformedBy: isProfile,
})
if err != nil {
ctx.Handle(500, "GetFeeds", err)
return
}
// Check access of private repositories.
feeds := make([]*models.Action, 0, len(actions))
userCache := map[int64]*models.User{ctxUser.ID: ctxUser}
userCache := map[int64]*models.User{user.ID: user}
repoCache := map[int64]*models.Repository{}
for _, act := range actions {
// Cache results to reduce queries.
@ -108,10 +109,8 @@ func retrieveFeeds(ctx *context.Context, ctxUser *models.User, userID, offset in
}
}
repo.Owner = repoOwner
feeds = append(feeds, act)
}
ctx.Data["Feeds"] = feeds
ctx.Data["Feeds"] = actions
}
// Dashboard render the dashborad page
@ -180,7 +179,7 @@ func Dashboard(ctx *context.Context) {
ctx.Data["MirrorCount"] = len(mirrors)
ctx.Data["Mirrors"] = mirrors
retrieveFeeds(ctx, ctxUser, ctx.User.ID, 0, false)
retrieveFeeds(ctx, ctxUser, true, false)
if ctx.Written() {
return
}