Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
authorlain <lain@soykaf.club>
Mon, 8 Jun 2020 09:19:18 +0000 (11:19 +0200)
committerlain <lain@soykaf.club>
Mon, 8 Jun 2020 09:19:18 +0000 (11:19 +0200)
1  2 
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex

index b670e06a29e84e3c31876f4310d4ed5a3380e7f4,eb73c95fe6cc8452ee38c51411e7fa3cdf1fad3b..aeec4beae5d80043f718eeb633e09bf13aa14c3f
@@@ -124,16 -110,9 +110,16 @@@ defmodule Pleroma.Web.ActivityPub.Activ
      Object.increase_vote_count(reply_ap_id, name, actor)
    end
  
-   def increase_poll_votes_if_vote(_create_data), do: :noop
+   defp increase_poll_votes_if_vote(_create_data), do: :noop
  
 +  @object_types ["ChatMessage"]
    @spec persist(map(), keyword()) :: {:ok, Activity.t() | Object.t()}
 +  def persist(%{"type" => type} = object, meta) when type in @object_types do
 +    with {:ok, object} <- Object.create(object) do
 +      {:ok, object, meta}
 +    end
 +  end
 +
    def persist(object, meta) do
      with local <- Keyword.fetch!(meta, :local),
           {recipients, _, _} <- get_recipients(object),
      end
    end
  
 -  defp do_follow(follower, followed, activity_id, local) do
 +  defp do_follow(follower, followed, activity_id, local, opts) do
 +    skip_notify_and_stream = Keyword.get(opts, :skip_notify_and_stream, false)
+     data = make_follow_data(follower, followed, activity_id)
  
-     with data <- make_follow_data(follower, followed, activity_id),
-          {:ok, activity} <- insert(data, local),
+     with {:ok, activity} <- insert(data, local),
 -         _ <- notify_and_stream(activity),
 +         _ <- skip_notify_and_stream || notify_and_stream(activity),
           :ok <- maybe_federate(activity) do
        {:ok, activity}
      else
      end
    end
  
-   defp exclude_chat_messages(query, %{"include_chat_messages" => true}), do: query
++  defp exclude_chat_messages(query, %{include_chat_messages: true}), do: query
 +
 +  defp exclude_chat_messages(query, _) do
 +    if has_named_binding?(query, :object) do
 +      from([activity, object: o] in query,
 +        where: fragment("not(?->>'type' = ?)", o.data, "ChatMessage")
 +      )
 +    else
 +      query
 +    end
 +  end
 +
-   defp exclude_invisible_actors(query, %{"invisible_actors" => true}), do: query
+   defp exclude_invisible_actors(query, %{invisible_actors: true}), do: query
  
    defp exclude_invisible_actors(query, _opts) do
      invisible_ap_ids =
index e4760f53eb63ce730ff2f4b1e91f52f4e701722b,0000000000000000000000000000000000000000..c8ef3d91511a247531749918bb981ec79e592687
mode 100644,000000..100644
--- /dev/null
@@@ -1,175 -1,0 +1,174 @@@
-   import Pleroma.Web.ActivityPub.ObjectValidator, only: [stringify_keys: 1]
 +# Pleroma: A lightweight social networking server
 +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 +# SPDX-License-Identifier: AGPL-3.0-only
 +defmodule Pleroma.Web.PleromaAPI.ChatController do
 +  use Pleroma.Web, :controller
 +
 +  alias Pleroma.Activity
 +  alias Pleroma.Chat
 +  alias Pleroma.Chat.MessageReference
 +  alias Pleroma.Object
 +  alias Pleroma.Pagination
 +  alias Pleroma.Plugs.OAuthScopesPlug
 +  alias Pleroma.Repo
 +  alias Pleroma.User
 +  alias Pleroma.Web.CommonAPI
 +  alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
 +  alias Pleroma.Web.PleromaAPI.ChatView
 +
 +  import Ecto.Query
