projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into cycles-streaming
[akkoma]
/
lib
/
pleroma
/
web
/
api_spec
/
schemas
/
status.ex
diff --git
a/lib/pleroma/web/api_spec/schemas/status.ex
b/lib/pleroma/web/api_spec/schemas/status.ex
index 61ebd8089c7a6256cf4df7ffb7823108b3e888cf..3d042dc19a225f2d4e268a97695241f9a1c2840d 100644
(file)
--- a/
lib/pleroma/web/api_spec/schemas/status.ex
+++ b/
lib/pleroma/web/api_spec/schemas/status.ex
@@
-23,9
+23,10
@@
defmodule Pleroma.Web.ApiSpec.Schemas.Status do
application: %Schema{
description: "The application used to post this status",
type: :object,
application: %Schema{
description: "The application used to post this status",
type: :object,
+ nullable: true,
properties: %{
name: %Schema{type: :string},
properties: %{
name: %Schema{type: :string},
- website: %Schema{type: :string,
nullable: true,
format: :uri}
+ website: %Schema{type: :string, format: :uri}
}
},
bookmarked: %Schema{type: :boolean, description: "Have you bookmarked this status?"},
}
},
bookmarked: %Schema{type: :boolean, description: "Have you bookmarked this status?"},
@@
-193,6
+194,13
@@
defmodule Pleroma.Web.ApiSpec.Schemas.Status do
parent_visible: %Schema{
type: :boolean,
description: "`true` if the parent post is visible to the user"
parent_visible: %Schema{
type: :boolean,
description: "`true` if the parent post is visible to the user"
+ },
+ pinned_at: %Schema{
+ type: :string,
+ format: "date-time",
+ nullable: true,
+ description:
+ "A datetime (ISO 8601) that states when the post was pinned or `null` if the post is not pinned"
}
}
},
}
}
},
@@
-291,7
+299,7
@@
defmodule Pleroma.Web.ApiSpec.Schemas.Status do
"url" => "http://localhost:4001/users/nick6",
"username" => "nick6"
},
"url" => "http://localhost:4001/users/nick6",
"username" => "nick6"
},
- "application" =>
%{"name" => "Web", "website" => nil}
,
+ "application" =>
nil
,
"bookmarked" => false,
"card" => nil,
"content" => "foobar",
"bookmarked" => false,
"card" => nil,
"content" => "foobar",