From 223556073c51b34f2ccca7c1036552a4807d1f42 Mon Sep 17 00:00:00 2001
From: KN4CK3R <admin@oldschoolhack.me>
Date: Fri, 7 Oct 2022 23:06:04 +0200
Subject: [PATCH] Show private data in feeds (#21369)
Show private data in feeds for admins and matching users.
---
routers/web/feed/profile.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go
index c467f7412a..0e11f210ce 100644
--- a/routers/web/feed/profile.go
+++ b/routers/web/feed/profile.go
@@ -26,10 +26,12 @@ func ShowUserFeedAtom(ctx *context.Context) {
// showUserFeed show user activity as RSS / Atom feed
func showUserFeed(ctx *context.Context, formatType string) {
+ includePrivate := ctx.IsSigned && (ctx.Doer.IsAdmin || ctx.Doer.ID == ctx.ContextUser.ID)
+
actions, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
RequestedUser: ctx.ContextUser,
Actor: ctx.Doer,
- IncludePrivate: false,
+ IncludePrivate: includePrivate,
OnlyPerformedBy: !ctx.ContextUser.IsOrganization(),
IncludeDeleted: false,
Date: ctx.FormString("date"),