projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MastoAPI: Basic streaming.
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
activity_pub.ex
diff --git
a/lib/pleroma/web/activity_pub/activity_pub.ex
b/lib/pleroma/web/activity_pub/activity_pub.ex
index d4eb503234cf86105e34e25f517bb5db1db21610..35536a1e41cb5530886a10fbb8a6ced31c873c97 100644
(file)
--- a/
lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/
lib/pleroma/web/activity_pub/activity_pub.ex
@@
-9,7
+9,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
with nil <- Activity.get_by_ap_id(map["id"]),
map <- lazy_put_activity_defaults(map),
:ok <- insert_full_object(map) do
with nil <- Activity.get_by_ap_id(map["id"]),
map <- lazy_put_activity_defaults(map),
:ok <- insert_full_object(map) do
- {:ok, activity} = Repo.insert(%Activity{data: map, local: local})
+ {:ok, activity} = Repo.insert(%Activity{data: map, local: local
, actor: map["actor"]
})
Notification.create_notifications(activity)
{:ok, activity}
else
Notification.create_notifications(activity)
{:ok, activity}
else
@@
-22,6
+22,9
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
with create_data <- make_create_data(%{to: to, actor: actor, published: published, context: context, object: object}, additional),
{:ok, activity} <- insert(create_data, local),
:ok <- maybe_federate(activity) do
with create_data <- make_create_data(%{to: to, actor: actor, published: published, context: context, object: object}, additional),
{:ok, activity} <- insert(create_data, local),
:ok <- maybe_federate(activity) do
+ if activity.data["type"] == "Create" and Enum.member?(activity.data["to"], "https://www.w3.org/ns/activitystreams#Public") do
+ Pleroma.Web.Streamer.stream("public", activity)
+ end
{:ok, activity}
end
end
{:ok, activity}
end
end
@@
-93,10
+96,11
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
end
end
end
- def fetch_activities_for_context(context) do
+ def fetch_activities_for_context(context
, opts \\ %{}
) do
query = from activity in Activity,
where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
order_by: [desc: :id]
query = from activity in Activity,
where: fragment("?->>'type' = ? and ?->>'context' = ?", activity.data, "Create", activity.data, ^context),
order_by: [desc: :id]
+ query = restrict_blocked(query, opts)
Repo.all(query)
end
Repo.all(query)
end
@@
-136,7
+140,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp restrict_actor(query, %{"actor_id" => actor_id}) do
from activity in query,
defp restrict_actor(query, %{"actor_id" => actor_id}) do
from activity in query,
- where:
fragment("?->>'actor' = ?", activity.data, ^actor_id)
+ where:
activity.actor == ^actor_id
end
defp restrict_actor(query, _), do: query
end
defp restrict_actor(query, _), do: query
@@
-156,6
+160,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
defp restrict_favorited_by(query, _), do: query
# Only search through last 100_000 activities by default
defp restrict_favorited_by(query, _), do: query
# Only search through last 100_000 activities by default
+ defp restrict_recent(query, %{"whole_db" => true}), do: query
defp restrict_recent(query, _) do
since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
defp restrict_recent(query, _) do
since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
@@
-163,10
+168,17
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
where: activity.id > ^since
end
where: activity.id > ^since
end
+ defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do
+ blocks = info["blocks"] || []
+ from activity in query,
+ where: fragment("not (? = ANY(?))", activity.actor, ^blocks)
+ end
+ defp restrict_blocked(query, _), do: query
+
def fetch_activities(recipients, opts \\ %{}) do
base_query = from activity in Activity,
limit: 20,
def fetch_activities(recipients, opts \\ %{}) do
base_query = from activity in Activity,
limit: 20,
- order_by: [
desc: :id
]
+ order_by: [
fragment("? desc nulls last", activity.id)
]
base_query
|> restrict_recipients(recipients)
base_query
|> restrict_recipients(recipients)
@@
-178,6
+190,7
@@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> restrict_type(opts)
|> restrict_favorited_by(opts)
|> restrict_recent(opts)
|> restrict_type(opts)
|> restrict_favorited_by(opts)
|> restrict_recent(opts)
+ |> restrict_blocked(opts)
|> Repo.all
|> Enum.reverse
end
|> Repo.all
|> Enum.reverse
end