diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
| commit | ba5e8a644463a19b863e862def80adb6a5a1060b (patch) | |
| tree | b00fdfbfe13979454dcad185e8c0c7de237d8a0f /lib/pleroma/web/router.ex | |
| parent | e442ea5722404ca551135b6f4767c016952bbda3 (diff) | |
| parent | f1d5c0f07963c23d264311985c21837b9b03fd5a (diff) | |
| download | pleroma-ba5e8a644463a19b863e862def80adb6a5a1060b.tar.gz | |
Merge branch 'develop' into issue/1276
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 |