Formatting and add tests for blocks/unblocks
This commit is contained in:
parent
da9744eb84
commit
1e43de0f86
6 changed files with 127 additions and 11 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -266,7 +266,9 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
|
|||
handle_incoming(data)
|
||||
end
|
||||
|
||||
def handle_incoming(%{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data) do
|
||||
def handle_incoming(
|
||||
%{"type" => "Block", "object" => blocked, "actor" => blocker, "id" => id} = data
|
||||
) do
|
||||
with %User{local: true} = blocked = User.get_cached_by_ap_id(blocked),
|
||||
%User{} = blocker = User.get_or_fetch_by_ap_id(blocker),
|
||||
{:ok, activity} <- ActivityPub.block(blocker, blocked, false) do
|
||||
|
|
@ -277,6 +279,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
|
|||
e -> :error
|
||||
end
|
||||
end
|
||||
|
||||
# TODO
|
||||
# Accept
|
||||
# Undo for non-Announce
|
||||
|
|
|
|||
|
|
@ -357,6 +357,7 @@ defmodule Pleroma.Web.ActivityPub.Utils do
|
|||
"object" => block_activity.data
|
||||
}
|
||||
end
|
||||
|
||||
#### Create-related helpers
|
||||
|
||||
def make_create_data(params, additional) do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue