projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Expand and authorize streams in Streamer directly
[akkoma]
/
lib
/
pleroma
/
plugs
/
ensure_public_or_authenticated_plug.ex
diff --git
a/lib/pleroma/plugs/ensure_public_or_authenticated_plug.ex
b/lib/pleroma/plugs/ensure_public_or_authenticated_plug.ex
index 317fd5445008a89eda6778ccd08cdf936d1320fa..7265bb87aaa0a158f94c9da3dc16260fd1fa4d28 100644
(file)
--- a/
lib/pleroma/plugs/ensure_public_or_authenticated_plug.ex
+++ b/
lib/pleroma/plugs/ensure_public_or_authenticated_plug.ex
@@
-1,17
+1,22
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug do
+ import Pleroma.Web.TranslationHelpers
import Plug.Conn
import Plug.Conn
+
alias Pleroma.Config
alias Pleroma.User
alias Pleroma.Config
alias Pleroma.User
+ use Pleroma.Web, :plug
+
def init(options) do
options
end
def init(options) do
options
end
- def call(conn, _) do
+ @impl true
+ def perform(conn, _) do
public? = Config.get!([:instance, :public])
case {public?, conn} do
public? = Config.get!([:instance, :public])
case {public?, conn} do
@@
-23,8
+28,7
@@
defmodule Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug do
{false, _} ->
conn
{false, _} ->
conn
- |> put_resp_content_type("application/json")
- |> send_resp(403, Jason.encode!(%{error: "This resource requires authentication."}))
+ |> render_error(:forbidden, "This resource requires authentication.")
|> halt
end
end
|> halt
end
end