projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix compile warnings
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub_controller.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index 99342aad979c4fdb8981569ec8c20dd4fb2bdd70..0317f3c8cac859298fdc85933bb24799cd5e9c64 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@
-6,7
+6,6
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.Federator
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.Federator
- alias Pleroma.Config
require Logger
require Logger
@@
-16,7
+15,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
plug(:relay_active? when action in [:relay])
def relay_active?(conn, _) do
plug(:relay_active? when action in [:relay])
def relay_active?(conn, _) do
- if
Config.get([:instance, :allow_relay]
) do
+ if
Keyword.get(Application.get_env(:pleroma, :instance), :allow_relay
) do
conn
else
conn
conn
else
conn
@@
-142,7
+141,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubController do
json(conn, "error")
end
json(conn, "error")
end
- def relay(conn, params) do
+ def relay(conn,
_
params) do
with %User{} = user <- Relay.get_actor(),
{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
conn
with %User{} = user <- Relay.get_actor(),
{:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do
conn