mirror of
https://akkoma.dev/AkkomaGang/akkoma.git
synced 2024-12-21 08:48:58 +00:00
Merge branch 'fix/activity-expirations-again' into 'develop'
Fix activity expirations again See merge request pleroma/pleroma!2866
This commit is contained in:
commit
14a06e63f6
docs/configuration
lib
priv/repo/migrations
test
|
@ -114,6 +114,7 @@ To add configuration to your config file, you can copy it from the base config.
|
||||||
* `Pleroma.Web.ActivityPub.MRF.MentionPolicy`: Drops posts mentioning configurable users. (See [`:mrf_mention`](#mrf_mention)).
|
* `Pleroma.Web.ActivityPub.MRF.MentionPolicy`: Drops posts mentioning configurable users. (See [`:mrf_mention`](#mrf_mention)).
|
||||||
* `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
|
* `Pleroma.Web.ActivityPub.MRF.VocabularyPolicy`: Restricts activities to a configured set of vocabulary. (See [`:mrf_vocabulary`](#mrf_vocabulary)).
|
||||||
* `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
|
* `Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy`: Rejects or delists posts based on their age when received. (See [`:mrf_object_age`](#mrf_object_age)).
|
||||||
|
* `Pleroma.Web.ActivityPub.MRF.ActivityExpirationPolicy`: Sets a default expiration on all posts made by users of the local instance. Requires `Pleroma.ActivityExpiration` to be enabled for processing the scheduled delections.
|
||||||
* `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
|
* `transparency`: Make the content of your Message Rewrite Facility settings public (via nodeinfo).
|
||||||
* `transparency_exclusions`: Exclude specific instance names from MRF transparency. The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
|
* `transparency_exclusions`: Exclude specific instance names from MRF transparency. The use of the exclusions feature will be disclosed in nodeinfo as a boolean value.
|
||||||
|
|
||||||
|
@ -220,6 +221,8 @@ config :pleroma, :mrf_user_allowlist, %{
|
||||||
|
|
||||||
## Pleroma.ActivityExpiration
|
## Pleroma.ActivityExpiration
|
||||||
|
|
||||||
|
Enables the worker which processes posts scheduled for deletion. Pinned posts are exempt from expiration.
|
||||||
|
|
||||||
* `enabled`: whether expired activities will be sent to the job queue to be deleted
|
* `enabled`: whether expired activities will be sent to the job queue to be deleted
|
||||||
|
|
||||||
## Frontends
|
## Frontends
|
||||||
|
|
|
@ -134,13 +134,23 @@ defmodule Mix.Tasks.Pleroma.Database do
|
||||||
|
|
||||||
Pleroma.Activity
|
Pleroma.Activity
|
||||||
|> join(:left, [a], u in assoc(a, :expiration))
|
|> join(:left, [a], u in assoc(a, :expiration))
|
||||||
|
|> join(:inner, [a, _u], o in Object,
|
||||||
|
on:
|
||||||
|
fragment(
|
||||||
|
"(?->>'id') = COALESCE((?)->'object'->> 'id', (?)->>'object')",
|
||||||
|
o.data,
|
||||||
|
a.data,
|
||||||
|
a.data
|
||||||
|
)
|
||||||
|
)
|
||||||
|> where(local: true)
|
|> where(local: true)
|
||||||
|> where([a, u], is_nil(u))
|
|> where([a, u], is_nil(u))
|
||||||
|
|> where([a], fragment("(? ->> 'type'::text) = 'Create'", a.data))
|
||||||
|
|> where([_a, _u, o], fragment("?->>'type' = 'Note'", o.data))
|
||||||
|> Pleroma.RepoStreamer.chunk_stream(100)
|
|> Pleroma.RepoStreamer.chunk_stream(100)
|
||||||
|> Stream.each(fn activities ->
|
|> Stream.each(fn activities ->
|
||||||
Enum.each(activities, fn activity ->
|
Enum.each(activities, fn activity ->
|
||||||
expires_at = Timex.shift(activity.inserted_at, days: days)
|
expires_at = Timex.shift(activity.inserted_at, days: days)
|
||||||
|
|
||||||
Pleroma.ActivityExpiration.create(activity, expires_at, false)
|
Pleroma.ActivityExpiration.create(activity, expires_at, false)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -340,4 +340,10 @@ defmodule Pleroma.Activity do
|
||||||
_ -> nil
|
_ -> nil
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec pinned_by_actor?(Activity.t()) :: boolean()
|
||||||
|
def pinned_by_actor?(%Activity{} = activity) do
|
||||||
|
actor = user_actor(activity)
|
||||||
|
activity.id in actor.pinned_activities
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -46,7 +46,12 @@ defmodule Pleroma.ActivityExpiration do
|
||||||
|
|
||||||
ActivityExpiration
|
ActivityExpiration
|
||||||
|> where([exp], exp.scheduled_at < ^naive_datetime)
|
|> where([exp], exp.scheduled_at < ^naive_datetime)
|
||||||
|
|> limit(50)
|
||||||
|
|> preload(:activity)
|
||||||
|> Repo.all()
|
|> Repo.all()
|
||||||
|
|> Enum.reject(fn %{activity: activity} ->
|
||||||
|
Activity.pinned_by_actor?(activity)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_scheduled_at(changeset, false), do: changeset
|
def validate_scheduled_at(changeset, false), do: changeset
|
||||||
|
|
|
@ -23,6 +23,8 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
||||||
alias Pleroma.Web.Streamer
|
alias Pleroma.Web.Streamer
|
||||||
alias Pleroma.Workers.BackgroundWorker
|
alias Pleroma.Workers.BackgroundWorker
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
|
||||||
def handle(object, meta \\ [])
|
def handle(object, meta \\ [])
|
||||||
|
|
||||||
# Task this handles
|
# Task this handles
|
||||||
|
@ -251,13 +253,15 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
||||||
# - Stream out the activity
|
# - Stream out the activity
|
||||||
def handle(%{data: %{"type" => "Delete", "object" => deleted_object}} = object, meta) do
|
def handle(%{data: %{"type" => "Delete", "object" => deleted_object}} = object, meta) do
|
||||||
deleted_object =
|
deleted_object =
|
||||||
Object.normalize(deleted_object, false) || User.get_cached_by_ap_id(deleted_object)
|
Object.normalize(deleted_object, false) ||
|
||||||
|
User.get_cached_by_ap_id(deleted_object)
|
||||||
|
|
||||||
result =
|
result =
|
||||||
case deleted_object do
|
case deleted_object do
|
||||||
%Object{} ->
|
%Object{} ->
|
||||||
with {:ok, deleted_object, activity} <- Object.delete(deleted_object),
|
with {:ok, deleted_object, activity} <- Object.delete(deleted_object),
|
||||||
%User{} = user <- User.get_cached_by_ap_id(deleted_object.data["actor"]) do
|
{_, 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_pinnned_activity(user, activity)
|
||||||
|
|
||||||
{:ok, user} = ActivityPub.decrease_note_count_if_public(user, deleted_object)
|
{:ok, user} = ActivityPub.decrease_note_count_if_public(user, deleted_object)
|
||||||
|
@ -271,6 +275,10 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
|
||||||
ActivityPub.stream_out(object)
|
ActivityPub.stream_out(object)
|
||||||
ActivityPub.stream_out_participations(deleted_object, user)
|
ActivityPub.stream_out_participations(deleted_object, user)
|
||||||
:ok
|
:ok
|
||||||
|
else
|
||||||
|
{:actor, _} ->
|
||||||
|
Logger.error("The object doesn't have an actor: #{inspect(deleted_object)}")
|
||||||
|
:no_object_actor
|
||||||
end
|
end
|
||||||
|
|
||||||
%User{} ->
|
%User{} ->
|
||||||
|
|
19
priv/repo/migrations/20200808173046_only_expire_creates.exs
Normal file
19
priv/repo/migrations/20200808173046_only_expire_creates.exs
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
defmodule Pleroma.Repo.Migrations.OnlyExpireCreates do
|
||||||
|
use Ecto.Migration
|
||||||
|
|
||||||
|
def up do
|
||||||
|
statement = """
|
||||||
|
DELETE FROM
|
||||||
|
activity_expirations a_exp USING activities a, objects o
|
||||||
|
WHERE
|
||||||
|
a_exp.activity_id = a.id AND (o.data->>'id') = COALESCE(a.data->'object'->>'id', a.data->>'object')
|
||||||
|
AND (a.data->>'type' != 'Create' OR o.data->>'type' != 'Note');
|
||||||
|
"""
|
||||||
|
|
||||||
|
execute(statement)
|
||||||
|
end
|
||||||
|
|
||||||
|
def down do
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
end
|
|
@ -11,7 +11,10 @@ defmodule Pleroma.ActivityExpirationTest do
|
||||||
|
|
||||||
test "finds activities due to be deleted only" do
|
test "finds activities due to be deleted only" do
|
||||||
activity = insert(:note_activity)
|
activity = insert(:note_activity)
|
||||||
expiration_due = insert(:expiration_in_the_past, %{activity_id: activity.id})
|
|
||||||
|
expiration_due =
|
||||||
|
insert(:expiration_in_the_past, %{activity_id: activity.id}) |> Repo.preload(:activity)
|
||||||
|
|
||||||
activity2 = insert(:note_activity)
|
activity2 = insert(:note_activity)
|
||||||
insert(:expiration_in_the_future, %{activity_id: activity2.id})
|
insert(:expiration_in_the_future, %{activity_id: activity2.id})
|
||||||
|
|
||||||
|
|
|
@ -19,8 +19,9 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
|
||||||
alias Pleroma.Web.ActivityPub.SideEffects
|
alias Pleroma.Web.ActivityPub.SideEffects
|
||||||
alias Pleroma.Web.CommonAPI
|
alias Pleroma.Web.CommonAPI
|
||||||
|
|
||||||
import Pleroma.Factory
|
import ExUnit.CaptureLog
|
||||||
import Mock
|
import Mock
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
describe "handle_after_transaction" do
|
describe "handle_after_transaction" do
|
||||||
test "it streams out notifications and streams" do
|
test "it streams out notifications and streams" do
|
||||||
|
@ -221,6 +222,22 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
|
||||||
|
|
||||||
assert User.get_cached_by_ap_id(user.ap_id).deactivated
|
assert User.get_cached_by_ap_id(user.ap_id).deactivated
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it logs issues with objects deletion", %{
|
||||||
|
delete: delete,
|
||||||
|
object: object
|
||||||
|
} do
|
||||||
|
{:ok, object} =
|
||||||
|
object
|
||||||
|
|> Object.change(%{data: Map.delete(object.data, "actor")})
|
||||||
|
|> Repo.update()
|
||||||
|
|
||||||
|
Object.invalid_object_cache(object)
|
||||||
|
|
||||||
|
assert capture_log(fn ->
|
||||||
|
{:error, :no_object_actor} = SideEffects.handle(delete)
|
||||||
|
end) =~ "object doesn't have an actor"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "EmojiReact objects" do
|
describe "EmojiReact objects" do
|
||||||
|
|
Loading…
Reference in a new issue