curse/Curse
1
0
Fork 0
mirror of https://github.com/misskey-dev/misskey.git synced 2026-03-24 13:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into swn

Browse Source
This commit is contained in:
tamaina
2021-10-07 14:33:10 +09:00
parent d5af62836b 67875e2afa
commit abdd627006
223 changed files with 3373 additions and 2658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/api/endpoints/admin/drive/files.ts
View File

@@ -25,7 +25,7 @@ export const meta = {
},
type: {
validator: $.optional.nullable.str.match(/^[a-zA-Z\/\-*]+$/)
validator: $.optional.nullable.str.match(/^[a-zA-Z0-9\/\-*]+$/)
},
origin: {

3
src/server/api/endpoints/drive/files/update.ts
View File

@@ -4,6 +4,7 @@ import { publishDriveStream } from '@/services/stream';
import define from '../../../define';
import { ApiError } from '../../../error';
import { DriveFiles, DriveFolders } from '@/models/index';
import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits';
export const meta = {
tags: ['drive'],
@@ -33,7 +34,7 @@ export const meta = {
},
comment: {
validator: $.optional.nullable.str,
validator: $.optional.nullable.str.max(DB_MAX_IMAGE_COMMENT_LENGTH),
default: undefined as any,
}
},

3
src/server/api/endpoints/drive/files/upload-from-url.ts
View File

@@ -5,6 +5,7 @@ import uploadFromUrl from '@/services/drive/upload-from-url';
import define from '../../../define';
import { DriveFiles } from '@/models/index';
import { publishMainStream } from '@/services/stream';
import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits';
export const meta = {
tags: ['drive'],
@@ -35,7 +36,7 @@ export const meta = {
},
comment: {
validator: $.optional.nullable.str,
validator: $.optional.nullable.str.max(DB_MAX_IMAGE_COMMENT_LENGTH),
default: null,
},