projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into 'feature/local-only-scope'
[akkoma]
/
lib
/
pleroma
/
web
/
api_spec
/
operations
/
chat_operation.ex
diff --git
a/lib/pleroma/web/api_spec/operations/chat_operation.ex
b/lib/pleroma/web/api_spec/operations/chat_operation.ex
index cf299bfc264a39cbe05ed9fc554095bf1b7a45ad..0dcfdb35467ef2e04f5493ef04546bb124bffd9b 100644
(file)
--- a/
lib/pleroma/web/api_spec/operations/chat_operation.ex
+++ b/
lib/pleroma/web/api_spec/operations/chat_operation.ex
@@
-158,7
+158,8
@@
defmodule Pleroma.Web.ApiSpec.ChatOperation do
"The messages in the chat",
"application/json",
chat_messages_response()
"The messages in the chat",
"application/json",
chat_messages_response()
- )
+ ),
+ 404 => Operation.response("Not Found", "application/json", ApiError)
},
security: [
%{
},
security: [
%{
@@
-184,7
+185,8
@@
defmodule Pleroma.Web.ApiSpec.ChatOperation do
"application/json",
ChatMessage
),
"application/json",
ChatMessage
),
- 400 => Operation.response("Bad Request", "application/json", ApiError)
+ 400 => Operation.response("Bad Request", "application/json", ApiError),
+ 422 => Operation.response("MRF Rejection", "application/json", ApiError)
},
security: [
%{
},
security: [
%{
@@
-300,11
+302,11
@@
defmodule Pleroma.Web.ApiSpec.ChatOperation do
"content" => "Check this out :firefox:",
"id" => "13",
"chat_id" => "1",
"content" => "Check this out :firefox:",
"id" => "13",
"chat_id" => "1",
- "ac
tor
_id" => "someflakeid",
+ "ac
count
_id" => "someflakeid",
"unread" => false
},
%{
"unread" => false
},
%{
- "ac
tor
_id" => "someflakeid",
+ "ac
count
_id" => "someflakeid",
"content" => "Whats' up?",
"id" => "12",
"chat_id" => "1",
"content" => "Whats' up?",
"id" => "12",
"chat_id" => "1",