natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

user packとnote packの型不整合を修正

This commit is contained in:
tamaina 2021-09-12 00:46:38 +09:00
parent 8195be9371
commit 59580e9093
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/models/repositories/note.ts
View File

@ -447,11 +447,24 @@ export const packedNoteSchema = {
channel: {
type: 'object' as const,
optional: true as const, nullable: true as const,
ref: 'Channel' as const,
items: {
type: 'object' as const,
optional: false as const, nullable: false as const,
properties: {
id: {
type: 'string' as const,
optional: false as const, nullable: false as const,
},
name: {
type: 'string' as const,
optional: false as const, nullable: true as const,
},
},
},
},
localOnly: {
type: 'boolean' as const,
optional: false as const, nullable: true as const,
optional: true as const, nullable: false as const,
},
emojis: {
type: 'array' as const,
@ -466,7 +479,7 @@ export const packedNoteSchema = {
},
url: {
type: 'string' as const,
optional: false as const, nullable: false as const,
optional: false as const, nullable: true as const,
},
},
},
@ -485,11 +498,11 @@ export const packedNoteSchema = {
},
uri: {
type: 'string' as const,
optional: false as const, nullable: true as const,
optional: true as const, nullable: false as const,
},
url: {
type: 'string' as const,
optional: false as const, nullable: true as const,
optional: true as const, nullable: false as const,
},
myReaction: {

30
src/models/repositories/user.ts
View File

@ -375,12 +375,12 @@ export const packedUserSchema = {
},
isAdmin: {
type: 'boolean' as const,
nullable: false as const, optional: false as const,
nullable: false as const, optional: true as const,
default: false
},
isModerator: {
type: 'boolean' as const,
nullable: false as const, optional: false as const,
nullable: false as const, optional: true as const,
default: false
},
isBot: {
@ -402,23 +402,11 @@ export const packedUserSchema = {
type: 'string' as const,
nullable: false as const, optional: false as const
},
host: {
type: 'string' as const,
nullable: true as const, optional: false as const
},
url: {
type: 'string' as const,
nullable: false as const, optional: false as const,
format: 'url'
},
aliases: {
type: 'array' as const,
nullable: false as const, optional: false as const,
items: {
type: 'string' as const,
nullable: false as const, optional: false as const
}
}
}
}
},
@ -457,7 +445,7 @@ export const packedUserSchema = {
},
isSuspended: {
type: 'boolean' as const,
nullable: false as const, optional: false as const,
nullable: false as const, optional: true as const,
example: false
},
description: {
@ -476,7 +464,7 @@ export const packedUserSchema = {
},
fields: {
type: 'array' as const,
nullable: false as const, optional: false as const,
nullable: false as const, optional: true as const,
items: {
type: 'object' as const,
nullable: false as const, optional: false as const,
@ -525,26 +513,26 @@ export const packedUserSchema = {
},
pinnedPageId: {
type: 'string' as const,
nullable: true as const, optional: false as const
nullable: true as const, optional: true as const
},
pinnedPage: {
type: 'object' as const,
nullable: true as const, optional: false as const,
nullable: true as const, optional: true as const,
ref: 'Page' as const,
},
twoFactorEnabled: {
type: 'boolean' as const,
nullable: false as const, optional: false as const,
nullable: false as const, optional: true as const,
default: false
},
usePasswordLessLogin: {
type: 'boolean' as const,
nullable: false as const, optional: false as const,
nullable: false as const, optional: true as const,
default: false
},
securityKeys: {
type: 'boolean' as const,
nullable: false as const, optional: false as const,
nullable: false as const, optional: true as const,
default: false
},
avatarId: {