tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

refactor(activitypub): simplify request to get instances list and status

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2023-12-22 16:46:01 +01:00
parent 2f4b8feeba
commit 7c51ef79b9
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
1 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lib/mobilizon/instances/instances.ex
View file

@ -22,15 +22,16 @@ defmodule Mobilizon.Instances do
order_by_options = Keyword.new([{direction, order_by}]) order_by_options = Keyword.new([{direction, order_by}])
subquery = query =
Actor Instance
|> where( |> join(:left, [i], ia in InstanceActor, on: i.domain == ia.domain)
[a], |> join(:left, [_i, ia], a in Actor, on: ia.actor_id == a.id)
a.preferred_username == "relay" and a.type == :Application and not is_nil(a.domain) |> join(:left, [_i, _ia, a], f1 in Follower, on: f1.target_actor_id == a.id)
) |> join(:left, [_i, _ia, a], f2 in Follower, on: f2.actor_id == a.id)
|> join(:left, [a], f1 in Follower, on: f1.target_actor_id == a.id) |> select([i, ia, a, f1, f2], %{
|> join(:left, [a], f2 in Follower, on: f2.actor_id == a.id) instance: i,
|> select([a, f1, f2], %{ instance_actor: ia,
actor: a,
domain: a.domain, domain: a.domain,
has_relay: fragment(@is_null_fragment, a.id), has_relay: fragment(@is_null_fragment, a.id),
following: fragment(@is_null_fragment, f2.id), following: fragment(@is_null_fragment, f2.id),
@ -38,13 +39,6 @@ defmodule Mobilizon.Instances do
follower: fragment(@is_null_fragment, f1.id), follower: fragment(@is_null_fragment, f1.id),
follower_approved: f1.approved follower_approved: f1.approved
}) })
query =
Instance
|> join(:left, [i], s in subquery(subquery), on: i.domain == s.domain)
|> join(:left, [i], ia in InstanceActor, on: i.domain == ia.domain)
|> join(:left, [_i, _s, ia], a in Actor, on: ia.actor_id == a.id)
|> select([i, s, ia, a], {i, s, ia, a})
|> order_by(^order_by_options) |> order_by(^order_by_options)
query = query =
@ -93,17 +87,17 @@ defmodule Mobilizon.Instances do
SQL.query!(Repo, "REFRESH MATERIALIZED VIEW instances") SQL.query!(Repo, "REFRESH MATERIALIZED VIEW instances")
end end
defp convert_instance_meta( defp convert_instance_meta(%{
{instance, instance: instance,
%{ instance_actor: instance_meta,
actor: instance_actor,
domain: _domain, domain: _domain,
follower: follower, follower: follower,
follower_approved: follower_approved, follower_approved: follower_approved,
following: following, following: following,
following_approved: following_approved, following_approved: following_approved,
has_relay: has_relay has_relay: has_relay
}, instance_meta, instance_actor} }) do
) do
instance instance
|> Map.put(:follower_status, follow_status(following, following_approved)) |> Map.put(:follower_status, follow_status(following, following_approved))
|> Map.put(:followed_status, follow_status(follower, follower_approved)) |> Map.put(:followed_status, follow_status(follower, follower_approved))