Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Chat API: Align more to Pleroma/Mastodon API.

Browse Source
This commit is contained in:
lain 2020-04-27 17:48:34 +02:00
parent 49e673dfea
commit ad82a216ff
10 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/pleroma/web/api_spec/operations/chat_operation.ex
View File

@ -23,12 +23,12 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
operationId: "ChatController.create",
parameters: [
Operation.parameter(
:ap_id,
:id,
:path,
:string,
"The ActivityPub id of the recipient of this chat.",
"The account id of the recipient of this chat",
required: true,
example: "https://lain.com/users/lain"
example: "someflakeid"
)
],
responses: %{
@ -128,8 +128,7 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
items: ChatResponse,
example: [
%{
"recipient" => "https://dontbulling.me/users/lain",
"recipient_account" => %{
"account" => %{
"pleroma" => %{
"is_admin" => false,
"confirmation_pending" => false,
@ -202,10 +201,10 @@ defmodule Pleroma.Web.ApiSpec.ChatOperation do
"content" => "Check this out :firefox:",
"id" => "13",
"chat_id" => "1",
"actor" => "https://dontbulling.me/users/lain"
"actor_id" => "someflakeid"
},
%{
"actor" => "https://dontbulling.me/users/lain",
"actor_id" => "someflakeid",
"content" => "Whats' up?",
"id" => "12",
"chat_id" => "1",

6
lib/pleroma/web/api_spec/schemas/chat_message_response.ex
View File

@ -13,16 +13,14 @@ defmodule Pleroma.Web.ApiSpec.Schemas.ChatMessageResponse do
type: :object,
properties: %{
id: %Schema{type: :string},
actor: %Schema{type: :string, description: "The ActivityPub id of the actor"},
actor_account_id: %Schema{type: :string, description: "The Mastodon API id of the actor"},
account_id: %Schema{type: :string, description: "The Mastodon API id of the actor"},
chat_id: %Schema{type: :string},
content: %Schema{type: :string},
created_at: %Schema{type: :string, format: :datetime},
emojis: %Schema{type: :array}
},
example: %{
"actor" => "https://dontbulling.me/users/lain",
"actor_account_id" => "someflakeid",
"account_id" => "someflakeid",
"chat_id" => "1",
"content" => "hey you again",
"created_at" => "2020-04-21T15:06:45.000Z",

11
lib/pleroma/web/api_spec/schemas/chat_response.ex
View File

@ -12,15 +12,12 @@ defmodule Pleroma.Web.ApiSpec.Schemas.ChatResponse do
description: "Response schema for a Chat",
type: :object,
properties: %{
id: %Schema{type: :string},
recipient: %Schema{type: :string},
# TODO: Make this reference the account structure.
recipient_account: %Schema{type: :object},
unread: %Schema{type: :integer}
id: %Schema{type: :string, nullable: false},
account: %Schema{type: :object, nullable: false},
unread: %Schema{type: :integer, nullable: false}
},
example: %{
"recipient" => "https://dontbulling.me/users/lain",
"recipient_account" => %{
"account" => %{
"pleroma" => %{
"is_admin" => false,
"confirmation_pending" => false,

5
lib/pleroma/web/pleroma_api/controllers/chat_controller.ex
View File

@ -99,9 +99,8 @@ defmodule Pleroma.Web.PleromaAPI.ChatController do
end
def create(%{assigns: %{user: user}} = conn, params) do
recipient = params[:ap_id]
with {:ok, %Chat{} = chat} <- Chat.get_or_create(user.id, recipient) 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)

3
lib/pleroma/web/pleroma_api/views/chat_message_view.ex
View File

@ -21,8 +21,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatMessageView do
id: id |> to_string(),
content: chat_message["content"],
chat_id: chat_id |> to_string(),
actor: chat_message["actor"],
actor_account_id: User.get_cached_by_ap_id(chat_message["actor"]).id,
account_id: User.get_cached_by_ap_id(chat_message["actor"]).id,
created_at: Utils.to_masto_date(chat_message["published"]),
emojis: StatusView.build_emojis(chat_message["emoji"])
}

3
lib/pleroma/web/pleroma_api/views/chat_view.ex
View File

@ -14,8 +14,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatView do
%{
id: chat.id |> to_string(),
recipient: chat.recipient,
recipient_account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
account: AccountView.render("show.json", Map.put(opts, :user, recipient)),
unread: chat.unread
}
end

2
lib/pleroma/web/router.ex
View File

@ -275,7 +275,7 @@ defmodule Pleroma.Web.Router do
scope [] do
pipe_through(:authenticated_api)
post("/chats/by-ap-id/:ap_id", ChatController, :create)
post("/chats/by-account-id/:id", ChatController, :create)
get("/chats", ChatController, :index)
get("/chats/:id/messages", ChatController, :messages)
post("/chats/:id/messages", ChatController, :post_chat_message)

4
test/web/pleroma_api/controllers/chat_controller_test.exs
View File

@ -88,7 +88,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
end
end
describe "POST /api/v1/pleroma/chats/by-ap-id/:id" do
describe "POST /api/v1/pleroma/chats/by-account-id/:id" do
setup do: oauth_access(["write:statuses"])
test "it creates or returns a chat", %{conn: conn} do
@ -96,7 +96,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
result =
conn
|> post("/api/v1/pleroma/chats/by-ap-id/#{URI.encode_www_form(other_user.ap_id)}")
|> post("/api/v1/pleroma/chats/by-account-id/#{other_user.id}")
|> json_response_and_validate_schema(200)
assert result["id"]

6
test/web/pleroma_api/views/chat_message_view_test.exs
View File

@ -25,8 +25,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatMessageViewTest do
assert chat_message[:id] == object.id |> to_string()
assert chat_message[:content] == "kippis :firefox:"
assert chat_message[:actor] == user.ap_id
assert chat_message[:actor_account_id] == user.id
assert chat_message[:account_id] == user.id
assert chat_message[:chat_id]
assert chat_message[:created_at]
assert match?([%{shortcode: "firefox"}], chat_message[:emojis])
@ -39,8 +38,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatMessageViewTest do
assert chat_message_two[:id] == object.id |> to_string()
assert chat_message_two[:content] == "gkgkgk"
assert chat_message_two[:actor] == recipient.ap_id
assert chat_message_two[:actor_account_id] == recipient.id
assert chat_message_two[:account_id] == recipient.id
assert chat_message_two[:chat_id] == chat_message[:chat_id]
end
end

3
test/web/pleroma_api/views/chat_view_test.exs
View File

@ -21,8 +21,7 @@ defmodule Pleroma.Web.PleromaAPI.ChatViewTest do
assert represented_chat == %{
id: "#{chat.id}",
recipient: recipient.ap_id,
recipient_account: AccountView.render("show.json", user: recipient),
account: AccountView.render("show.json", user: recipient),
unread: 0
}
end