projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'test-docker-images' 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 70437003c3cd82a33a6408b2a4277b9631977275..bd7143ab959420bb00e9b2ab2264cf3777f27fa1 100644
(file)
--- a/
lib/pleroma/web/api_spec/schemas/account.ex
+++ b/
lib/pleroma/web/api_spec/schemas/account.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ApiSpec.Schemas.Account do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ApiSpec.Schemas.Account do
@@
-48,7
+48,7
@@
defmodule Pleroma.Web.ApiSpec.Schemas.Account do
},
background_image: %Schema{type: :string, nullable: true, format: :uri},
chat_token: %Schema{type: :string},
},
background_image: %Schema{type: :string, nullable: true, format: :uri},
chat_token: %Schema{type: :string},
-
confirmation_pending
: %Schema{
+
is_confirmed
: %Schema{
type: :boolean,
description:
"whether the user account is waiting on email confirmation to be activated"
type: :boolean,
description:
"whether the user account is waiting on email confirmation to be activated"
@@
-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:
@@
-166,7
+166,7
@@
defmodule Pleroma.Web.ApiSpec.Schemas.Account do
"pleroma" => %{
"allow_following_move" => true,
"background_image" => nil,
"pleroma" => %{
"allow_following_move" => true,
"background_image" => nil,
- "
confirmation_pending" => tru
e,
+ "
is_confirmed" => fals
e,
"hide_favorites" => true,
"hide_followers" => false,
"hide_followers_count" => false,
"hide_favorites" => true,
"hide_followers" => false,
"hide_followers_count" => false,