bss
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pleroma/user.ex
View File

@ -404,15 +404,19 @@ def search(query, resolve) do
from( from(
u in User, u in User,
select_merge: %{ select_merge: %{
search_distance: fragment( search_distance:
fragment(
"? <-> (? || ?)", "? <-> (? || ?)",
^query, ^query,
u.nickname, u.nickname,
u.name u.name
)} )
}
) )
q = from(s in subquery(inner), q =
from(
s in subquery(inner),
order_by: s.search_distance, order_by: s.search_distance,
limit: 20 limit: 20
) )

6
lib/pleroma/web/web_finger/web_finger.ex
View File

@ -86,7 +86,11 @@ def represent_user(user, "JSON") do
"href" => "data:application/magic-public-key,#{magic_key}" "href" => "data:application/magic-public-key,#{magic_key}"
}, },
%{"rel" => "self", "type" => "application/activity+json", "href" => user.ap_id}, %{"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", "rel" => "http://ostatus.org/schema/1.0/subscribe",
"template" => OStatus.remote_follow_path() "template" => OStatus.remote_follow_path()