diff options
| author | lain <lain@soykaf.club> | 2020-01-28 16:14:23 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 16:14:23 +0000 |
| commit | 10762ea2ac98cd27898af1d66bd5775bfeb15c5c (patch) | |
| tree | d37b214ff074084c747cf7a7fa962cbf14e86f3c /lib/pleroma/web/router.ex | |
| parent | 271935953a384eb97606fb48d1b5c7befaf588e4 (diff) | |
| parent | d385789a450d455019c8aa6b6ee6abd28d5648e8 (diff) | |
| download | pleroma-10762ea2ac98cd27898af1d66bd5775bfeb15c5c.tar.gz | |
Merge branch 'feature/tag_feed' into 'develop'
[#1452] Atom feeds for hashtags
See merge request pleroma/pleroma!2040
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index ef6e5a565..b5c1d85c7 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -527,8 +527,10 @@ defmodule Pleroma.Web.Router do get("/notice/:id", OStatus.OStatusController, :notice) get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player) - get("/users/:nickname/feed", Feed.FeedController, :feed) - get("/users/:nickname", Feed.FeedController, :feed_redirect) + get("/users/:nickname/feed", Feed.UserController, :feed, as: :user_feed) + get("/users/:nickname", Feed.UserController, :feed_redirect, as: :user_feed) + + get("/tags/:tag", Feed.TagController, :feed, as: :tag_feed) end scope "/", Pleroma.Web do |