summaryrefslogtreecommitdiff
path: root/src/api/endpoints/drive
diff options
context:
space:
mode:
Diffstat (limited to 'src/api/endpoints/drive')
-rw-r--r--src/api/endpoints/drive/files.ts10
-rw-r--r--src/api/endpoints/drive/files/create.ts6
-rw-r--r--src/api/endpoints/drive/files/find.ts10
-rw-r--r--src/api/endpoints/drive/files/show.ts8
-rw-r--r--src/api/endpoints/drive/files/update.ts22
-rw-r--r--src/api/endpoints/drive/files/upload_from_url.ts6
-rw-r--r--src/api/endpoints/drive/folders.ts10
-rw-r--r--src/api/endpoints/drive/folders/create.ts14
-rw-r--r--src/api/endpoints/drive/folders/find.ts10
-rw-r--r--src/api/endpoints/drive/folders/show.ts8
-rw-r--r--src/api/endpoints/drive/folders/update.ts32
-rw-r--r--src/api/endpoints/drive/stream.ts2
12 files changed, 69 insertions, 69 deletions
diff --git a/src/api/endpoints/drive/files.ts b/src/api/endpoints/drive/files.ts
index 89915331ea..1ce855932b 100644
--- a/src/api/endpoints/drive/files.ts
+++ b/src/api/endpoints/drive/files.ts
@@ -30,9 +30,9 @@ module.exports = async (params, user, app) => {
throw 'cannot set since_id and until_id';
}
- // Get 'folder_id' parameter
- const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
- if (folderIdErr) throw 'invalid folder_id param';
+ // Get 'folderId' parameter
+ const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
+ if (folderIdErr) throw 'invalid folderId param';
// Get 'type' parameter
const [type, typeErr] = $(params.type).optional.string().match(/^[a-zA-Z\/\-\*]+$/).$;
@@ -43,8 +43,8 @@ module.exports = async (params, user, app) => {
_id: -1
};
const query = {
- 'metadata.user_id': user._id,
- 'metadata.folder_id': folderId
+ 'metadata.userId': user._id,
+ 'metadata.folderId': folderId
} as any;
if (sinceId) {
sort._id = 1;
diff --git a/src/api/endpoints/drive/files/create.ts b/src/api/endpoints/drive/files/create.ts
index db801b61fe..2cd89a8fac 100644
--- a/src/api/endpoints/drive/files/create.ts
+++ b/src/api/endpoints/drive/files/create.ts
@@ -33,9 +33,9 @@ module.exports = async (file, params, user): Promise<any> => {
name = null;
}
- // Get 'folder_id' parameter
- const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
- if (folderIdErr) throw 'invalid folder_id param';
+ // Get 'folderId' parameter
+ const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
+ if (folderIdErr) throw 'invalid folderId param';
try {
// Create file
diff --git a/src/api/endpoints/drive/files/find.ts b/src/api/endpoints/drive/files/find.ts
index e026afe936..47ce891305 100644
--- a/src/api/endpoints/drive/files/find.ts
+++ b/src/api/endpoints/drive/files/find.ts
@@ -16,16 +16,16 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [name, nameErr] = $(params.name).string().$;
if (nameErr) return rej('invalid name param');
- // Get 'folder_id' parameter
- const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
- if (folderIdErr) return rej('invalid folder_id param');
+ // Get 'folderId' parameter
+ const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
+ if (folderIdErr) return rej('invalid folderId param');
// Issue query
const files = await DriveFile
.find({
filename: name,
- 'metadata.user_id': user._id,
- 'metadata.folder_id': folderId
+ 'metadata.userId': user._id,
+ 'metadata.folderId': folderId
});
// Serialize
diff --git a/src/api/endpoints/drive/files/show.ts b/src/api/endpoints/drive/files/show.ts
index 21664f7ba4..63920db7fc 100644
--- a/src/api/endpoints/drive/files/show.ts
+++ b/src/api/endpoints/drive/files/show.ts
@@ -12,15 +12,15 @@ import DriveFile, { pack } from '../../../models/drive-file';
* @return {Promise<any>}
*/
module.exports = async (params, user) => {
- // Get 'file_id' parameter
- const [fileId, fileIdErr] = $(params.file_id).id().$;
- if (fileIdErr) throw 'invalid file_id param';
+ // Get 'fileId' parameter
+ const [fileId, fileIdErr] = $(params.fileId).id().$;
+ if (fileIdErr) throw 'invalid fileId param';
// Fetch file
const file = await DriveFile
.findOne({
_id: fileId,
- 'metadata.user_id': user._id
+ 'metadata.userId': user._id
});
if (file === null) {
diff --git a/src/api/endpoints/drive/files/update.ts b/src/api/endpoints/drive/files/update.ts
index 83da462113..bfad45b0a2 100644
--- a/src/api/endpoints/drive/files/update.ts
+++ b/src/api/endpoints/drive/files/update.ts
@@ -14,15 +14,15 @@ import { publishDriveStream } from '../../../event';
* @return {Promise<any>}
*/
module.exports = (params, user) => new Promise(async (res, rej) => {
- // Get 'file_id' parameter
- const [fileId, fileIdErr] = $(params.file_id).id().$;
- if (fileIdErr) return rej('invalid file_id param');
+ // Get 'fileId' parameter
+ const [fileId, fileIdErr] = $(params.fileId).id().$;
+ if (fileIdErr) return rej('invalid fileId param');
// Fetch file
const file = await DriveFile
.findOne({
_id: fileId,
- 'metadata.user_id': user._id
+ 'metadata.userId': user._id
});
if (file === null) {
@@ -34,33 +34,33 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (nameErr) return rej('invalid name param');
if (name) file.filename = name;
- // Get 'folder_id' parameter
- const [folderId, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
- if (folderIdErr) return rej('invalid folder_id param');
+ // Get 'folderId' parameter
+ const [folderId, folderIdErr] = $(params.folderId).optional.nullable.id().$;
+ if (folderIdErr) return rej('invalid folderId param');
if (folderId !== undefined) {
if (folderId === null) {
- file.metadata.folder_id = null;
+ file.metadata.folderId = null;
} else {
// Fetch folder
const folder = await DriveFolder
.findOne({
_id: folderId,
- user_id: user._id
+ userId: user._id
});
if (folder === null) {
return rej('folder-not-found');
}
- file.metadata.folder_id = folder._id;
+ file.metadata.folderId = folder._id;
}
}
await DriveFile.update(file._id, {
$set: {
filename: file.filename,
- 'metadata.folder_id': file.metadata.folder_id
+ 'metadata.folderId': file.metadata.folderId
}
});
diff --git a/src/api/endpoints/drive/files/upload_from_url.ts b/src/api/endpoints/drive/files/upload_from_url.ts
index 346633c616..1a4ce0bf08 100644
--- a/src/api/endpoints/drive/files/upload_from_url.ts
+++ b/src/api/endpoints/drive/files/upload_from_url.ts
@@ -18,9 +18,9 @@ module.exports = async (params, user): Promise<any> => {
const [url, urlErr] = $(params.url).string().$;
if (urlErr) throw 'invalid url param';
- // Get 'folder_id' parameter
- const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
- if (folderIdErr) throw 'invalid folder_id param';
+ // Get 'folderId' parameter
+ const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
+ if (folderIdErr) throw 'invalid folderId param';
return pack(await uploadFromUrl(url, user, folderId));
};
diff --git a/src/api/endpoints/drive/folders.ts b/src/api/endpoints/drive/folders.ts
index 428bde3507..c259646352 100644
--- a/src/api/endpoints/drive/folders.ts
+++ b/src/api/endpoints/drive/folders.ts
@@ -30,17 +30,17 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
return rej('cannot set since_id and until_id');
}
- // Get 'folder_id' parameter
- const [folderId = null, folderIdErr] = $(params.folder_id).optional.nullable.id().$;
- if (folderIdErr) return rej('invalid folder_id param');
+ // Get 'folderId' parameter
+ const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$;
+ if (folderIdErr) return rej('invalid folderId param');
// Construct query
const sort = {
_id: -1
};
const query = {
- user_id: user._id,
- parent_id: folderId
+ userId: user._id,
+ parentId: folderId
} as any;
if (sinceId) {
sort._id = 1;
diff --git a/src/api/endpoints/drive/folders/create.ts b/src/api/endpoints/drive/folders/create.ts
index 03f396ddc9..564558606d 100644
--- a/src/api/endpoints/drive/folders/create.ts
+++ b/src/api/endpoints/drive/folders/create.ts
@@ -17,9 +17,9 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [name = '無題のフォルダー', nameErr] = $(params.name).optional.string().pipe(isValidFolderName).$;
if (nameErr) return rej('invalid name param');
- // Get 'parent_id' parameter
- const [parentId = null, parentIdErr] = $(params.parent_id).optional.nullable.id().$;
- if (parentIdErr) return rej('invalid parent_id param');
+ // Get 'parentId' parameter
+ const [parentId = null, parentIdErr] = $(params.parentId).optional.nullable.id().$;
+ if (parentIdErr) return rej('invalid parentId param');
// If the parent folder is specified
let parent = null;
@@ -28,7 +28,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
parent = await DriveFolder
.findOne({
_id: parentId,
- user_id: user._id
+ userId: user._id
});
if (parent === null) {
@@ -38,10 +38,10 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
// Create folder
const folder = await DriveFolder.insert({
- created_at: new Date(),
+ createdAt: new Date(),
name: name,
- parent_id: parent !== null ? parent._id : null,
- user_id: user._id
+ parentId: parent !== null ? parent._id : null,
+ userId: user._id
});
// Serialize
diff --git a/src/api/endpoints/drive/folders/find.ts b/src/api/endpoints/drive/folders/find.ts
index fc84766bc8..f46aaedd32 100644
--- a/src/api/endpoints/drive/folders/find.ts
+++ b/src/api/endpoints/drive/folders/find.ts
@@ -16,16 +16,16 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const [name, nameErr] = $(params.name).string().$;
if (nameErr) return rej('invalid name param');
- // Get 'parent_id' parameter
- const [parentId = null, parentIdErr] = $(params.parent_id).optional.nullable.id().$;
- if (parentIdErr) return rej('invalid parent_id param');
+ // Get 'parentId' parameter
+ const [parentId = null, parentIdErr] = $(params.parentId).optional.nullable.id().$;
+ if (parentIdErr) return rej('invalid parentId param');
// Issue query
const folders = await DriveFolder
.find({
name: name,
- user_id: user._id,
- parent_id: parentId
+ userId: user._id,
+ parentId: parentId
});
// Serialize
diff --git a/src/api/endpoints/drive/folders/show.ts b/src/api/endpoints/drive/folders/show.ts
index e07d14d20d..a6d7e86df1 100644
--- a/src/api/endpoints/drive/folders/show.ts
+++ b/src/api/endpoints/drive/folders/show.ts
@@ -12,15 +12,15 @@ import DriveFolder, { pack } from '../../../models/drive-folder';
* @return {Promise<any>}
*/
module.exports = (params, user) => new Promise(async (res, rej) => {
- // Get 'folder_id' parameter
- const [folderId, folderIdErr] = $(params.folder_id).id().$;
- if (folderIdErr) return rej('invalid folder_id param');
+ // Get 'folderId' parameter
+ const [folderId, folderIdErr] = $(params.folderId).id().$;
+ if (folderIdErr) return rej('invalid folderId param');
// Get folder
const folder = await DriveFolder
.findOne({
_id: folderId,
- user_id: user._id
+ userId: user._id
});
if (folder === null) {
diff --git a/src/api/endpoints/drive/folders/update.ts b/src/api/endpoints/drive/folders/update.ts
index d3df8bdae5..fcfd241241 100644
--- a/src/api/endpoints/drive/folders/update.ts
+++ b/src/api/endpoints/drive/folders/update.ts
@@ -13,15 +13,15 @@ import { publishDriveStream } from '../../../event';
* @return {Promise<any>}
*/
module.exports = (params, user) => new Promise(async (res, rej) => {
- // Get 'folder_id' parameter
- const [folderId, folderIdErr] = $(params.folder_id).id().$;
- if (folderIdErr) return rej('invalid folder_id param');
+ // Get 'folderId' parameter
+ const [folderId, folderIdErr] = $(params.folderId).id().$;
+ if (folderIdErr) return rej('invalid folderId param');
// Fetch folder
const folder = await DriveFolder
.findOne({
_id: folderId,
- user_id: user._id
+ userId: user._id
});
if (folder === null) {
@@ -33,18 +33,18 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (nameErr) return rej('invalid name param');
if (name) folder.name = name;
- // Get 'parent_id' parameter
- const [parentId, parentIdErr] = $(params.parent_id).optional.nullable.id().$;
- if (parentIdErr) return rej('invalid parent_id param');
+ // Get 'parentId' parameter
+ const [parentId, parentIdErr] = $(params.parentId).optional.nullable.id().$;
+ if (parentIdErr) return rej('invalid parentId param');
if (parentId !== undefined) {
if (parentId === null) {
- folder.parent_id = null;
+ folder.parentId = null;
} else {
// Get parent folder
const parent = await DriveFolder
.findOne({
_id: parentId,
- user_id: user._id
+ userId: user._id
});
if (parent === null) {
@@ -58,25 +58,25 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
_id: folderId
}, {
_id: true,
- parent_id: true
+ parentId: true
});
if (folder2._id.equals(folder._id)) {
return true;
- } else if (folder2.parent_id) {
- return await checkCircle(folder2.parent_id);
+ } else if (folder2.parentId) {
+ return await checkCircle(folder2.parentId);
} else {
return false;
}
}
- if (parent.parent_id !== null) {
- if (await checkCircle(parent.parent_id)) {
+ if (parent.parentId !== null) {
+ if (await checkCircle(parent.parentId)) {
return rej('detected-circular-definition');
}
}
- folder.parent_id = parent._id;
+ folder.parentId = parent._id;
}
}
@@ -84,7 +84,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
DriveFolder.update(folder._id, {
$set: {
name: folder.name,
- parent_id: folder.parent_id
+ parentId: folder.parentId
}
});
diff --git a/src/api/endpoints/drive/stream.ts b/src/api/endpoints/drive/stream.ts
index 8352c7dd4c..0f9cea9f1d 100644
--- a/src/api/endpoints/drive/stream.ts
+++ b/src/api/endpoints/drive/stream.ts
@@ -38,7 +38,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
_id: -1
};
const query = {
- 'metadata.user_id': user._id
+ 'metadata.userId': user._id
} as any;
if (sinceId) {
sort._id = 1;
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 22:56:41 +0000