diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 20:34:13 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 20:39:20 +0300 |
| commit | 21a2a054070c26d7be1a0e453e5f40b20fbd59f2 (patch) | |
| tree | af2812719f0485e8d844b1251f0de1be28673395 /lib/pleroma/web/router.ex | |
| parent | bfc70fdf29c2e1067179165ef686e6abe20896b0 (diff) | |
| parent | e8f22451da18aeba9bcf9f9f6acf93690ccb3cba (diff) | |
| download | pleroma-21a2a054070c26d7be1a0e453e5f40b20fbd59f2.tar.gz | |
Merge branch 'develop' into issue/1383
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 |