Merge remote-tracking branch 'upstream/develop' into aliases

diff --cc CHANGELOG.md
Simple merge

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

diff --cc lib/pleroma/web/api_spec/operations/account_operation.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge

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

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

diff --cc test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
index 467110f3b5654eb28db577c994914c2945ea92ae,2e67047266089c1d30989fbfffc6be72c4448bbf..2da951048e57fd2cf99f7fabe8c6555649089190
--- 1/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
--- 2/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
+++ b/test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
@@@ -214,18 -214,12 +214,22 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
  
        assert user_data = json_response_and_validate_schema(conn, 200)
        assert user_data["display_name"] == "markorepairs"
+ 
+       update_activity = Repo.one(Pleroma.Activity)
+       assert update_activity.data["type"] == "Update"
+       assert update_activity.data["object"]["name"] == "markorepairs"
      end
  
 +    test "updates the user's AKAs", %{conn: conn} do
 +      conn =
 +        patch(conn, "/api/v1/accounts/update_credentials", %{
 +          "also_known_as" => ["https://mushroom.kingdom/users/mario"]
 +        })
 +
 +      assert user_data = json_response_and_validate_schema(conn, 200)
 +      assert user_data["pleroma"]["also_known_as"] == ["https://mushroom.kingdom/users/mario"]
 +    end
 +
      test "updates the user's avatar", %{user: user, conn: conn} do
        new_avatar = %Plug.Upload{
          content_type: "image/jpg",

diff --cc test/web/mastodon_api/views/account_view_test.exs
index bbf7b33a8ae39600c13ea4fdb05125b7562a06df,a5f39b215dd6e5ad92ba2962b49506ed21abaa60..20e4d50709a71c61e4570d45ce9ebf606c99f9b2
--- 1/test/web/mastodon_api/views/account_view_test.exs
--- 2/test/web/mastodon_api/views/account_view_test.exs
+++ b/test/web/mastodon_api/views/account_view_test.exs
@@@ -78,10 -75,8 +76,9 @@@ defmodule Pleroma.Web.MastodonAPI.Accou
        },
        pleroma: %{
          ap_id: user.ap_id,
 +        also_known_as: ["https://shitposter.zone/users/shp"],
          background_image: "https://example.com/images/asuka_hospital.png",
-         favicon:
-           "https://shitposter.club/plugins/Qvitter/img/gnusocial-favicons/favicon-16x16.png",
+         favicon: nil,
          confirmation_pending: false,
          tags: [],
          is_admin: false,
@@@ -174,10 -173,8 +175,9 @@@
        },
        pleroma: %{
          ap_id: user.ap_id,
 +        also_known_as: [],
          background_image: nil,
-         favicon:
-           "https://shitposter.club/plugins/Qvitter/img/gnusocial-favicons/favicon-16x16.png",
+         favicon: nil,
          confirmation_pending: false,
          tags: [],
          is_admin: false,