summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2023-05-02 16:21:25 +0000
committertamaina <tamaina@hotmail.co.jp>2023-05-02 16:21:25 +0000
commit58c3fc6cd27f9df44f29ff687728a5537630df5e (patch)
treedc2f1bf36a9d80a0297d985c30fe2ec3d445fad3 /packages/backend/src
parentfix (diff)
parentfix(backend): `fields`の誤った定義を修正 (#10737) (diff)
downloadmisskey-58c3fc6cd27f9df44f29ff687728a5537630df5e.tar.gz
misskey-58c3fc6cd27f9df44f29ff687728a5537630df5e.tar.bz2
misskey-58c3fc6cd27f9df44f29ff687728a5537630df5e.zip
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/models/json-schema/user.ts2
-rw-r--r--packages/backend/src/server/web/views/base.pug2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index 42b5d53acd..529c1303d1 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -148,6 +148,7 @@ export const packedUserDetailedNotMeOnlySchema = {
fields: {
type: 'array',
nullable: false, optional: false,
+ maxItems: 16,
items: {
type: 'object',
nullable: false, optional: false,
@@ -161,7 +162,6 @@ export const packedUserDetailedNotMeOnlySchema = {
nullable: false, optional: false,
},
},
- maxLength: 4,
},
},
followersCount: {
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index d772ac3184..cb5d05a403 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -36,7 +36,7 @@ html
link(rel='prefetch' href='https://xn--931a.moe/assets/not-found.jpg')
link(rel='prefetch' href='https://xn--931a.moe/assets/error.jpg')
//- https://github.com/misskey-dev/misskey/issues/9842
- link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css?v2.12.0')
+ link(rel='stylesheet' href='/assets/tabler-icons/tabler-icons.min.css?v2.17.0')
link(rel='modulepreload' href=`/vite/${clientEntry.file}`)
if !config.clientManifestExists