Merge remote-tracking branch 'origin/develop' into reactions

diff --cc CHANGELOG.md
index 35c062dcf87544fe3f2566e86e9a5b05ef781e26,db505591b703264ffef0dd1da291316d6634a46a..3e6b791b4edfaa3cf99fb947260afc33048ff113
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -11,7 -12,7 +12,8 @@@ The format is based on [Keep a Changelo
  - Pleroma API: `GET /api/v1/pleroma/accounts/:id/scrobbles` to get a list of recently scrobbled items
  - Pleroma API: `POST /api/v1/pleroma/scrobble` to scrobble a media item
  - Mastodon API: Add `upload_limit`, `avatar_upload_limit`, `background_upload_limit`, and `banner_upload_limit` to `/api/v1/instance`
+ - Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
 +- Pleroma API: Add Emoji reactions
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)

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

diff --cc lib/pleroma/web/activity_pub/utils.ex
index 82e2d8f76b9c2c94a3df64af27378898d5a5f856,272011a9f3a3bcdebf90f5bd2b0a9c0cfb714edb..3e43e8fb80621990f0b53220e490bf51191d588f
--- 1/lib/pleroma/web/activity_pub/utils.ex
--- 2/lib/pleroma/web/activity_pub/utils.ex
+++ b/lib/pleroma/web/activity_pub/utils.ex
@@@ -251,22 -251,6 +251,16 @@@ defmodule Pleroma.Web.ActivityPub.Util
      |> Repo.one()
    end
  
-   def make_emoji_reaction_data(user, object, emoji, activity_id) do
-     make_like_data(user, object, activity_id)
-     |> Map.put("type", "EmojiReaction")
-     |> Map.put("content", emoji)
-   end
- 
 +  @doc """
 +  Returns like activities targeting an object
 +  """
 +  def get_object_likes(%{data: %{"id" => id}}) do
 +    id
 +    |> Activity.Queries.by_object_id()
 +    |> Activity.Queries.by_type("Like")
 +    |> Repo.all()
 +  end
 +
    @spec make_like_data(User.t(), map(), String.t()) :: map()
    def make_like_data(
          %User{ap_id: ap_id} = actor,
@@@ -298,6 -282,6 +292,12 @@@
      |> maybe_put("id", activity_id)
    end
  
++  def make_emoji_reaction_data(user, object, emoji, activity_id) do
++    make_like_data(user, object, activity_id)
++    |> Map.put("type", "EmojiReaction")
++    |> Map.put("content", emoji)
++  end
++
    @spec update_element_in_object(String.t(), list(any), Object.t()) ::
            {:ok, Object.t()} | {:error, Ecto.Changeset.t()}
    def update_element_in_object(property, element, object) do

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

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
index 3a5dbdeead36b91d250983c2fc7a1f21c970a8df,8a6528cbb1b5b874a14240cbfa948d115fcb175b..44ea85b453aa34a96cd0ac9f7d33d19322824d96
--- 1/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
--- 2/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
+++ b/test/web/pleroma_api/controllers/pleroma_api_controller_test.exs
@@@ -7,8 -7,8 +7,9 @@@ defmodule Pleroma.Web.PleromaAPI.Plerom
  
    alias Pleroma.Conversation.Participation
    alias Pleroma.Notification
 +  alias Pleroma.Object
    alias Pleroma.Repo
+   alias Pleroma.User
    alias Pleroma.Web.CommonAPI
  
    import Pleroma.Factory