hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into link-verification

Browse source
This commit is contained in:
marcin mikołajczak 2024-03-07 13:13:49 +01:00
commit b7c625db0f
609 changed files with 6056 additions and 2607 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/workers/background_worker.ex
View file

@ -28,7 +28,7 @@ defmodule Pleroma.Workers.BackgroundWorker do
def perform(%Job{args: %{"op" => op, "user_id" => user_id, "identifiers" => identifiers}})
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, identifiers)}
{:ok, User.Import.perform(String.to_existing_atom(op), user, identifiers)}
end
def perform(%Job{