Browse Source

clean up follow/block imports a little

tags/v1.1.4
William Pitcock 5 years ago
parent
commit
ac3a3abf6b
2 changed files with 30 additions and 14 deletions
  1. +16
    -0
      lib/pleroma/user.ex
  2. +14
    -14
      lib/pleroma/web/twitter_api/controllers/util_controller.ex

+ 16
- 0
lib/pleroma/user.ex View File

@@ -1085,6 +1085,22 @@ defmodule Pleroma.User do
)
end

def blocks_import(%User{} = blocker, blocked_identifiers) when is_list(blocked_identifiers),
do:
PleromaJobQueue.enqueue(:background, __MODULE__, [
:blocks_import,
blocker,
blocked_identifiers
])

def follow_import(%User{} = follower, followed_identifiers) when is_list(followed_identifiers),
do:
PleromaJobQueue.enqueue(:background, __MODULE__, [
:follow_import,
follower,
followed_identifiers
])

def delete_user_activities(%User{ap_id: ap_id} = user) do
stream =
ap_id


+ 14
- 14
lib/pleroma/web/twitter_api/controllers/util_controller.ex View File

@@ -309,13 +309,13 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
Enum.map(lines, fn line ->
String.split(line, ",") |> List.first()
end)
|> List.delete("Account address"),
:ok <-
PleromaJobQueue.enqueue(:background, User, [
:follow_import,
follower,
followed_identifiers
]) do
|> List.delete("Account address") do
PleromaJobQueue.enqueue(:background, User, [
:follow_import,
follower,
followed_identifiers
])
json(conn, "job started")
end
end
@@ -325,13 +325,13 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
end

def blocks_import(%{assigns: %{user: blocker}} = conn, %{"list" => list}) do
with blocked_identifiers <- String.split(list),
:ok <-
PleromaJobQueue.enqueue(:background, User, [
:blocks_import,
blocker,
blocked_identifiers
]) do
with blocked_identifiers <- String.split(list) do
PleromaJobQueue.enqueue(:background, User, [
:blocks_import,
blocker,
blocked_identifiers
])
json(conn, "job started")
end
end


Loading…
Cancel
Save