RSS/Atom support for Orgs (#17714)

part of #569

1 files changed, 24 insertions, 21 deletions

diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go
index 1a7f4ad24b..4c1eff04a9 100644
--- a/routers/web/feed/profile.go
+++ b/routers/web/feed/profile.go
@@ -23,31 +23,34 @@ func RetrieveFeeds(ctx *context.Context, options models.GetFeedsOptions) []*mode
 		return nil
 	}
 
-	userCache := map[int64]*user_model.User{options.RequestedUser.ID: options.RequestedUser}
-	if ctx.User != nil {
-		userCache[ctx.User.ID] = ctx.User
-	}
-	for _, act := range actions {
-		if act.ActUser != nil {
-			userCache[act.ActUserID] = act.ActUser
+	// TODO: move load repoOwner of act.Repo into models.GetFeeds->loadAttributes()
+	{
+		userCache := map[int64]*user_model.User{options.RequestedUser.ID: options.RequestedUser}
+		if ctx.User != nil {
+			userCache[ctx.User.ID] = ctx.User
 		}
-	}
-
-	for _, act := range actions {
-		repoOwner, ok := userCache[act.Repo.OwnerID]
-		if !ok {
-			repoOwner, err = user_model.GetUserByID(act.Repo.OwnerID)
-			if err != nil {
-				if user_model.IsErrUserNotExist(err) {
-					continue
+		for _, act := range actions {
+			if act.ActUser != nil {
+				userCache[act.ActUserID] = act.ActUser
+			}
+		}
+		for _, act := range actions {
+			repoOwner, ok := userCache[act.Repo.OwnerID]
+			if !ok {
+				repoOwner, err = user_model.GetUserByID(act.Repo.OwnerID)
+				if err != nil {
+					if user_model.IsErrUserNotExist(err) {
+						continue
+					}
+					ctx.ServerError("GetUserByID", err)
+					return nil
 				}
-				ctx.ServerError("GetUserByID", err)
-				return nil
+				userCache[repoOwner.ID] = repoOwner
 			}
-			userCache[repoOwner.ID] = repoOwner
+			act.Repo.Owner = repoOwner
 		}
-		act.Repo.Owner = repoOwner
 	}
+
 	return actions
 }
 
@@ -57,7 +60,7 @@ func ShowUserFeed(ctx *context.Context, ctxUser *user_model.User, formatType str
 		RequestedUser:   ctxUser,
 		Actor:           ctx.User,
 		IncludePrivate:  false,
-		OnlyPerformedBy: true,
+		OnlyPerformedBy: !ctxUser.IsOrganization(),
 		IncludeDeleted:  false,
 		Date:            ctx.FormString("date"),
 	})