Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
This commit is contained in:
commit
62bf6d67e3
361 changed files with 8361 additions and 2945 deletions
|
|
@ -29,11 +29,12 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
require Logger
|
||||
|
||||
@cachex Pleroma.Config.get([:cachex, :provider], Cachex)
|
||||
@ap_streamer Pleroma.Config.get([:side_effects, :ap_streamer], ActivityPub)
|
||||
@logger Pleroma.Config.get([:side_effects, :logger], Logger)
|
||||
|
||||
@behaviour Pleroma.Web.ActivityPub.SideEffects.Handling
|
||||
|
||||
defp ap_streamer, do: Pleroma.Config.get([:side_effects, :ap_streamer], ActivityPub)
|
||||
|
||||
@impl true
|
||||
def handle(object, meta \\ [])
|
||||
|
||||
|
|
@ -204,6 +205,19 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
Object.increase_replies_count(in_reply_to)
|
||||
end
|
||||
|
||||
reply_depth = (meta[:depth] || 0) + 1
|
||||
|
||||
# FIXME: Force inReplyTo to replies
|
||||
if Pleroma.Web.Federator.allowed_thread_distance?(reply_depth) and
|
||||
object.data["replies"] != nil do
|
||||
for reply_id <- object.data["replies"] do
|
||||
Pleroma.Workers.RemoteFetcherWorker.enqueue("fetch_remote", %{
|
||||
"id" => reply_id,
|
||||
"depth" => reply_depth
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
ConcurrentLimiter.limit(Pleroma.Web.RichMedia.Helpers, fn ->
|
||||
Task.start(fn -> Pleroma.Web.RichMedia.Helpers.fetch_data_for_activity(activity) end)
|
||||
end)
|
||||
|
|
@ -277,10 +291,10 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
result =
|
||||
case deleted_object do
|
||||
%Object{} ->
|
||||
with {:ok, deleted_object, activity} <- Object.delete(deleted_object),
|
||||
with {:ok, deleted_object, _activity} <- Object.delete(deleted_object),
|
||||
{_, actor} when is_binary(actor) <- {:actor, deleted_object.data["actor"]},
|
||||
%User{} = user <- User.get_cached_by_ap_id(actor) do
|
||||
User.remove_pinnned_activity(user, activity)
|
||||
User.remove_pinned_object_id(user, deleted_object.data["id"])
|
||||
|
||||
{:ok, user} = ActivityPub.decrease_note_count_if_public(user, deleted_object)
|
||||
|
||||
|
|
@ -290,8 +304,8 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
|
||||
MessageReference.delete_for_object(deleted_object)
|
||||
|
||||
@ap_streamer.stream_out(object)
|
||||
@ap_streamer.stream_out_participations(deleted_object, user)
|
||||
ap_streamer().stream_out(object)
|
||||
ap_streamer().stream_out_participations(deleted_object, user)
|
||||
:ok
|
||||
else
|
||||
{:actor, _} ->
|
||||
|
|
@ -313,6 +327,63 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
end
|
||||
end
|
||||
|
||||
# Tasks this handles:
|
||||
# - adds pin to user
|
||||
# - removes expiration job for pinned activity, if was set for expiration
|
||||
@impl true
|
||||
def handle(%{data: %{"type" => "Add"} = data} = object, meta) do
|
||||
with %User{} = user <- User.get_cached_by_ap_id(data["actor"]),
|
||||
{:ok, _user} <- User.add_pinned_object_id(user, data["object"]) do
|
||||
# if pinned activity was scheduled for deletion, we remove job
|
||||
if expiration = Pleroma.Workers.PurgeExpiredActivity.get_expiration(meta[:activity_id]) do
|
||||
Oban.cancel_job(expiration.id)
|
||||
end
|
||||
|
||||
{:ok, object, meta}
|
||||
else
|
||||
nil ->
|
||||
{:error, :user_not_found}
|
||||
|
||||
{:error, changeset} ->
|
||||
if changeset.errors[:pinned_objects] do
|
||||
{:error, :pinned_statuses_limit_reached}
|
||||
else
|
||||
changeset.errors
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Tasks this handles:
|
||||
# - removes pin from user
|
||||
# - removes corresponding Add activity
|
||||
# - if activity had expiration, recreates activity expiration job
|
||||
@impl true
|
||||
def handle(%{data: %{"type" => "Remove"} = data} = object, meta) do
|
||||
with %User{} = user <- User.get_cached_by_ap_id(data["actor"]),
|
||||
{:ok, _user} <- User.remove_pinned_object_id(user, data["object"]) do
|
||||
data["object"]
|
||||
|> Activity.add_by_params_query(user.ap_id, user.featured_address)
|
||||
|> Repo.delete_all()
|
||||
|
||||
# if pinned activity was scheduled for deletion, we reschedule it for deletion
|
||||
if meta[:expires_at] do
|
||||
# MRF.ActivityExpirationPolicy used UTC timestamps for expires_at in original implementation
|
||||
{:ok, expires_at} =
|
||||
Pleroma.EctoType.ActivityPub.ObjectValidators.DateTime.cast(meta[:expires_at])
|
||||
|
||||
Pleroma.Workers.PurgeExpiredActivity.enqueue(%{
|
||||
activity_id: meta[:activity_id],
|
||||
expires_at: expires_at
|
||||
})
|
||||
end
|
||||
|
||||
{:ok, object, meta}
|
||||
else
|
||||
nil -> {:error, :user_not_found}
|
||||
error -> error
|
||||
end
|
||||
end
|
||||
|
||||
# Nothing to do
|
||||
@impl true
|
||||
def handle(object, meta) do
|
||||
|
|
@ -374,7 +445,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
|||
end
|
||||
|
||||
def handle_object_creation(%{"type" => objtype} = object, _activity, meta)
|
||||
when objtype in ~w[Audio Video Event Article] do
|
||||
when objtype in ~w[Audio Video Event Article Note Page] do
|
||||
with {:ok, object, meta} <- Pipeline.common_pipeline(object, meta) do
|
||||
{:ok, object, meta}
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue