projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'account-notes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
api_spec
/
schemas
/
account.ex
diff --git
a/lib/pleroma/web/api_spec/schemas/account.ex
b/lib/pleroma/web/api_spec/schemas/account.ex
index 4f9b564d1e9e885f81919952bb1e22db25e00295..548e7054412f32a3874ef7bce139828bed0593ee 100644
(file)
--- a/
lib/pleroma/web/api_spec/schemas/account.ex
+++ b/
lib/pleroma/web/api_spec/schemas/account.ex
@@
-96,7
+96,7
@@
defmodule Pleroma.Web.ApiSpec.Schemas.Account do
hide_notification_contents: %Schema{type: :boolean}
}
},
hide_notification_contents: %Schema{type: :boolean}
}
},
- relationship:
AccountRelationship
,
+ relationship:
%Schema{allOf: [AccountRelationship], nullable: true}
,
settings_store: %Schema{
type: :object,
description:
settings_store: %Schema{
type: :object,
description:
@@
-194,9
+194,11
@@
defmodule Pleroma.Web.ApiSpec.Schemas.Account do
"id" => "9tKi3esbG7OQgZ2920",
"muting" => false,
"muting_notifications" => false,
"id" => "9tKi3esbG7OQgZ2920",
"muting" => false,
"muting_notifications" => false,
+ "note" => "",
"requested" => false,
"showing_reblogs" => true,
"requested" => false,
"showing_reblogs" => true,
- "subscribing" => false
+ "subscribing" => false,
+ "notifying" => false
},
"settings_store" => %{
"pleroma-fe" => %{}
},
"settings_store" => %{
"pleroma-fe" => %{}