projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix meilisearch tests and jobs for oban
[akkoma]
/
lib
/
pleroma
/
user
/
import.ex
diff --git
a/lib/pleroma/user/import.ex
b/lib/pleroma/user/import.ex
index de27bdc4c14a710762def4222d63e78971992998..60cd18041dc7e927c4ec514163c2e4bbcb6f37a1 100644
(file)
--- a/
lib/pleroma/user/import.ex
+++ b/
lib/pleroma/user/import.ex
@@
-1,5
+1,5
@@
# 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.User.Import do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.User.Import do
@@
-45,7
+45,7
@@
defmodule Pleroma.User.Import do
identifiers,
fn identifier ->
with {:ok, %User{} = followed} <- User.get_or_fetch(identifier),
identifiers,
fn identifier ->
with {:ok, %User{} = followed} <- User.get_or_fetch(identifier),
- {:ok, follower} <- User.maybe_direct_follow(follower, followed),
+ {:ok, follower
, followed
} <- User.maybe_direct_follow(follower, followed),
{:ok, _, _, _} <- CommonAPI.follow(follower, followed) do
followed
else
{:ok, _, _, _} <- CommonAPI.follow(follower, followed) do
followed
else
@@
-65,20
+65,14
@@
defmodule Pleroma.User.Import do
def blocks_import(%User{} = blocker, [_ | _] = identifiers) do
BackgroundWorker.enqueue(
"blocks_import",
def blocks_import(%User{} = blocker, [_ | _] = identifiers) do
BackgroundWorker.enqueue(
"blocks_import",
- %{
- "blocker_id" => blocker.id,
- "blocked_identifiers" => identifiers
- }
+ %{"user_id" => blocker.id, "identifiers" => identifiers}
)
end
def follow_import(%User{} = follower, [_ | _] = identifiers) do
BackgroundWorker.enqueue(
"follow_import",
)
end
def follow_import(%User{} = follower, [_ | _] = identifiers) do
BackgroundWorker.enqueue(
"follow_import",
- %{
- "follower_id" => follower.id,
- "followed_identifiers" => identifiers
- }
+ %{"user_id" => follower.id, "identifiers" => identifiers}
)
end
)
end