aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/workers
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-08-25 09:10:45 +0300
committerrinpatch <rinpatch@sdf.org>2020-09-10 21:50:41 +0300
commit629a8de9cb2ba2cc2d09679862a24031f34abc2f (patch)
tree7999738f7edef3105b644b42f1efcbf9dd52443f /lib/pleroma/workers
parentde4c935071a47c78d873484b202e09dce5399570 (diff)
downloadpleroma-629a8de9cb2ba2cc2d09679862a24031f34abc2f.tar.gz
deprecation warning
changed namespace for activity expiration configuration
Diffstat (limited to 'lib/pleroma/workers')
-rw-r--r--lib/pleroma/workers/purge_expired_activity.ex8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/pleroma/workers/purge_expired_activity.ex b/lib/pleroma/workers/purge_expired_activity.ex
index ba0053008..44a8ad0b9 100644
--- a/lib/pleroma/workers/purge_expired_activity.ex
+++ b/lib/pleroma/workers/purge_expired_activity.ex
@@ -7,6 +7,8 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
import Ecto.Query
+ alias Pleroma.Activity
+
def enqueue(args) do
with true <- enabled?(),
args when is_map(args) <- validate_expires_at(args) do
@@ -20,7 +22,7 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
@impl true
def perform(%Oban.Job{args: %{"activity_id" => id}}) do
- with %Pleroma.Activity{} = activity <- find_activity(id),
+ with %Activity{} = activity <- find_activity(id),
%Pleroma.User{} = user <- find_user(activity.object.data["actor"]),
false <- pinned_by_actor?(activity, user) do
Pleroma.Web.CommonAPI.delete(activity.id, user)
@@ -53,7 +55,7 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
end
defp find_activity(id) do
- with nil <- Pleroma.Activity.get_by_id_with_object(id) do
+ with nil <- Activity.get_by_id_with_object(id) do
{:error, :activity_not_found}
end
end
@@ -65,7 +67,7 @@ defmodule Pleroma.Workers.PurgeExpiredActivity do
end
defp pinned_by_actor?(activity, user) do
- with true <- Pleroma.Activity.pinned_by_actor?(activity, user) do
+ with true <- Activity.pinned_by_actor?(activity, user) do
:pinned_by_actor
end
end