From 0fa209d07b6155943bfd235257a4ed6a484a9a85 Mon Sep 17 00:00:00 2001
From: Peter Smit <peter@smitmail.eu>
Date: Wed, 18 Feb 2015 08:59:22 +0200
Subject: [PATCH] Update/simplify fix that owners also see actions on their
 repositories

---
 routers/user/home.go | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/routers/user/home.go b/routers/user/home.go
index 574c6387dc..0a1d9dd217 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -103,14 +103,14 @@ func Dashboard(ctx *middleware.Context) {
 	feeds := make([]*models.Action, 0, len(actions))
 	for _, act := range actions {
 		if act.IsPrivate {
-			repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
 			// This prevents having to retrieve the repository for each action
-			if act.RepoUserName == ctx.User.LowerName {
-				repo.OwnerId = ctx.User.Id
-			}
-			if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
-				continue
+			repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
+			if act.RepoUserName != ctx.User.LowerName {
+				if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
+					continue
+				}
 			}
+
 		}
 		// FIXME: cache results?
 		u, err := models.GetUserByName(act.ActUserName)
@@ -215,14 +215,14 @@ func Profile(ctx *middleware.Context) {
 				if !ctx.IsSigned {
 					continue
 				}
-				repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
 				// This prevents having to retrieve the repository for each action
-				if act.RepoUserName == ctx.User.LowerName {
-					repo.OwnerId = ctx.User.Id
-				}
-				if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
-					continue
+				repo := &models.Repository{Id: act.RepoId, IsPrivate: true}
+				if act.RepoUserName != ctx.User.LowerName {
+					if has, _ := models.HasAccess(ctx.User, repo, models.ACCESS_MODE_READ); !has {
+						continue
+					}
 				}
+
 			}
 			// FIXME: cache results?
 			u, err := models.GetUserByName(act.ActUserName)