aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/nodeinfo
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-10 20:54:21 +0000
committerkaniini <nenolod@gmail.com>2019-02-10 20:54:21 +0000
commit6c8d15da110e86f799052c82df8b7b2404f8f722 (patch)
tree3b6642ad091be392cf3fb04f73650797924a464b /lib/pleroma/web/nodeinfo
parent49b5f8d7c903231be64a1ee75445f37700b024b5 (diff)
parent6ca633ddd30e8330e47f6456fe16fa72506e2e13 (diff)
downloadpleroma-6c8d15da110e86f799052c82df8b7b2404f8f722.tar.gz
Merge branch 'fix/credo-issues' into 'develop'
Fix credo issues See merge request pleroma/pleroma!786
Diffstat (limited to 'lib/pleroma/web/nodeinfo')
-rw-r--r--lib/pleroma/web/nodeinfo/nodeinfo_controller.ex11
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
index 8c7df5b90..f4867d05b 100644
--- a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
+++ b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -5,10 +5,11 @@
defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
use Pleroma.Web, :controller
+ alias Pleroma.Config
+ alias Pleroma.Repo
alias Pleroma.Stats
+ alias Pleroma.User
alias Pleroma.Web
- alias Pleroma.{User, Repo}
- alias Pleroma.Config
alias Pleroma.Web.ActivityPub.MRF
plug(Pleroma.Web.FederatingPlug)
@@ -32,7 +33,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
# returns a nodeinfo 2.0 map, since 2.1 just adds a repository field
# under software.
- def raw_nodeinfo() do
+ def raw_nodeinfo do
instance = Application.get_env(:pleroma, :instance)
media_proxy = Application.get_env(:pleroma, :media_proxy)
suggestions = Application.get_env(:pleroma, :suggestions)
@@ -93,10 +94,8 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
Config.get([:mrf_user_allowlist], [])
|> Enum.into(%{}, fn {k, v} -> {k, length(v)} end)
- mrf_transparency = Keyword.get(instance, :mrf_transparency)
-
federation_response =
- if mrf_transparency do
+ if Keyword.get(instance, :mrf_transparency) do
%{
mrf_policies: mrf_policies,
mrf_simple: mrf_simple,