projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not serve RSS/Atom feeds when instance is private
[akkoma]
/
lib
/
pleroma
/
web
/
feed
/
user_controller.ex
diff --git
a/lib/pleroma/web/feed/user_controller.ex
b/lib/pleroma/web/feed/user_controller.ex
index d56f438184fa920457ad4f8d6ceaf5f5b6b932a4..595889b9d31ebaf16c197b83248947184ca2e4e2 100644
(file)
--- a/
lib/pleroma/web/feed/user_controller.ex
+++ b/
lib/pleroma/web/feed/user_controller.ex
@@
-37,7
+37,15
@@
defmodule Pleroma.Web.Feed.UserController do
end
end
end
end
- def feed(conn, %{"nickname" => nickname} = params) do
+ def feed(conn, params) do
+ if Pleroma.Config.get!([:instance, :public]) do
+ render_feed(conn, params)
+ else
+ errors(conn, {:error, :not_found})
+ end
+ end
+
+ def render_feed(conn, %{"nickname" => nickname} = params) do
format = get_format(conn)
format =
format = get_format(conn)
format =
@@
-47,7
+55,7
@@
defmodule Pleroma.Web.Feed.UserController do
"atom"
end
"atom"
end
- with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
+ with {_, %User{
local: true
} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
activities =
%{
type: ["Create"],
activities =
%{
type: ["Create"],
@@
-71,6
+79,7
@@
defmodule Pleroma.Web.Feed.UserController do
render_error(conn, :not_found, "Not found")
end
render_error(conn, :not_found, "Not found")
end
+ def errors(conn, {:fetch_user, %User{local: false}}), do: errors(conn, {:error, :not_found})
def errors(conn, {:fetch_user, nil}), do: errors(conn, {:error, :not_found})
def errors(conn, _) do
def errors(conn, {:fetch_user, nil}), do: errors(conn, {:error, :not_found})
def errors(conn, _) do