1
1
mirror of https://github.com/go-gitea/gitea synced 2024-06-16 08:15:47 +00:00

Show private data in feeds (#21369)

Show private data in feeds for admins and matching users.
This commit is contained in:
KN4CK3R 2022-10-07 23:06:04 +02:00 committed by GitHub
parent 7d2545d183
commit 223556073c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -26,10 +26,12 @@ func ShowUserFeedAtom(ctx *context.Context) {
// showUserFeed show user activity as RSS / Atom feed // showUserFeed show user activity as RSS / Atom feed
func showUserFeed(ctx *context.Context, formatType string) { 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{ actions, err := activities_model.GetFeeds(ctx, activities_model.GetFeedsOptions{
RequestedUser: ctx.ContextUser, RequestedUser: ctx.ContextUser,
Actor: ctx.Doer, Actor: ctx.Doer,
IncludePrivate: false, IncludePrivate: includePrivate,
OnlyPerformedBy: !ctx.ContextUser.IsOrganization(), OnlyPerformedBy: !ctx.ContextUser.IsOrganization(),
IncludeDeleted: false, IncludeDeleted: false,
Date: ctx.FormString("date"), Date: ctx.FormString("date"),