projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/2036-part-2' 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 ac2fe6946f549d3cbe867dac3002e2481bafa56c..cec5a746294499f248f51980c1f10d681e0b10bf 100644
(file)
--- a/
lib/pleroma/workers/background_worker.ex
+++ b/
lib/pleroma/workers/background_worker.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
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
@@
-10,64
+10,60
@@
defmodule Pleroma.Workers.BackgroundWorker do
use Pleroma.Workers.WorkerHelper, queue: "background"
@impl Oban.Worker
use Pleroma.Workers.WorkerHelper, queue: "background"
@impl Oban.Worker
- def perform(%{"op" => "fetch_initial_posts", "user_id" => user_id}, _job) do
- 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
+ def perform(%
Job{args: %{"op" => "deactivate_user", "user_id" => user_id, "status" => status}}
) do
user = User.get_cached_by_id(user_id)
User.perform(:deactivate_async, user, status)
end
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
+ def perform(%
Job{args: %{"op" => "delete_user", "user_id" => user_id}}
) do
user = User.get_cached_by_id(user_id)
User.perform(:delete, user)
end
user = User.get_cached_by_id(user_id)
User.perform(:delete, user)
end
- def perform(%
{"op" => "force_password_reset", "user_id" => user_id}, _job
) do
+ def perform(%
Job{args: %{"op" => "force_password_reset", "user_id" => user_id}}
) do
user = User.get_cached_by_id(user_id)
User.perform(:force_password_reset, user)
end
user = User.get_cached_by_id(user_id)
User.perform(:force_password_reset, user)
end
- def perform(
- %{
+ def perform(
%Job{
+
args:
%{
"op" => "blocks_import",
"blocker_id" => blocker_id,
"blocked_identifiers" => blocked_identifiers
"op" => "blocks_import",
"blocker_id" => blocker_id,
"blocked_identifiers" => blocked_identifiers
- },
- _job
- ) do
+ }
+ }) do
blocker = User.get_cached_by_id(blocker_id)
blocker = User.get_cached_by_id(blocker_id)
- User.perform(:blocks_import, blocker, blocked_identifiers)
+ {:ok, User.perform(:blocks_import, blocker, blocked_identifiers)}
end
end
- def perform(
- %{
+ def perform(
%Job{
+
args:
%{
"op" => "follow_import",
"follower_id" => follower_id,
"followed_identifiers" => followed_identifiers
"op" => "follow_import",
"follower_id" => follower_id,
"followed_identifiers" => followed_identifiers
- },
- _job
- ) do
+ }
+ }) do
follower = User.get_cached_by_id(follower_id)
follower = User.get_cached_by_id(follower_id)
- User.perform(:follow_import, follower, followed_identifiers)
+ {:ok, User.perform(:follow_import, follower, followed_identifiers)}
end
end
- def perform(%
{"op" => "media_proxy_preload", "message" => message}, _job
) do
+ def perform(%
Job{args: %{"op" => "media_proxy_preload", "message" => message}}
) do
MediaProxyWarmingPolicy.perform(:preload, message)
end
MediaProxyWarmingPolicy.perform(:preload, message)
end
- def perform(%
{"op" => "media_proxy_prefetch", "url" => url}, _job
) do
+ def perform(%
Job{args: %{"op" => "media_proxy_prefetch", "url" => url}}
) do
MediaProxyWarmingPolicy.perform(:prefetch, url)
end
MediaProxyWarmingPolicy.perform(:prefetch, url)
end
- def perform(%
{"op" => "fetch_data_for_activity", "activity_id" => activity_id}, _job
) do
+ def perform(%
Job{args: %{"op" => "fetch_data_for_activity", "activity_id" => activity_id}}
) 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" => "move_following", "origin_id" => origin_id, "target_id" => target_id}, _) do
+ def perform(%Job{
+ args: %{"op" => "move_following", "origin_id" => origin_id, "target_id" => target_id}
+ }) do
origin = User.get_cached_by_id(origin_id)
target = User.get_cached_by_id(target_id)
origin = User.get_cached_by_id(origin_id)
target = User.get_cached_by_id(target_id)