projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
feed
/
tag_controller.ex
diff --git
a/lib/pleroma/web/feed/tag_controller.ex
b/lib/pleroma/web/feed/tag_controller.ex
index e090dd625f8c2972a5bd0d1f4ea1516ca1c61aa9..93a8294b7b49ba88968e693e8121597eb1db6742 100644
(file)
--- a/
lib/pleroma/web/feed/tag_controller.ex
+++ b/
lib/pleroma/web/feed/tag_controller.ex
@@
-10,7
+10,7
@@
defmodule Pleroma.Web.Feed.TagController do
alias Pleroma.Web.Feed.FeedView
def feed(conn, params) do
alias Pleroma.Web.Feed.FeedView
def feed(conn, params) do
-
if Pleroma.Config.get!([:instance, :public]
) do
+
unless Pleroma.Config.restrict_unauthenticated_access?(:activities, :local
) do
render_feed(conn, params)
else
render_error(conn, :not_found, "Not found")
render_feed(conn, params)
else
render_error(conn, :not_found, "Not found")