summaryrefslogtreecommitdiff
path: root/packages/backend/src/models/schema
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-07-07 21:23:03 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2022-07-07 21:23:03 +0900
commit84d984bd31fa9863c3fe2e1aeb672ad0e2e8de4b (patch)
treea182502a5192992d873e7a7fcbf01662bb0dfca2 /packages/backend/src/models/schema
parentMerge pull request #8821 from misskey-dev/develop (diff)
parent12.112.1 (diff)
downloadmisskey-84d984bd31fa9863c3fe2e1aeb672ad0e2e8de4b.tar.gz
misskey-84d984bd31fa9863c3fe2e1aeb672ad0e2e8de4b.tar.bz2
misskey-84d984bd31fa9863c3fe2e1aeb672ad0e2e8de4b.zip
Merge branch 'develop'
Diffstat (limited to 'packages/backend/src/models/schema')
-rw-r--r--packages/backend/src/models/schema/federation-instance.ts13
-rw-r--r--packages/backend/src/models/schema/user.ts28
2 files changed, 29 insertions, 12 deletions
diff --git a/packages/backend/src/models/schema/federation-instance.ts b/packages/backend/src/models/schema/federation-instance.ts
index c4e7b3f18b..93327304f3 100644
--- a/packages/backend/src/models/schema/federation-instance.ts
+++ b/packages/backend/src/models/schema/federation-instance.ts
@@ -52,6 +52,10 @@ export const packedFederationInstanceSchema = {
type: 'boolean',
optional: false, nullable: false,
},
+ isBlocked: {
+ type: 'boolean',
+ optional: false, nullable: false,
+ },
softwareName: {
type: 'string',
optional: false, nullable: true,
@@ -88,6 +92,15 @@ export const packedFederationInstanceSchema = {
optional: false, nullable: true,
format: 'url',
},
+ faviconUrl: {
+ type: 'string',
+ optional: false, nullable: true,
+ format: 'url',
+ },
+ themeColor: {
+ type: 'string',
+ optional: false, nullable: true,
+ },
infoUpdatedAt: {
type: 'string',
optional: false, nullable: true,
diff --git a/packages/backend/src/models/schema/user.ts b/packages/backend/src/models/schema/user.ts
index 253681695d..1c8fe97858 100644
--- a/packages/backend/src/models/schema/user.ts
+++ b/packages/backend/src/models/schema/user.ts
@@ -161,19 +161,19 @@ export const packedUserDetailedNotMeOnlySchema = {
type: 'array',
nullable: false, optional: false,
items: {
- type: 'object',
- nullable: false, optional: false,
- properties: {
- name: {
- type: 'string',
- nullable: false, optional: false,
- },
- value: {
- type: 'string',
- nullable: false, optional: false,
- },
+ type: 'object',
+ nullable: false, optional: false,
+ properties: {
+ name: {
+ type: 'string',
+ nullable: false, optional: false,
},
- maxLength: 4,
+ value: {
+ type: 'string',
+ nullable: false, optional: false,
+ },
+ },
+ maxLength: 4,
},
},
followersCount: {
@@ -292,6 +292,10 @@ export const packedMeDetailedOnlySchema = {
type: 'boolean',
nullable: true, optional: false,
},
+ autoSensitive: {
+ type: 'boolean',
+ nullable: true, optional: false,
+ },
carefulBot: {
type: 'boolean',
nullable: true, optional: false,