ChatController: Basic support for returning messages.

This commit is contained in:
lain 2020-04-09 16:59:49 +02:00
parent 68abea313d
commit e8fd0dd689
3 changed files with 69 additions and 0 deletions

View File

@ -5,10 +5,50 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
use Pleroma.Web, :controller use Pleroma.Web, :controller
alias Pleroma.Chat alias Pleroma.Chat
alias Pleroma.Object
alias Pleroma.Repo alias Pleroma.Repo
import Ecto.Query import Ecto.Query
def messages(%{assigns: %{user: %{id: user_id} = user}} = conn, %{"id" => id}) do
with %Chat{} = chat <- Repo.get_by(Chat, id: id, user_id: user_id) do
messages =
from(o in Object,
where: fragment("?->>'type' = ?", o.data, "ChatMessage"),
where:
fragment(
"""
(?->>'actor' = ? and ?->'to' = ?)
OR (?->>'actor' = ? and ?->'to' = ?)
""",
o.data,
^user.ap_id,
o.data,
^[chat.recipient],
o.data,
^chat.recipient,
o.data,
^[user.ap_id]
),
order_by: [desc: o.id]
)
|> Repo.all()
represented_messages =
messages
|> Enum.map(fn message ->
%{
actor: message.data["actor"],
id: message.id,
content: message.data["content"]
}
end)
conn
|> json(represented_messages)
end
end
def index(%{assigns: %{user: %{id: user_id}}} = conn, _params) do def index(%{assigns: %{user: %{id: user_id}}} = conn, _params) do
chats = chats =
from(c in Chat, from(c in Chat,

View File

@ -289,6 +289,7 @@ defmodule Pleroma.Web.Router do
post("/chats/by-ap-id/:ap_id", ChatController, :create) post("/chats/by-ap-id/:ap_id", ChatController, :create)
get("/chats", ChatController, :index) get("/chats", ChatController, :index)
get("/chats/:id/messages", ChatController, :messages)
end end
scope [] do scope [] do

View File

@ -5,9 +5,37 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
use Pleroma.Web.ConnCase, async: true use Pleroma.Web.ConnCase, async: true
alias Pleroma.Chat alias Pleroma.Chat
alias Pleroma.Web.CommonAPI
import Pleroma.Factory import Pleroma.Factory
describe "GET /api/v1/pleroma/chats/:id/messages" do
# TODO
# - Test that statuses don't show
# - Test the case where it's not the user's chat
# - Test the returned data
test "it returns the messages for a given chat", %{conn: conn} do
user = insert(:user)
other_user = insert(:user)
third_user = insert(:user)
{:ok, _} = CommonAPI.post_chat_message(user, other_user, "hey")
{:ok, _} = CommonAPI.post_chat_message(user, third_user, "hey")
{:ok, _} = CommonAPI.post_chat_message(user, other_user, "how are you?")
{:ok, _} = CommonAPI.post_chat_message(other_user, user, "fine, how about you?")
chat = Chat.get(user.id, other_user.ap_id)
result =
conn
|> assign(:user, user)
|> get("/api/v1/pleroma/chats/#{chat.id}/messages")
|> json_response(200)
assert length(result) == 3
end
end
describe "POST /api/v1/pleroma/chats/by-ap-id/:id" do describe "POST /api/v1/pleroma/chats/by-ap-id/:id" do
test "it creates or returns a chat", %{conn: conn} do test "it creates or returns a chat", %{conn: conn} do
user = insert(:user) user = insert(:user)