Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...

# Conflicts:
#	mix.lock

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

diff --cc lib/pleroma/web/mastodon_api/views/account_view.ex
Simple merge

diff --cc mix.exs
index 47f237d99af8a9c72143b7087c4932a09525544c,eb2e54e4ab0575afff184726cfbf55e8b017766a..7c8e52a676f35b77f1deaf71749f32b396fea8d3
--- 1/mix.exs
--- 2/mix.exs
+++ b/mix.exs
@@@ -100,10 -100,9 +100,10 @@@ defmodule Pleroma.Mixfile d
        {:plug_cowboy, "~> 2.0"},
        {:phoenix_pubsub, "~> 1.1"},
        {:phoenix_ecto, "~> 4.0"},
 +      {:ecto_enum, "~> 1.4"},
        {:ecto_sql, "~> 3.2"},
        {:postgrex, ">= 0.13.5"},
-       {:oban, "~> 0.8.1"},
+       {:oban, "~> 0.12.0"},
        {:quantum, "~> 2.3"},
        {:gettext, "~> 0.15"},
        {:comeonin, "~> 4.1.1"},

diff --cc mix.lock
index e39b5b39df9f3f84507c6936e6d9821e12ce6ab2,0d41c4ad5a7e9ba29b87ec40169115f0f75d10cf..bbf6a2c0098e702110e39dcdad4668ee7927fce8
--- 1/mix.lock
--- 2/mix.lock
+++ b/mix.lock
@@@ -23,9 -23,8 +23,9 @@@
    "decimal": {:hex, :decimal, "1.8.0", "ca462e0d885f09a1c5a342dbd7c1dcf27ea63548c65a65e67334f4b61803822e", [:mix], [], "hexpm"},
    "deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm"},
    "earmark": {:hex, :earmark, "1.4.2", "3aa0bd23bc4c61cf2f1e5d752d1bb470560a6f8539974f767a38923bb20e1d7f", [:mix], [], "hexpm"},
-   "ecto": {:hex, :ecto, "3.2.3", "51274df79862845b388733fddcf6f107d0c8c86e27abe7131fa98f8d30761bda", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
+   "ecto": {:hex, :ecto, "3.2.5", "76c864b77948a479e18e69cc1d0f0f4ee7cced1148ffe6a093ff91eba644f0b5", [:mix], [{:decimal, "~> 1.6", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm"},
 +  "ecto_enum": {:hex, :ecto_enum, "1.4.0", "d14b00e04b974afc69c251632d1e49594d899067ee2b376277efd8233027aec8", [:mix], [{:ecto, ">= 3.0.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:ecto_sql, "> 3.0.0", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:mariaex, ">= 0.0.0", [hex: :mariaex, repo: "hexpm", optional: true]}, {:postgrex, ">= 0.0.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm"},
-   "ecto_sql": {:hex, :ecto_sql, "3.2.0", "751cea597e8deb616084894dd75cbabfdbe7255ff01e8c058ca13f0353a3921b", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.2.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.2.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
+   "ecto_sql": {:hex, :ecto_sql, "3.2.2", "d10845bc147b9f61ef485cbf0973c0a337237199bd9bd30dd9542db00aadc26b", [:mix], [{:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:ecto, "~> 3.2.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:myxql, "~> 0.2.0 or ~> 0.3.0", [hex: :myxql, repo: "hexpm", optional: true]}, {:postgrex, "~> 0.15.0", [hex: :postgrex, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm"},
    "esshd": {:hex, :esshd, "0.1.0", "6f93a2062adb43637edad0ea7357db2702a4b80dd9683482fe00f5134e97f4c1", [:mix], [], "hexpm"},
    "eternal": {:hex, :eternal, "1.2.1", "d5b6b2499ba876c57be2581b5b999ee9bdf861c647401066d3eeed111d096bc4", [:mix], [], "hexpm"},
    "ex2ms": {:hex, :ex2ms, "1.5.0", "19e27f9212be9a96093fed8cdfbef0a2b56c21237196d26760f11dfcfae58e97", [:mix], [], "hexpm"},

diff --cc test/user_test.exs
index 1f30622010e580334a0c55787af7f7791c1f62d3,82e338e7599f6ae956f733c31be4674c488adb25..f9ca2fea251aa4aa372810c07ddca598b64f801b
--- 1/test/user_test.exs
--- 2/test/user_test.exs
+++ b/test/user_test.exs
@@@ -1392,10 -1341,9 +1391,10 @@@ defmodule Pleroma.UserTest d
      {:ok, _follower2} = User.follow(follower2, user)
      {:ok, _follower3} = User.follow(follower3, user)
  
 -    {:ok, user} = User.block(user, follower)
 +    {:ok, _user_relationship} = User.block(user, follower)
 +    user = refresh_record(user)
  
-     assert User.user_info(user).follower_count == 2
+     assert user.follower_count == 2
    end
  
    describe "list_inactive_users_query/1" do

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge

diff --cc test/web/streamer/streamer_test.exs
Simple merge