From: lain <lain@soykaf.club>
Date: Fri, 13 Sep 2019 14:31:27 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into reactions
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=a7f31bf06cfe3f8e2549393f34d6573854d783c0;p=akkoma

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

a7f31bf06cfe3f8e2549393f34d6573854d783c0
diff --cc lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
index bb090d37f,f4df3b024..110240115
--- a/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
+++ b/lib/pleroma/web/pleroma_api/pleroma_api_controller.ex
@@@ -7,50 -7,13 +7,52 @@@ defmodule Pleroma.Web.PleromaAPI.Plerom
  
    import Pleroma.Web.ControllerHelper, only: [add_link_headers: 7]
  
 +  alias Pleroma.Activity
 +  alias Pleroma.Object
 +  alias Pleroma.User
    alias Pleroma.Conversation.Participation
+   alias Pleroma.Notification
    alias Pleroma.Web.ActivityPub.ActivityPub
 +  alias Pleroma.Web.CommonAPI
 +  alias Pleroma.Web.MastodonAPI.AccountView
    alias Pleroma.Web.MastodonAPI.ConversationView
+   alias Pleroma.Web.MastodonAPI.NotificationView
    alias Pleroma.Web.MastodonAPI.StatusView
  
 +  def emoji_reactions_by(%{assigns: %{user: user}} = conn, %{"id" => activity_id}) do
 +    with %Activity{} = activity <- Activity.get_by_id_with_object(activity_id),
 +         %Object{data: %{"reactions" => emoji_reactions}} <- Object.normalize(activity) do
 +      reactions =
 +        Enum.reduce(emoji_reactions, %{}, fn {emoji, users}, res ->
 +          users =
 +            users
 +            |> Enum.map(&User.get_cached_by_ap_id/1)
 +
 +          res
 +          |> Map.put(
 +            emoji,
 +            AccountView.render("accounts.json", %{users: users, for: user, as: :user})
 +          )
 +        end)
 +
 +      conn
 +      |> json(reactions)
 +    else
 +      _e ->
 +        conn
 +        |> json(%{})
 +    end
 +  end
 +
 +  def react_with_emoji(%{assigns: %{user: user}} = conn, %{"id" => activity_id, "emoji" => emoji}) do
 +    with {:ok, _activity, _object} <- CommonAPI.react_with_emoji(activity_id, user, emoji),
 +         activity = Activity.get_by_id(activity_id) do
 +      conn
 +      |> put_view(StatusView)
 +      |> render("status.json", %{activity: activity, for: user, as: :activity})
 +    end
 +  end
 +
    def conversation(%{assigns: %{user: user}} = conn, %{"id" => participation_id}) do
      with %Participation{} = participation <- Participation.get(participation_id),
           true <- user.id == participation.user_id do
diff --cc lib/pleroma/web/router.ex
index ec6179420,b0464037e..6354510cf
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@@ -283,7 -272,7 +278,8 @@@ defmodule Pleroma.Web.Router d
      scope [] do
        pipe_through(:oauth_write)
        patch("/conversations/:id", PleromaAPIController, :update_conversation)
 +      post("/statuses/:id/react_with_emoji", PleromaAPIController, :react_with_emoji)
+       post("/notifications/read", PleromaAPIController, :read_notification)
      end
    end