run mix format
authorWilliam Pitcock <nenolod@dereferenced.org>
Sat, 19 May 2018 08:48:15 +0000 (08:48 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Sat, 19 May 2018 08:48:15 +0000 (08:48 +0000)
lib/pleroma/user.ex
lib/pleroma/web/web_finger/web_finger.ex
test/support/httpoison_mock.ex

index 399a66787dff4bf01128bd6a9492c5242aafb656..6a8129ac84b2572432d80e2cd77d76b27cbdcd6b 100644 (file)
@@ -404,18 +404,22 @@ defmodule Pleroma.User do
       from(
         u in User,
         select_merge: %{
-          search_distance: fragment(
-            "? <-> (? || ?)",
-            ^query,
-            u.nickname,
-            u.name
-          )}
+          search_distance:
+            fragment(
+              "? <-> (? || ?)",
+              ^query,
+              u.nickname,
+              u.name
+            )
+        }
       )
 
-    q = from(s in subquery(inner),
-      order_by: s.search_distance,
-      limit: 20
-    )
+    q =
+      from(
+        s in subquery(inner),
+        order_by: s.search_distance,
+        limit: 20
+      )
 
     Repo.all(q)
   end
index 3744dd62ff4b9dfd5c7cc05379bb2044ff79c060..6e5fc140185dcbfa122c5c701e6232b887e36534 100644 (file)
@@ -86,7 +86,11 @@ defmodule Pleroma.Web.WebFinger do
           "href" => "data:application/magic-public-key,#{magic_key}"
         },
         %{"rel" => "self", "type" => "application/activity+json", "href" => user.ap_id},
-        %{"rel" => "self", "type" => "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"", "href" => user.ap_id},
+        %{
+          "rel" => "self",
+          "type" => "application/ld+json; profile=\"https://www.w3.org/ns/activitystreams\"",
+          "href" => user.ap_id
+        },
         %{
           "rel" => "http://ostatus.org/schema/1.0/subscribe",
           "template" => OStatus.remote_follow_path()
index e733afa59b3dacd6c0e8c9d303f515750d5bb7d4..a1a5421033bf0a43cd27280e9f8cb0afbb83d77e 100644 (file)
@@ -8,11 +8,11 @@ defmodule HTTPoisonMock do
         [Accept: "application/xrd+xml,application/jrd+json"],
         follow_redirect: true
       ) do
-     {:ok,
-      %Response{
-        status_code: 200,
-        body: File.read!("test/fixtures/httpoison_mock/kaniini@gerzilla.de.json")
-      }}
+    {:ok,
+     %Response{
+       status_code: 200,
+       body: File.read!("test/fixtures/httpoison_mock/kaniini@gerzilla.de.json")
+     }}
   end
 
   def get(