Merge remote-tracking branch 'pleroma/develop' into feature/disable-account

diff --cc config/config.exs
index 80f0c3f2590aefa2f5efc3553a48cb0006477d24,1e64b79a7a043ed4b4194c23e4910a7793c6e003..a89afd419c35908145762bb677c289199d7d56cb
--- 1/config/config.exs
--- 2/config/config.exs
+++ b/config/config.exs
@@@ -415,7 -417,7 +417,8 @@@ config :pleroma_job_queue, :queues
    mailer: 10,
    transmogrifier: 20,
    scheduled_activities: 10,
 -  background: 5
++  background: 5,
 +  user: 10
  
  config :pleroma, :fetch_initial_posts,
    enabled: false,

diff --cc lib/pleroma/activity.ex
index 9c1c804e060640bb8555923abe80bb131af6ca00,73e63bb144b6e83ef5cce904ade31ca6e452a0a5..2dcb97159736b99c8cf963d6c3e11ace14203667
--- 1/lib/pleroma/activity.ex
--- 2/lib/pleroma/activity.ex
+++ b/lib/pleroma/activity.ex
@@@ -265,13 -263,8 +267,18 @@@ defmodule Pleroma.Activity d
      |> Repo.all()
    end
  
+   @spec query_by_actor(actor()) :: Ecto.Query.t()
+   def query_by_actor(actor) do
+     from(a in Activity, where: a.actor == ^actor)
+   end
++
 +  def restrict_deactivated_users(query) do
 +    from(activity in query,
 +      where:
 +        fragment(
 +          "? not in (SELECT ap_id FROM users WHERE info->'deactivated' @> 'true')",
 +          activity.actor
 +        )
 +    )
 +  end
  end

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/controllers/util_controller.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge

diff --cc test/user_test.exs
Simple merge