From d5eac1df6c76d87413f92a068ccb57f0295b0e29 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Thu, 27 Dec 2018 11:31:06 +0100
Subject: [PATCH] Comment Webfinger controller properly
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
.../controllers/web_finger_controller.ex | 13 ++++++++++---
.../service/activity_pub/transmogrifier_test.exs | 1 -
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/lib/mobilizon_web/controllers/web_finger_controller.ex b/lib/mobilizon_web/controllers/web_finger_controller.ex
index 5a787d1ae..37bee7fe4 100644
--- a/lib/mobilizon_web/controllers/web_finger_controller.ex
+++ b/lib/mobilizon_web/controllers/web_finger_controller.ex
@@ -4,10 +4,16 @@
# Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/lib/pleroma/web/web_finger/web_finger_controller.ex
defmodule MobilizonWeb.WebFingerController do
+ @moduledoc """
+ Handles Webfinger requests
+ """
use MobilizonWeb, :controller
alias Mobilizon.Service.WebFinger
+ @doc """
+ Provides /.well-known/host-meta
+ """
def host_meta(conn, _params) do
xml = WebFinger.host_meta()
@@ -16,6 +22,9 @@ defmodule MobilizonWeb.WebFingerController do
|> send_resp(200, xml)
end
+ @doc """
+ Provides /.well-known/webfinger
+ """
def webfinger(conn, %{"resource" => resource}) do
with {:ok, response} <- WebFinger.webfinger(resource, "JSON") do
json(conn, response)
@@ -24,7 +33,5 @@ defmodule MobilizonWeb.WebFingerController do
end
end
- def webfinger(conn, _) do
- send_resp(conn, 400, "No query provided")
- end
+ def webfinger(conn, _), do: send_resp(conn, 400, "No query provided")
end
diff --git a/test/mobilizon/service/activity_pub/transmogrifier_test.exs b/test/mobilizon/service/activity_pub/transmogrifier_test.exs
index e6da6555e..1ad689db8 100644
--- a/test/mobilizon/service/activity_pub/transmogrifier_test.exs
+++ b/test/mobilizon/service/activity_pub/transmogrifier_test.exs
@@ -4,7 +4,6 @@
# Upstream: https://git.pleroma.social/pleroma/pleroma/blob/develop/test/web/activity_pub/transmogrifier_test.exs
defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
-
use Mobilizon.DataCase
import Mobilizon.Factory
--
GitLab