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
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
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
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_blocked(query, %{"blocking_user" => %User{info: info}}) do
blocks = info["blocks"] || []
from activity in query,
- where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks)
+ 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,
- order_by: [desc: :id]
+ order_by: [fragment("? desc nulls last", activity.id)]
base_query
|> restrict_recipients(recipients)