projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'refactor/db-add-defaults' into 'develop'
[akkoma]
/
lib
/
pleroma
/
workers
/
background_worker.ex
diff --git
a/lib/pleroma/workers/background_worker.ex
b/lib/pleroma/workers/background_worker.ex
index fbce7d789242e79d2f56c19bd6cc07744d9ea6d0..7ffc8eabec217ae19db9ec72c5465353526b4eeb 100644
(file)
--- a/
lib/pleroma/workers/background_worker.ex
+++ b/
lib/pleroma/workers/background_worker.ex
@@
-8,27
+8,29
@@
defmodule Pleroma.Workers.BackgroundWorker do
alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy
alias Pleroma.Web.OAuth.Token.CleanWorker
alias Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy
alias Pleroma.Web.OAuth.Token.CleanWorker
- # Note: `max_attempts` is intended to be overridden in `new/1` call
- use Oban.Worker,
- queue: "background",
- max_attempts: 1
+ use Pleroma.Workers.WorkerHelper, queue: "background"
@impl Oban.Worker
def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}, _job) do
@impl Oban.Worker
def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}, _job) do
- user = User.get_by_id(user_id)
+ user = User.get_
cached_
by_id(user_id)
User.perform(:fetch_initial_posts, user)
end
def perform(%{"op" => "deactivate_user", "user_id" => user_id, "status" => status}, _job) do
User.perform(:fetch_initial_posts, user)
end
def perform(%{"op" => "deactivate_user", "user_id" => user_id, "status" => status}, _job) do
- user = User.get_by_id(user_id)
+ user = User.get_
cached_
by_id(user_id)
User.perform(:deactivate_async, user, status)
end
def perform(%{"op" => "delete_user", "user_id" => user_id}, _job) do
User.perform(:deactivate_async, user, status)
end
def perform(%{"op" => "delete_user", "user_id" => user_id}, _job) do
- user = User.get_by_id(user_id)
+ user = User.get_
cached_
by_id(user_id)
User.perform(:delete, user)
end
User.perform(:delete, user)
end
+ def perform(%{"op" => "force_password_reset", "user_id" => user_id}, _job) do
+ user = User.get_cached_by_id(user_id)
+ User.perform(:force_password_reset, user)
+ end
+
def perform(
%{
"op" => "blocks_import",
def perform(
%{
"op" => "blocks_import",
@@
-37,7
+39,7
@@
defmodule Pleroma.Workers.BackgroundWorker do
},
_job
) do
},
_job
) do
- blocker = User.get_by_id(blocker_id)
+ blocker = User.get_
cached_
by_id(blocker_id)
User.perform(:blocks_import, blocker, blocked_identifiers)
end
User.perform(:blocks_import, blocker, blocked_identifiers)
end
@@
-49,7
+51,7
@@
defmodule Pleroma.Workers.BackgroundWorker do
},
_job
) do
},
_job
) do
- follower = User.get_by_id(follower_id)
+ follower = User.get_
cached_
by_id(follower_id)
User.perform(:follow_import, follower, followed_identifiers)
end
User.perform(:follow_import, follower, followed_identifiers)
end
@@
-69,11
+71,4
@@
defmodule Pleroma.Workers.BackgroundWorker do
activity = Activity.get_by_id(activity_id)
Pleroma.Web.RichMedia.Helpers.perform(:fetch, activity)
end
activity = Activity.get_by_id(activity_id)
Pleroma.Web.RichMedia.Helpers.perform(:fetch, activity)
end
-
- def perform(
- %{"op" => "activity_expiration", "activity_expiration_id" => activity_expiration_id},
- _job
- ) do
- Pleroma.ActivityExpirationWorker.perform(:execute, activity_expiration_id)
- end
end
end