Merge branch 'account-notes' into 'develop'

MastoAPI: Add user notes on accounts

See merge request pleroma/pleroma!3540

diff --cc docs/development/API/pleroma_api.md
Simple merge

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

diff --cc lib/pleroma/web/api_spec/schemas/account.ex
index ad1a855441374cd5587757c93dd85372faf40d8b,e0bd2728b8731864696aca6cec008a2cea885468..548e7054412f32a3874ef7bce139828bed0593ee
--- 1/lib/pleroma/web/api_spec/schemas/account.ex
--- 2/lib/pleroma/web/api_spec/schemas/account.ex
+++ b/lib/pleroma/web/api_spec/schemas/account.ex
@@@ -194,10 -194,10 +194,11 @@@ defmodule Pleroma.Web.ApiSpec.Schemas.A
            "id" => "9tKi3esbG7OQgZ2920",
            "muting" => false,
            "muting_notifications" => false,
+           "note" => "",
            "requested" => false,
            "showing_reblogs" => true,
 -          "subscribing" => false
 +          "subscribing" => false,
 +          "notifying" => false
          },
          "settings_store" => %{
            "pleroma-fe" => %{}

diff --cc lib/pleroma/web/api_spec/schemas/account_relationship.ex
index b4f6d25b091de440d132e7d5548f2c8769574a68,163066032a9154d690b977dfe84ce06cfac48433..5d9e3b56e3310f2893fb784cc2921d9c4aacfdce
--- 1/lib/pleroma/web/api_spec/schemas/account_relationship.ex
--- 2/lib/pleroma/web/api_spec/schemas/account_relationship.ex
+++ b/lib/pleroma/web/api_spec/schemas/account_relationship.ex
@@@ -22,10 -22,10 +22,11 @@@ defmodule Pleroma.Web.ApiSpec.Schemas.A
        id: FlakeID,
        muting: %Schema{type: :boolean},
        muting_notifications: %Schema{type: :boolean},
+       note: %Schema{type: :string},
        requested: %Schema{type: :boolean},
        showing_reblogs: %Schema{type: :boolean},
 -      subscribing: %Schema{type: :boolean}
 +      subscribing: %Schema{type: :boolean},
 +      notifying: %Schema{type: :boolean}
      },
      example: %{
        "blocked_by" => false,
@@@ -37,10 -37,10 +38,11 @@@
        "id" => "9tKi3esbG7OQgZ2920",
        "muting" => false,
        "muting_notifications" => false,
+       "note" => "",
        "requested" => false,
        "showing_reblogs" => true,
 -      "subscribing" => false
 +      "subscribing" => false,
 +      "notifying" => false
      }
    })
  end

diff --cc lib/pleroma/web/api_spec/schemas/status.ex
index 0bf3312d1c9f6b663c0c5738e5e63bfa84eeb415,60801f3227e1f103b1441b61d8d695b115eb5bac..3caab0f00dd7f723144e73d89d092569b30a115b
--- 1/lib/pleroma/web/api_spec/schemas/status.ex
--- 2/lib/pleroma/web/api_spec/schemas/status.ex
+++ b/lib/pleroma/web/api_spec/schemas/status.ex
@@@ -282,10 -282,10 +282,11 @@@ defmodule Pleroma.Web.ApiSpec.Schemas.S
              "id" => "9toJCsKN7SmSf3aj5c",
              "muting" => false,
              "muting_notifications" => false,
+             "note" => "",
              "requested" => false,
              "showing_reblogs" => true,
 -            "subscribing" => false
 +            "subscribing" => false,
 +            "notifying" => false
            },
            "skip_thread_containment" => false,
            "tags" => []

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

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

diff --cc test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
Simple merge

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