projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Spin off imports into n oban jobs' (#319) from spin-off-imports...
[akkoma]
/
lib
/
pleroma
/
workers
/
background_worker.ex
diff --git
a/lib/pleroma/workers/background_worker.ex
b/lib/pleroma/workers/background_worker.ex
index 0647c65ae2b25022e7639d8802ae1f6a8eb1b1c9..9bd9899db59e4a741c1808c211fba5e06c370c7f 100644
(file)
--- a/
lib/pleroma/workers/background_worker.ex
+++ b/
lib/pleroma/workers/background_worker.ex
@@
-1,17
+1,18
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.BackgroundWorker do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Workers.BackgroundWorker do
+ alias Pleroma.Instances.Instance
alias Pleroma.User
use Pleroma.Workers.WorkerHelper, queue: "background"
@impl Oban.Worker
alias Pleroma.User
use Pleroma.Workers.WorkerHelper, queue: "background"
@impl Oban.Worker
- def perform(%Job{args: %{"op" => "
deactivate_user
", "user_id" => user_id, "status" => status}}) do
+ def perform(%Job{args: %{"op" => "
user_activation
", "user_id" => user_id, "status" => status}}) do
user = User.get_cached_by_id(user_id)
user = User.get_cached_by_id(user_id)
- User.perform(:
deactivate
_async, user, status)
+ User.perform(:
set_activation
_async, user, status)
end
def perform(%Job{args: %{"op" => "delete_user", "user_id" => user_id}}) do
end
def perform(%Job{args: %{"op" => "delete_user", "user_id" => user_id}}) do
@@
-24,10
+25,10
@@
defmodule Pleroma.Workers.BackgroundWorker do
User.perform(:force_password_reset, user)
end
User.perform(:force_password_reset, user)
end
- def perform(%Job{args: %{"op" => op, "user_id" => user_id, "identifier
s" => identifiers
}})
+ def perform(%Job{args: %{"op" => op, "user_id" => user_id, "identifier
" => identifier
}})
when op in ["blocks_import", "follow_import", "mutes_import"] do
user = User.get_cached_by_id(user_id)
when op in ["blocks_import", "follow_import", "mutes_import"] do
user = User.get_cached_by_id(user_id)
- {:ok, User.Import.perform(String.to_atom(op), user, identifier
s
)}
+ {:ok, User.Import.perform(String.to_atom(op), user, identifier)}
end
def perform(%Job{
end
def perform(%Job{
@@
-38,4
+39,8
@@
defmodule Pleroma.Workers.BackgroundWorker do
Pleroma.FollowingRelationship.move_following(origin, target)
end
Pleroma.FollowingRelationship.move_following(origin, target)
end
+
+ def perform(%Job{args: %{"op" => "delete_instance", "host" => host}}) do
+ Instance.perform(:delete_instance, host)
+ end
end
end