summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/drive
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/api/endpoints/drive')
-rw-r--r--src/server/api/endpoints/drive/files.ts10
-rw-r--r--src/server/api/endpoints/drive/files/create.ts6
-rw-r--r--src/server/api/endpoints/drive/files/find.ts2
-rw-r--r--src/server/api/endpoints/drive/files/show.ts4
-rw-r--r--src/server/api/endpoints/drive/files/update.ts6
-rw-r--r--src/server/api/endpoints/drive/files/upload_from_url.ts6
-rw-r--r--src/server/api/endpoints/drive/folders.ts8
-rw-r--r--src/server/api/endpoints/drive/folders/create.ts4
-rw-r--r--src/server/api/endpoints/drive/folders/find.ts2
-rw-r--r--src/server/api/endpoints/drive/folders/update.ts4
-rw-r--r--src/server/api/endpoints/drive/stream.ts8
11 files changed, 30 insertions, 30 deletions
diff --git a/src/server/api/endpoints/drive/files.ts b/src/server/api/endpoints/drive/files.ts
index 99e5e36ef3..6b96313910 100644
--- a/src/server/api/endpoints/drive/files.ts
+++ b/src/server/api/endpoints/drive/files.ts
@@ -15,28 +15,28 @@ export const meta = {
params: {
limit: {
- validator: $.num.optional.range(1, 100),
+ validator: $.optional.num.range(1, 100),
default: 10
},
sinceId: {
- validator: $.type(ID).optional,
+ validator: $.optional.type(ID),
transform: transform,
},
untilId: {
- validator: $.type(ID).optional,
+ validator: $.optional.type(ID),
transform: transform,
},
folderId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
default: null as any,
transform: transform,
},
type: {
- validator: $.str.optional.match(/^[a-zA-Z\/\-\*]+$/)
+ validator: $.optional.str.match(/^[a-zA-Z\/\-\*]+$/)
}
}
};
diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index eacaa3f64f..3611652b6c 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -25,7 +25,7 @@ export const meta = {
params: {
folderId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
transform: transform,
default: null as any,
desc: {
@@ -34,7 +34,7 @@ export const meta = {
},
isSensitive: {
- validator: $.or($.bool, $.str).optional,
+ validator: $.optional.or($.bool, $.str),
default: false,
transform: (v: any): boolean => v === true || v === 'true',
desc: {
@@ -44,7 +44,7 @@ export const meta = {
},
force: {
- validator: $.or($.bool, $.str).optional,
+ validator: $.optional.or($.bool, $.str),
default: false,
transform: (v: any): boolean => v === true || v === 'true',
desc: {
diff --git a/src/server/api/endpoints/drive/files/find.ts b/src/server/api/endpoints/drive/files/find.ts
index 691ad6123d..0ebd5b789e 100644
--- a/src/server/api/endpoints/drive/files/find.ts
+++ b/src/server/api/endpoints/drive/files/find.ts
@@ -14,7 +14,7 @@ export const meta = {
},
folderId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
transform: transform,
default: null as any,
desc: {
diff --git a/src/server/api/endpoints/drive/files/show.ts b/src/server/api/endpoints/drive/files/show.ts
index e6d85a5efb..994583bd01 100644
--- a/src/server/api/endpoints/drive/files/show.ts
+++ b/src/server/api/endpoints/drive/files/show.ts
@@ -19,7 +19,7 @@ export const meta = {
params: {
fileId: {
- validator: $.type(ID).optional,
+ validator: $.optional.type(ID),
transform: transform,
desc: {
'ja-JP': '対象のファイルID',
@@ -28,7 +28,7 @@ export const meta = {
},
url: {
- validator: $.str.optional,
+ validator: $.optional.str,
desc: {
'ja-JP': '対象のファイルのURL',
'en-US': 'Target file URL'
diff --git a/src/server/api/endpoints/drive/files/update.ts b/src/server/api/endpoints/drive/files/update.ts
index 4db493c1d0..79acbec3cd 100644
--- a/src/server/api/endpoints/drive/files/update.ts
+++ b/src/server/api/endpoints/drive/files/update.ts
@@ -26,7 +26,7 @@ export const meta = {
},
folderId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
transform: transform,
default: undefined as any,
desc: {
@@ -35,7 +35,7 @@ export const meta = {
},
name: {
- validator: $.str.optional.pipe(validateFileName),
+ validator: $.optional.str.pipe(validateFileName),
default: undefined as any,
desc: {
'ja-JP': 'ファイル名',
@@ -44,7 +44,7 @@ export const meta = {
},
isSensitive: {
- validator: $.bool.optional,
+ validator: $.optional.bool,
default: undefined as any,
desc: {
'ja-JP': 'このメディアが「閲覧注意」(NSFW)かどうか',
diff --git a/src/server/api/endpoints/drive/files/upload_from_url.ts b/src/server/api/endpoints/drive/files/upload_from_url.ts
index c67df49ea0..d79b321735 100644
--- a/src/server/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/server/api/endpoints/drive/files/upload_from_url.ts
@@ -26,13 +26,13 @@ export const meta = {
},
folderId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
default: null as any,
transform: transform
},
isSensitive: {
- validator: $.bool.optional,
+ validator: $.optional.bool,
default: false,
desc: {
'ja-JP': 'このメディアが「閲覧注意」(NSFW)かどうか',
@@ -41,7 +41,7 @@ export const meta = {
},
force: {
- validator: $.bool.optional,
+ validator: $.optional.bool,
default: false,
desc: {
'ja-JP': 'true にすると、同じハッシュを持つファイルが既にアップロードされていても強制的にファイルを作成します。',
diff --git a/src/server/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts
index 7ada01d90b..bdbbf35ff1 100644
--- a/src/server/api/endpoints/drive/folders.ts
+++ b/src/server/api/endpoints/drive/folders.ts
@@ -15,22 +15,22 @@ export const meta = {
params: {
limit: {
- validator: $.num.optional.range(1, 100),
+ validator: $.optional.num.range(1, 100),
default: 10
},
sinceId: {
- validator: $.type(ID).optional,
+ validator: $.optional.type(ID),
transform: transform,
},
untilId: {
- validator: $.type(ID).optional,
+ validator: $.optional.type(ID),
transform: transform,
},
folderId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
default: null as any,
transform: transform,
}
diff --git a/src/server/api/endpoints/drive/folders/create.ts b/src/server/api/endpoints/drive/folders/create.ts
index 1aca521a76..f4b520be28 100644
--- a/src/server/api/endpoints/drive/folders/create.ts
+++ b/src/server/api/endpoints/drive/folders/create.ts
@@ -18,7 +18,7 @@ export const meta = {
params: {
name: {
- validator: $.str.optional.pipe(isValidFolderName),
+ validator: $.optional.str.pipe(isValidFolderName),
default: 'Untitled',
desc: {
'ja-JP': 'フォルダ名',
@@ -27,7 +27,7 @@ export const meta = {
},
parentId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
transform: transform,
desc: {
'ja-JP': '親フォルダID',
diff --git a/src/server/api/endpoints/drive/folders/find.ts b/src/server/api/endpoints/drive/folders/find.ts
index 453153c507..bbf496150a 100644
--- a/src/server/api/endpoints/drive/folders/find.ts
+++ b/src/server/api/endpoints/drive/folders/find.ts
@@ -14,7 +14,7 @@ export const meta = {
},
parentId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
transform: transform,
default: null as any,
desc: {
diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts
index 3207594367..9c515474cd 100644
--- a/src/server/api/endpoints/drive/folders/update.ts
+++ b/src/server/api/endpoints/drive/folders/update.ts
@@ -27,7 +27,7 @@ export const meta = {
},
name: {
- validator: $.str.optional.pipe(isValidFolderName),
+ validator: $.optional.str.pipe(isValidFolderName),
desc: {
'ja-JP': 'フォルダ名',
'en-US': 'Folder name'
@@ -35,7 +35,7 @@ export const meta = {
},
parentId: {
- validator: $.type(ID).optional.nullable,
+ validator: $.optional.nullable.type(ID),
transform: transform,
desc: {
'ja-JP': '親フォルダID',
diff --git a/src/server/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts
index ec373889b5..c48ed8c37c 100644
--- a/src/server/api/endpoints/drive/stream.ts
+++ b/src/server/api/endpoints/drive/stream.ts
@@ -10,22 +10,22 @@ export const meta = {
params: {
limit: {
- validator: $.num.optional.range(1, 100),
+ validator: $.optional.num.range(1, 100),
default: 10
},
sinceId: {
- validator: $.type(ID).optional,
+ validator: $.optional.type(ID),
transform: transform,
},
untilId: {
- validator: $.type(ID).optional,
+ validator: $.optional.type(ID),
transform: transform,
},
type: {
- validator: $.str.optional.match(/^[a-zA-Z\/\-\*]+$/)
+ validator: $.optional.str.match(/^[a-zA-Z\/\-\*]+$/)
}
}
};