summaryrefslogtreecommitdiffstats
path: root/routers/web/feed
diff options
context:
space:
mode:
authorKN4CK3R <admin@oldschoolhack.me>2022-03-26 10:04:22 +0100
committerGitHub <noreply@github.com>2022-03-26 17:04:22 +0800
commit59b867dc2dfc1ecb0ee703ff44e1be9c5c53cf86 (patch)
tree7114b991554e6e7dcb4123c0aa365c674d8411a0 /routers/web/feed
parentf36701c702dc67011999cfaaf37e002c13e7a87e (diff)
downloadgitea-59b867dc2dfc1ecb0ee703ff44e1be9c5c53cf86.tar.gz
gitea-59b867dc2dfc1ecb0ee703ff44e1be9c5c53cf86.zip
Add `ContextUser` to http request context (#18798)
This PR adds a middleware which sets a ContextUser (like GetUserByParams before) in a single place which can be used by other methods. For routes which represent a repo or org the respective middlewares set the field too. Also fix a bug in modules/context/org.go during refactoring.
Diffstat (limited to 'routers/web/feed')
-rw-r--r--routers/web/feed/profile.go25
1 files changed, 17 insertions, 8 deletions
diff --git a/routers/web/feed/profile.go b/routers/web/feed/profile.go
index 32898c6ee7..61a39755f5 100644
--- a/routers/web/feed/profile.go
+++ b/routers/web/feed/profile.go
@@ -9,19 +9,28 @@ import (
"time"
"code.gitea.io/gitea/models"
- user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/context"
"github.com/gorilla/feeds"
)
-// ShowUserFeed show user activity as RSS / Atom feed
-func ShowUserFeed(ctx *context.Context, ctxUser *user_model.User, formatType string) {
+// ShowUserFeedRSS show user activity as RSS feed
+func ShowUserFeedRSS(ctx *context.Context) {
+ showUserFeed(ctx, "rss")
+}
+
+// ShowUserFeedAtom show user activity as Atom feed
+func ShowUserFeedAtom(ctx *context.Context) {
+ showUserFeed(ctx, "atom")
+}
+
+// showUserFeed show user activity as RSS / Atom feed
+func showUserFeed(ctx *context.Context, formatType string) {
actions, err := models.GetFeeds(ctx, models.GetFeedsOptions{
- RequestedUser: ctxUser,
+ RequestedUser: ctx.ContextUser,
Actor: ctx.Doer,
IncludePrivate: false,
- OnlyPerformedBy: !ctxUser.IsOrganization(),
+ OnlyPerformedBy: !ctx.ContextUser.IsOrganization(),
IncludeDeleted: false,
Date: ctx.FormString("date"),
})
@@ -31,9 +40,9 @@ func ShowUserFeed(ctx *context.Context, ctxUser *user_model.User, formatType str
}
feed := &feeds.Feed{
- Title: ctx.Tr("home.feed_of", ctxUser.DisplayName()),
- Link: &feeds.Link{Href: ctxUser.HTMLURL()},
- Description: ctxUser.Description,
+ Title: ctx.Tr("home.feed_of", ctx.ContextUser.DisplayName()),
+ Link: &feeds.Link{Href: ctx.ContextUser.HTMLURL()},
+ Description: ctx.ContextUser.Description,
Created: time.Now(),
}