projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...
[akkoma]
/
lib
/
pleroma
/
plugs
/
federating_plug.ex
diff --git
a/lib/pleroma/plugs/federating_plug.ex
b/lib/pleroma/plugs/federating_plug.ex
index 4c5aca3e966d632fe08a6ce14fa16d21d9fda69a..7d947339fe1f0e7d00eb7e148ef5a33a7bdd8a9c 100644
(file)
--- a/
lib/pleroma/plugs/federating_plug.ex
+++ b/
lib/pleroma/plugs/federating_plug.ex
@@
-1,5
+1,5
@@
# 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.Web.FederatingPlug do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.FederatingPlug do
@@
-13,13
+13,17
@@
defmodule Pleroma.Web.FederatingPlug do
if federating?() do
conn
else
if federating?() do
conn
else
- conn
- |> put_status(404)
- |> Phoenix.Controller.put_view(Pleroma.Web.ErrorView)
- |> Phoenix.Controller.render("404.json")
- |> halt()
+ fail(conn)
end
end
def federating?, do: Pleroma.Config.get([:instance, :federating])
end
end
def federating?, do: Pleroma.Config.get([:instance, :federating])
+
+ defp fail(conn) do
+ conn
+ |> put_status(404)
+ |> Phoenix.Controller.put_view(Pleroma.Web.ErrorView)
+ |> Phoenix.Controller.render("404.json")
+ |> halt()
+ end
end
end