-         |> Pagination.fetch_paginated(params |> stringify_keys())
 +
 +  action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
 +
 +  plug(
 +    OAuthScopesPlug,
 +    %{scopes: ["write:chats"]}
 +    when action in [
 +           :post_chat_message,
 +           :create,
 +           :mark_as_read,
 +           :mark_message_as_read,
 +           :delete_message
 +         ]
 +  )
 +
 +  plug(
 +    OAuthScopesPlug,
 +    %{scopes: ["read:chats"]} when action in [:messages, :index, :show]
 +  )
 +
 +  plug(OpenApiSpex.Plug.CastAndValidate, render_error: Pleroma.Web.ApiSpec.RenderError)
 +
 +  defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.ChatOperation
 +
 +  def delete_message(%{assigns: %{user: %{id: user_id} = user}} = conn, %{
 +        message_id: message_id,
 +        id: chat_id
 +      }) do
 +    with %MessageReference{} = cm_ref <-
 +           MessageReference.get_by_id(message_id),
 +         ^chat_id <- cm_ref.chat_id |> to_string(),
 +         %Chat{user_id: ^user_id} <- Chat.get_by_id(chat_id),
 +         {:ok, _} <- remove_or_delete(cm_ref, user) do
 +      conn
 +      |> put_view(MessageReferenceView)
 +      |> render("show.json", chat_message_reference: cm_ref)
 +    else
 +      _e ->
 +        {:error, :could_not_delete}
 +    end
 +  end
 +
 +  defp remove_or_delete(
 +         %{object: %{data: %{"actor" => actor, "id" => id}}},
 +         %{ap_id: actor} = user
 +       ) do
 +    with %Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do
 +      CommonAPI.delete(activity.id, user)
 +    end
 +  end
 +
 +  defp remove_or_delete(cm_ref, _) do
 +    cm_ref
 +    |> MessageReference.delete()
 +  end
 +
 +  def post_chat_message(
 +        %{body_params: params, assigns: %{user: %{id: user_id} = user}} = conn,
 +        %{
 +          id: id
 +        }
 +      ) do
 +    with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id),
 +         %User{} = recipient <- User.get_cached_by_ap_id(chat.recipient),
 +         {:ok, activity} <-
 +           CommonAPI.post_chat_message(user, recipient, params[:content],
 +             media_id: params[:media_id]
 +           ),
 +         message <- Object.normalize(activity, false),
 +         cm_ref <- MessageReference.for_chat_and_object(chat, message) do
 +      conn
 +      |> put_view(MessageReferenceView)
 +      |> render("show.json", for: user, chat_message_reference: cm_ref)
 +    end
 +  end
 +
 +  def mark_message_as_read(%{assigns: %{user: %{id: user_id} = user}} = conn, %{
 +        id: chat_id,
 +        message_id: message_id
 +      }) do
 +    with %MessageReference{} = cm_ref <-
 +           MessageReference.get_by_id(message_id),
 +         ^chat_id <- cm_ref.chat_id |> to_string(),
 +         %Chat{user_id: ^user_id} <- Chat.get_by_id(chat_id),
 +         {:ok, cm_ref} <- MessageReference.mark_as_read(cm_ref) do
 +      conn
 +      |> put_view(MessageReferenceView)
 +      |> render("show.json", for: user, chat_message_reference: cm_ref)
 +    end
 +  end
 +
 +  def mark_as_read(
 +        %{body_params: %{last_read_id: last_read_id}, assigns: %{user: %{id: user_id}}} = conn,
 +        %{id: id}
 +      ) do
 +    with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id),
 +         {_n, _} <-
 +           MessageReference.set_all_seen_for_chat(chat, last_read_id) do
 +      conn
 +      |> put_view(ChatView)
 +      |> render("show.json", chat: chat)
 +    end
 +  end
 +
 +  def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{id: id} = params) do
 +    with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id) do
 +      cm_refs =
 +        chat
 +        |> MessageReference.for_chat_query()
++        |> Pagination.fetch_paginated(params)
 +
 +      conn
 +      |> put_view(MessageReferenceView)
 +      |> render("index.json", for: user, chat_message_references: cm_refs)
 +    else
 +      _ ->
 +        conn
 +        |> put_status(:not_found)
 +        |> json(%{error: "not found"})
 +    end
 +  end
 +
 +  def index(%{assigns: %{user: %{id: user_id} = user}} = conn, _params) do
 +    blocked_ap_ids = User.blocked_users_ap_ids(user)
 +
 +    chats =
 +      from(c in Chat,
 +        where: c.user_id == ^user_id,
 +        where: c.recipient not in ^blocked_ap_ids,
 +        order_by: [desc: c.updated_at]
 +      )
 +      |> Repo.all()
 +
 +    conn
 +    |> put_view(ChatView)
 +    |> render("index.json", chats: chats)
 +  end
 +
 +  def create(%{assigns: %{user: user}} = conn, params) do
 +    with %User{ap_id: recipient} <- User.get_by_id(params[:id]),
 +         {:ok, %Chat{} = chat} <- Chat.get_or_create(user.id, recipient) do
 +      conn
 +      |> put_view(ChatView)
 +      |> render("show.json", chat: chat)
 +    end
 +  end
 +
 +  def show(%{assigns: %{user: user}} = conn, params) do
 +    with %Chat{} = chat <- Repo.get_by(Chat, user_id: user.id, id: params[:id]) do
 +      conn
 +      |> put_view(ChatView)
 +      |> render("show.json", chat: chat)
 +    end
 +  end
 +end