run mix format

This commit is contained in:
William Pitcock 2018-05-19 08:48:15 +00:00
parent f32e19f668
commit 725b05d04a
3 changed files with 24 additions and 16 deletions

View 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

View 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()

View 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(