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.ts48
-rw-r--r--src/server/api/endpoints/drive/files/attached-notes.ts23
-rw-r--r--src/server/api/endpoints/drive/files/check-existence.ts13
-rw-r--r--src/server/api/endpoints/drive/files/create.ts11
-rw-r--r--src/server/api/endpoints/drive/files/delete.ts21
-rw-r--r--src/server/api/endpoints/drive/files/find.ts20
-rw-r--r--src/server/api/endpoints/drive/files/show.ts54
-rw-r--r--src/server/api/endpoints/drive/files/update.ts70
-rw-r--r--src/server/api/endpoints/drive/files/upload-from-url.ts9
-rw-r--r--src/server/api/endpoints/drive/folders.ts41
-rw-r--r--src/server/api/endpoints/drive/folders/create.ts32
-rw-r--r--src/server/api/endpoints/drive/folders/delete.ts29
-rw-r--r--src/server/api/endpoints/drive/folders/find.ts20
-rw-r--r--src/server/api/endpoints/drive/folders/show.ts20
-rw-r--r--src/server/api/endpoints/drive/folders/update.ts57
-rw-r--r--src/server/api/endpoints/drive/stream.ts44
16 files changed, 195 insertions, 317 deletions
diff --git a/src/server/api/endpoints/drive/files.ts b/src/server/api/endpoints/drive/files.ts
index f108e820e7..400b73d3b7 100644
--- a/src/server/api/endpoints/drive/files.ts
+++ b/src/server/api/endpoints/drive/files.ts
@@ -1,7 +1,8 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import DriveFile, { packMany } from '../../../../models/drive-file';
+import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
+import { DriveFiles } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
desc: {
@@ -13,7 +14,7 @@ export const meta = {
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
limit: {
@@ -23,18 +24,15 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
- transform: transform,
},
untilId: {
validator: $.optional.type(ID),
- transform: transform,
},
folderId: {
validator: $.optional.nullable.type(ID),
default: null as any,
- transform: transform,
},
type: {
@@ -51,36 +49,24 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const sort = {
- _id: -1
- };
+ const query = makePaginationQuery(DriveFiles.createQueryBuilder('file'), ps.sinceId, ps.untilId)
+ .andWhere('file.userId = :userId', { userId: user.id });
- const query = {
- 'metadata.userId': user._id,
- 'metadata.folderId': ps.folderId,
- 'metadata.deletedAt': { $exists: false }
- } as any;
-
- if (ps.sinceId) {
- sort._id = 1;
- query._id = {
- $gt: ps.sinceId
- };
- } else if (ps.untilId) {
- query._id = {
- $lt: ps.untilId
- };
+ if (ps.folderId) {
+ query.andWhere('file.folderId = :folderId', { folderId: ps.folderId });
+ } else {
+ query.andWhere('file.folderId IS NULL');
}
if (ps.type) {
- query.contentType = new RegExp(`^${ps.type.replace(/\*/g, '.+?')}$`);
+ if (ps.type.endsWith('/*')) {
+ query.andWhere('file.type like :type', { type: ps.type.replace('/*', '/') + '%' });
+ } else {
+ query.andWhere('file.type = :type', { type: ps.type });
+ }
}
- const files = await DriveFile
- .find(query, {
- limit: ps.limit,
- sort: sort
- });
+ const files = await query.take(ps.limit).getMany();
- return await packMany(files, { detail: false, self: true });
+ return await DriveFiles.packMany(files, { detail: false, self: true });
});
diff --git a/src/server/api/endpoints/drive/files/attached-notes.ts b/src/server/api/endpoints/drive/files/attached-notes.ts
index c9eeab58c5..7214463dde 100644
--- a/src/server/api/endpoints/drive/files/attached-notes.ts
+++ b/src/server/api/endpoints/drive/files/attached-notes.ts
@@ -1,9 +1,8 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFile from '../../../../../models/drive-file';
+import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
-import { packMany } from '../../../../../models/note';
import { ApiError } from '../../../error';
+import { DriveFiles } from '../../../../../models';
export const meta = {
stability: 'stable',
@@ -17,12 +16,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
fileId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のファイルID',
'en-US': 'Target file ID'
@@ -48,18 +46,17 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Fetch file
- const file = await DriveFile
- .findOne({
- _id: ps.fileId,
- 'metadata.userId': user._id,
- 'metadata.deletedAt': { $exists: false }
- });
+ const file = await DriveFiles.findOne({
+ id: ps.fileId,
+ userId: user.id,
+ });
- if (file === null) {
+ if (file == null) {
throw new ApiError(meta.errors.noSuchFile);
}
+ /* v11 TODO
return await packMany(file.metadata.attachedNoteIds || [], user, {
detail: true
- });
+ });*/
});
diff --git a/src/server/api/endpoints/drive/files/check-existence.ts b/src/server/api/endpoints/drive/files/check-existence.ts
index 926411c83a..3a87a9497f 100644
--- a/src/server/api/endpoints/drive/files/check-existence.ts
+++ b/src/server/api/endpoints/drive/files/check-existence.ts
@@ -1,6 +1,6 @@
import $ from 'cafy';
-import DriveFile, { pack } from '../../../../../models/drive-file';
import define from '../../../define';
+import { DriveFiles } from '../../../../../models';
export const meta = {
desc: {
@@ -12,7 +12,7 @@ export const meta = {
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
md5: {
@@ -29,11 +29,12 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const file = await DriveFile.findOne({
+ const file = await DriveFiles.findOne({
md5: ps.md5,
- 'metadata.userId': user._id,
- 'metadata.deletedAt': { $exists: false }
+ userId: user.id,
});
- return { file: file ? await pack(file, { self: true }) : null };
+ return {
+ file: file ? await DriveFiles.pack(file, { self: true }) : null
+ };
});
diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index b2979c4888..5702c70fc0 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -1,11 +1,11 @@
import * as ms from 'ms';
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import { validateFileName, pack } from '../../../../../models/drive-file';
+import { ID } from '../../../../../misc/cafy-id';
import create from '../../../../../services/drive/add-file';
import define from '../../../define';
import { apiLogger } from '../../../logger';
import { ApiError } from '../../../error';
+import { DriveFiles } from '../../../../../models';
export const meta = {
desc: {
@@ -24,12 +24,11 @@ export const meta = {
requireFile: true,
- kind: 'drive-write',
+ kind: 'write:drive',
params: {
folderId: {
validator: $.optional.nullable.type(ID),
- transform: transform,
default: null as any,
desc: {
'ja-JP': 'フォルダID'
@@ -78,7 +77,7 @@ export default define(meta, async (ps, user, app, file, cleanup) => {
name = null;
} else if (name === 'blob') {
name = null;
- } else if (!validateFileName(name)) {
+ } else if (!DriveFiles.validateFileName(name)) {
throw new ApiError(meta.errors.invalidFileName);
}
} else {
@@ -88,7 +87,7 @@ export default define(meta, async (ps, user, app, file, cleanup) => {
try {
// Create file
const driveFile = await create(user, file.path, name, null, ps.folderId, ps.force, false, null, null, ps.isSensitive);
- return pack(driveFile, { self: true });
+ return DriveFiles.pack(driveFile, { self: true });
} catch (e) {
apiLogger.error(e);
throw new ApiError();
diff --git a/src/server/api/endpoints/drive/files/delete.ts b/src/server/api/endpoints/drive/files/delete.ts
index dd4e187fcd..d8cc5ec0a1 100644
--- a/src/server/api/endpoints/drive/files/delete.ts
+++ b/src/server/api/endpoints/drive/files/delete.ts
@@ -1,10 +1,10 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFile from '../../../../../models/drive-file';
+import { ID } from '../../../../../misc/cafy-id';
import del from '../../../../../services/drive/delete-file';
import { publishDriveStream } from '../../../../../services/stream';
import define from '../../../define';
import { ApiError } from '../../../error';
+import { DriveFiles } from '../../../../../models';
export const meta = {
stability: 'stable',
@@ -18,12 +18,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-write',
+ kind: 'write:drive',
params: {
fileId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のファイルID',
'en-US': 'Target file ID'
@@ -47,17 +46,13 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- // Fetch file
- const file = await DriveFile
- .findOne({
- _id: ps.fileId
- });
+ const file = await DriveFiles.findOne(ps.fileId);
- if (file === null) {
+ if (file == null) {
throw new ApiError(meta.errors.noSuchFile);
}
- if (!user.isAdmin && !user.isModerator && !file.metadata.userId.equals(user._id)) {
+ if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
throw new ApiError(meta.errors.accessDenied);
}
@@ -65,7 +60,5 @@ export default define(meta, async (ps, user) => {
await del(file);
// Publish fileDeleted event
- publishDriveStream(user._id, 'fileDeleted', file._id);
-
- return;
+ publishDriveStream(user.id, 'fileDeleted', file.id);
});
diff --git a/src/server/api/endpoints/drive/files/find.ts b/src/server/api/endpoints/drive/files/find.ts
index 0d4102a48f..265850f84c 100644
--- a/src/server/api/endpoints/drive/files/find.ts
+++ b/src/server/api/endpoints/drive/files/find.ts
@@ -1,14 +1,14 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFile, { pack } from '../../../../../models/drive-file';
+import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
+import { DriveFiles } from '../../../../../models';
export const meta = {
requireCredential: true,
tags: ['drive'],
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
name: {
@@ -17,7 +17,6 @@ export const meta = {
folderId: {
validator: $.optional.nullable.type(ID),
- transform: transform,
default: null as any,
desc: {
'ja-JP': 'フォルダID'
@@ -27,12 +26,11 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const files = await DriveFile
- .find({
- filename: ps.name,
- 'metadata.userId': user._id,
- 'metadata.folderId': ps.folderId
- });
+ const files = await DriveFiles.find({
+ name: ps.name,
+ userId: user.id,
+ folderId: ps.folderId
+ });
- return await Promise.all(files.map(file => pack(file, { self: true })));
+ return await Promise.all(files.map(file => DriveFiles.pack(file, { self: true })));
});
diff --git a/src/server/api/endpoints/drive/files/show.ts b/src/server/api/endpoints/drive/files/show.ts
index 6d63a8605c..b516ec2df6 100644
--- a/src/server/api/endpoints/drive/files/show.ts
+++ b/src/server/api/endpoints/drive/files/show.ts
@@ -1,10 +1,9 @@
import $ from 'cafy';
-import * as mongo from 'mongodb';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFile, { pack, IDriveFile } from '../../../../../models/drive-file';
+import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
-import config from '../../../../../config';
import { ApiError } from '../../../error';
+import { DriveFile } from '../../../../../models/entities/drive-file';
+import { DriveFiles } from '../../../../../models';
export const meta = {
stability: 'stable',
@@ -18,12 +17,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
fileId: {
validator: $.optional.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のファイルID',
'en-US': 'Target file ID'
@@ -65,49 +63,33 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- let file: IDriveFile;
+ let file: DriveFile;
if (ps.fileId) {
- file = await DriveFile.findOne({
- _id: ps.fileId,
- 'metadata.deletedAt': { $exists: false }
- });
+ file = await DriveFiles.findOne(ps.fileId);
} else if (ps.url) {
- const isInternalStorageUrl = ps.url.startsWith(config.driveUrl);
- if (isInternalStorageUrl) {
- // Extract file ID from url
- // e.g.
- // http://misskey.local/files/foo?original=bar --> foo
- const fileId = new mongo.ObjectID(ps.url.replace(config.driveUrl, '').replace(/\?(.*)$/, '').replace(/\//g, ''));
- file = await DriveFile.findOne({
- _id: fileId,
- 'metadata.deletedAt': { $exists: false }
- });
- } else {
- file = await DriveFile.findOne({
- $or: [{
- 'metadata.url': ps.url
- }, {
- 'metadata.webpublicUrl': ps.url
- }, {
- 'metadata.thumbnailUrl': ps.url
- }],
- 'metadata.deletedAt': { $exists: false }
- });
- }
+ file = await DriveFiles.findOne({
+ where: [{
+ url: ps.url
+ }, {
+ webpublicUrl: ps.url
+ }, {
+ thumbnailUrl: ps.url
+ }],
+ });
} else {
throw new ApiError(meta.errors.fileIdOrUrlRequired);
}
- if (!user.isAdmin && !user.isModerator && !file.metadata.userId.equals(user._id)) {
+ if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
throw new ApiError(meta.errors.accessDenied);
}
- if (file === null) {
+ if (file == null) {
throw new ApiError(meta.errors.noSuchFile);
}
- return await pack(file, {
+ return await DriveFiles.pack(file, {
detail: true,
self: true
});
diff --git a/src/server/api/endpoints/drive/files/update.ts b/src/server/api/endpoints/drive/files/update.ts
index c8803bec3a..81e86a2734 100644
--- a/src/server/api/endpoints/drive/files/update.ts
+++ b/src/server/api/endpoints/drive/files/update.ts
@@ -1,11 +1,9 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFolder from '../../../../../models/drive-folder';
-import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file';
+import { ID } from '../../../../../misc/cafy-id';
import { publishDriveStream } from '../../../../../services/stream';
import define from '../../../define';
-import Note from '../../../../../models/note';
import { ApiError } from '../../../error';
+import { DriveFiles, DriveFolders } from '../../../../../models';
export const meta = {
desc: {
@@ -17,12 +15,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-write',
+ kind: 'write:drive',
params: {
fileId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のファイルID'
}
@@ -30,7 +27,6 @@ export const meta = {
folderId: {
validator: $.optional.nullable.type(ID),
- transform: transform,
default: undefined as any,
desc: {
'ja-JP': 'フォルダID'
@@ -38,7 +34,7 @@ export const meta = {
},
name: {
- validator: $.optional.str.pipe(validateFileName),
+ validator: $.optional.str.pipe(DriveFiles.validateFileName),
default: undefined as any,
desc: {
'ja-JP': 'ファイル名',
@@ -78,69 +74,47 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- // Fetch file
- const file = await DriveFile
- .findOne({
- _id: ps.fileId
- });
+ const file = await DriveFiles.findOne(ps.fileId);
- if (file === null) {
+ if (file == null) {
throw new ApiError(meta.errors.noSuchFile);
}
- if (!user.isAdmin && !user.isModerator && !file.metadata.userId.equals(user._id)) {
+ if (!user.isAdmin && !user.isModerator && (file.userId !== user.id)) {
throw new ApiError(meta.errors.accessDenied);
}
- if (ps.name) file.filename = ps.name;
+ if (ps.name) file.name = ps.name;
- if (ps.isSensitive !== undefined) file.metadata.isSensitive = ps.isSensitive;
+ if (ps.isSensitive !== undefined) file.isSensitive = ps.isSensitive;
if (ps.folderId !== undefined) {
if (ps.folderId === null) {
- file.metadata.folderId = null;
+ file.folderId = null;
} else {
- // Fetch folder
- const folder = await DriveFolder
- .findOne({
- _id: ps.folderId,
- userId: user._id
- });
+ const folder = await DriveFolders.findOne({
+ id: ps.folderId,
+ userId: user.id
+ });
- if (folder === null) {
+ if (folder == null) {
throw new ApiError(meta.errors.noSuchFolder);
}
- file.metadata.folderId = folder._id;
+ file.folderId = folder.id;
}
}
- await DriveFile.update(file._id, {
- $set: {
- filename: file.filename,
- 'metadata.folderId': file.metadata.folderId,
- 'metadata.isSensitive': file.metadata.isSensitive
- }
- });
-
- // ドライブのファイルが非正規化されているドキュメントも更新
- Note.find({
- '_files._id': file._id
- }).then(notes => {
- for (const note of notes) {
- note._files[note._files.findIndex(f => f._id.equals(file._id))] = file;
- Note.update({ _id: note._id }, {
- $set: {
- _files: note._files
- }
- });
- }
+ await DriveFiles.update(file.id, {
+ name: file.name,
+ folderId: file.folderId,
+ isSensitive: file.isSensitive
});
- const fileObj = await pack(file, { self: true });
+ const fileObj = await DriveFiles.pack(file, { self: true });
// Publish fileUpdated event
- publishDriveStream(user._id, 'fileUpdated', fileObj);
+ publishDriveStream(user.id, 'fileUpdated', fileObj);
return fileObj;
});
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 93a9fa62fa..034ab10f19 100644
--- a/src/server/api/endpoints/drive/files/upload-from-url.ts
+++ b/src/server/api/endpoints/drive/files/upload-from-url.ts
@@ -1,9 +1,9 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
+import { ID } from '../../../../../misc/cafy-id';
import * as ms from 'ms';
-import { pack } from '../../../../../models/drive-file';
import uploadFromUrl from '../../../../../services/drive/upload-from-url';
import define from '../../../define';
+import { DriveFiles } from '../../../../../models';
export const meta = {
desc: {
@@ -19,7 +19,7 @@ export const meta = {
requireCredential: true,
- kind: 'drive-write',
+ kind: 'write:drive',
params: {
url: {
@@ -30,7 +30,6 @@ export const meta = {
folderId: {
validator: $.optional.nullable.type(ID),
default: null as any,
- transform: transform
},
isSensitive: {
@@ -53,5 +52,5 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- return await pack(await uploadFromUrl(ps.url, user, ps.folderId, null, ps.isSensitive, ps.force), { self: true });
+ return await DriveFiles.pack(await uploadFromUrl(ps.url, user, ps.folderId, null, ps.isSensitive, ps.force), { self: true });
});
diff --git a/src/server/api/endpoints/drive/folders.ts b/src/server/api/endpoints/drive/folders.ts
index 73c179f7be..f5c3816407 100644
--- a/src/server/api/endpoints/drive/folders.ts
+++ b/src/server/api/endpoints/drive/folders.ts
@@ -1,7 +1,8 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import DriveFolder, { pack } from '../../../../models/drive-folder';
+import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
+import { DriveFolders } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
desc: {
@@ -13,7 +14,7 @@ export const meta = {
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
limit: {
@@ -23,18 +24,15 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
- transform: transform,
},
untilId: {
validator: $.optional.type(ID),
- transform: transform,
},
folderId: {
validator: $.optional.nullable.type(ID),
default: null as any,
- transform: transform,
}
},
@@ -47,29 +45,16 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const sort = {
- _id: -1
- };
- const query = {
- userId: user._id,
- parentId: ps.folderId
- } as any;
- if (ps.sinceId) {
- sort._id = 1;
- query._id = {
- $gt: ps.sinceId
- };
- } else if (ps.untilId) {
- query._id = {
- $lt: ps.untilId
- };
+ const query = makePaginationQuery(DriveFolders.createQueryBuilder('folder'), ps.sinceId, ps.untilId)
+ .andWhere('folder.userId = :userId', { userId: user.id });
+
+ if (ps.folderId) {
+ query.andWhere('folder.parentId = :parentId', { parentId: ps.folderId });
+ } else {
+ query.andWhere('folder.parentId IS NULL');
}
- const folders = await DriveFolder
- .find(query, {
- limit: ps.limit,
- sort: sort
- });
+ const folders = await query.take(ps.limit).getMany();
- return await Promise.all(folders.map(folder => pack(folder)));
+ return await Promise.all(folders.map(folder => DriveFolders.pack(folder)));
});
diff --git a/src/server/api/endpoints/drive/folders/create.ts b/src/server/api/endpoints/drive/folders/create.ts
index 5fab0b91a1..5530abf9dc 100644
--- a/src/server/api/endpoints/drive/folders/create.ts
+++ b/src/server/api/endpoints/drive/folders/create.ts
@@ -1,9 +1,10 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
+import { ID } from '../../../../../misc/cafy-id';
import { publishDriveStream } from '../../../../../services/stream';
import define from '../../../define';
import { ApiError } from '../../../error';
+import { DriveFolders } from '../../../../../models';
+import { genId } from '../../../../../misc/gen-id';
export const meta = {
stability: 'stable',
@@ -17,11 +18,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-write',
+ kind: 'write:drive',
params: {
name: {
- validator: $.optional.str.pipe(isValidFolderName),
+ validator: $.optional.str.pipe(DriveFolders.validateFolderName),
default: 'Untitled',
desc: {
'ja-JP': 'フォルダ名',
@@ -31,7 +32,6 @@ export const meta = {
parentId: {
validator: $.optional.nullable.type(ID),
- transform: transform,
desc: {
'ja-JP': '親フォルダID',
'en-US': 'Parent folder ID'
@@ -53,29 +53,29 @@ export default define(meta, async (ps, user) => {
let parent = null;
if (ps.parentId) {
// Fetch parent folder
- parent = await DriveFolder
- .findOne({
- _id: ps.parentId,
- userId: user._id
- });
+ parent = await DriveFolders.findOne({
+ id: ps.parentId,
+ userId: user.id
+ });
- if (parent === null) {
+ if (parent == null) {
throw new ApiError(meta.errors.noSuchFolder);
}
}
// Create folder
- const folder = await DriveFolder.insert({
+ const folder = await DriveFolders.save({
+ id: genId(),
createdAt: new Date(),
name: ps.name,
- parentId: parent !== null ? parent._id : null,
- userId: user._id
+ parentId: parent !== null ? parent.id : null,
+ userId: user.id
});
- const folderObj = await pack(folder);
+ const folderObj = await DriveFolders.pack(folder);
// Publish folderCreated event
- publishDriveStream(user._id, 'folderCreated', folderObj);
+ publishDriveStream(user.id, 'folderCreated', folderObj);
return folderObj;
});
diff --git a/src/server/api/endpoints/drive/folders/delete.ts b/src/server/api/endpoints/drive/folders/delete.ts
index 9f22bf9ea7..fe6c05ad07 100644
--- a/src/server/api/endpoints/drive/folders/delete.ts
+++ b/src/server/api/endpoints/drive/folders/delete.ts
@@ -1,10 +1,9 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFolder from '../../../../../models/drive-folder';
+import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
import { publishDriveStream } from '../../../../../services/stream';
-import DriveFile from '../../../../../models/drive-file';
import { ApiError } from '../../../error';
+import { DriveFolders, DriveFiles } from '../../../../../models';
export const meta = {
stability: 'stable',
@@ -18,12 +17,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-write',
+ kind: 'write:drive',
params: {
folderId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のフォルダID',
'en-US': 'Target folder ID'
@@ -48,29 +46,26 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Get folder
- const folder = await DriveFolder
- .findOne({
- _id: ps.folderId,
- userId: user._id
- });
+ const folder = await DriveFolders.findOne({
+ id: ps.folderId,
+ userId: user.id
+ });
- if (folder === null) {
+ if (folder == null) {
throw new ApiError(meta.errors.noSuchFolder);
}
const [childFoldersCount, childFilesCount] = await Promise.all([
- DriveFolder.count({ parentId: folder._id }),
- DriveFile.count({ 'metadata.folderId': folder._id })
+ DriveFolders.count({ parentId: folder.id }),
+ DriveFiles.count({ folderId: folder.id })
]);
if (childFoldersCount !== 0 || childFilesCount !== 0) {
throw new ApiError(meta.errors.hasChildFilesOrFolders);
}
- await DriveFolder.remove({ _id: folder._id });
+ await DriveFolders.delete(folder.id);
// Publish folderCreated event
- publishDriveStream(user._id, 'folderDeleted', folder._id);
-
- return;
+ publishDriveStream(user.id, 'folderDeleted', folder.id);
});
diff --git a/src/server/api/endpoints/drive/folders/find.ts b/src/server/api/endpoints/drive/folders/find.ts
index 16b6c10633..f0989ec5ae 100644
--- a/src/server/api/endpoints/drive/folders/find.ts
+++ b/src/server/api/endpoints/drive/folders/find.ts
@@ -1,14 +1,14 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFolder, { pack } from '../../../../../models/drive-folder';
+import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
+import { DriveFolders } from '../../../../../models';
export const meta = {
tags: ['drive'],
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
name: {
@@ -17,7 +17,6 @@ export const meta = {
parentId: {
validator: $.optional.nullable.type(ID),
- transform: transform,
default: null as any,
desc: {
'ja-JP': 'フォルダID'
@@ -34,12 +33,11 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const folders = await DriveFolder
- .find({
- name: ps.name,
- userId: user._id,
- parentId: ps.parentId
- });
+ const folders = await DriveFolders.find({
+ name: ps.name,
+ userId: user.id,
+ parentId: ps.parentId
+ });
- return await Promise.all(folders.map(folder => pack(folder)));
+ return await Promise.all(folders.map(folder => DriveFolders.pack(folder)));
});
diff --git a/src/server/api/endpoints/drive/folders/show.ts b/src/server/api/endpoints/drive/folders/show.ts
index bbfcbed51f..60507e7d7f 100644
--- a/src/server/api/endpoints/drive/folders/show.ts
+++ b/src/server/api/endpoints/drive/folders/show.ts
@@ -1,8 +1,8 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFolder, { pack } from '../../../../../models/drive-folder';
+import { ID } from '../../../../../misc/cafy-id';
import define from '../../../define';
import { ApiError } from '../../../error';
+import { DriveFolders } from '../../../../../models';
export const meta = {
stability: 'stable',
@@ -16,12 +16,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
folderId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のフォルダID',
'en-US': 'Target folder ID'
@@ -44,17 +43,16 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Get folder
- const folder = await DriveFolder
- .findOne({
- _id: ps.folderId,
- userId: user._id
- });
+ const folder = await DriveFolders.findOne({
+ id: ps.folderId,
+ userId: user.id
+ });
- if (folder === null) {
+ if (folder == null) {
throw new ApiError(meta.errors.noSuchFolder);
}
- return await pack(folder, {
+ return await DriveFolders.pack(folder, {
detail: true
});
});
diff --git a/src/server/api/endpoints/drive/folders/update.ts b/src/server/api/endpoints/drive/folders/update.ts
index a1ee2669f0..90129bed63 100644
--- a/src/server/api/endpoints/drive/folders/update.ts
+++ b/src/server/api/endpoints/drive/folders/update.ts
@@ -1,9 +1,9 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../../misc/cafy-id';
-import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
+import { ID } from '../../../../../misc/cafy-id';
import { publishDriveStream } from '../../../../../services/stream';
import define from '../../../define';
import { ApiError } from '../../../error';
+import { DriveFolders } from '../../../../../models';
export const meta = {
stability: 'stable',
@@ -17,12 +17,11 @@ export const meta = {
requireCredential: true,
- kind: 'drive-write',
+ kind: 'write:drive',
params: {
folderId: {
validator: $.type(ID),
- transform: transform,
desc: {
'ja-JP': '対象のフォルダID',
'en-US': 'Target folder ID'
@@ -30,7 +29,7 @@ export const meta = {
},
name: {
- validator: $.optional.str.pipe(isValidFolderName),
+ validator: $.optional.str.pipe(DriveFolders.validateFolderName),
desc: {
'ja-JP': 'フォルダ名',
'en-US': 'Folder name'
@@ -39,7 +38,6 @@ export const meta = {
parentId: {
validator: $.optional.nullable.type(ID),
- transform: transform,
desc: {
'ja-JP': '親フォルダID',
'en-US': 'Parent folder ID'
@@ -70,46 +68,41 @@ export const meta = {
export default define(meta, async (ps, user) => {
// Fetch folder
- const folder = await DriveFolder
- .findOne({
- _id: ps.folderId,
- userId: user._id
- });
+ const folder = await DriveFolders.findOne({
+ id: ps.folderId,
+ userId: user.id
+ });
- if (folder === null) {
+ if (folder == null) {
throw new ApiError(meta.errors.noSuchFolder);
}
if (ps.name) folder.name = ps.name;
if (ps.parentId !== undefined) {
- if (ps.parentId.equals(folder._id)) {
+ if (ps.parentId === folder.id) {
throw new ApiError(meta.errors.recursiveNesting);
} else if (ps.parentId === null) {
folder.parentId = null;
} else {
// Get parent folder
- const parent = await DriveFolder
- .findOne({
- _id: ps.parentId,
- userId: user._id
- });
+ const parent = await DriveFolders.findOne({
+ id: ps.parentId,
+ userId: user.id
+ });
- if (parent === null) {
+ if (parent == null) {
throw new ApiError(meta.errors.noSuchParentFolder);
}
// Check if the circular reference will occur
async function checkCircle(folderId: any): Promise<boolean> {
// Fetch folder
- const folder2 = await DriveFolder.findOne({
- _id: folderId
- }, {
- _id: true,
- parentId: true
+ const folder2 = await DriveFolders.findOne({
+ id: folderId
});
- if (folder2._id.equals(folder._id)) {
+ if (folder2.id === folder.id) {
return true;
} else if (folder2.parentId) {
return await checkCircle(folder2.parentId);
@@ -124,22 +117,20 @@ export default define(meta, async (ps, user) => {
}
}
- folder.parentId = parent._id;
+ folder.parentId = parent.id;
}
}
// Update
- DriveFolder.update(folder._id, {
- $set: {
- name: folder.name,
- parentId: folder.parentId
- }
+ DriveFolders.update(folder.id, {
+ name: folder.name,
+ parentId: folder.parentId
});
- const folderObj = await pack(folder);
+ const folderObj = await DriveFolders.pack(folder);
// Publish folderUpdated event
- publishDriveStream(user._id, 'folderUpdated', folderObj);
+ publishDriveStream(user.id, 'folderUpdated', folderObj);
return folderObj;
});
diff --git a/src/server/api/endpoints/drive/stream.ts b/src/server/api/endpoints/drive/stream.ts
index 916482be4d..9a84627767 100644
--- a/src/server/api/endpoints/drive/stream.ts
+++ b/src/server/api/endpoints/drive/stream.ts
@@ -1,14 +1,15 @@
import $ from 'cafy';
-import ID, { transform } from '../../../../misc/cafy-id';
-import DriveFile, { packMany } from '../../../../models/drive-file';
+import { ID } from '../../../../misc/cafy-id';
import define from '../../define';
+import { DriveFiles } from '../../../../models';
+import { makePaginationQuery } from '../../common/make-pagination-query';
export const meta = {
tags: ['drive'],
requireCredential: true,
- kind: 'drive-read',
+ kind: 'read:drive',
params: {
limit: {
@@ -18,12 +19,10 @@ export const meta = {
sinceId: {
validator: $.optional.type(ID),
- transform: transform,
},
untilId: {
validator: $.optional.type(ID),
- transform: transform,
},
type: {
@@ -40,35 +39,18 @@ export const meta = {
};
export default define(meta, async (ps, user) => {
- const sort = {
- _id: -1
- };
-
- const query = {
- 'metadata.userId': user._id,
- 'metadata.deletedAt': { $exists: false }
- } as any;
-
- if (ps.sinceId) {
- sort._id = 1;
- query._id = {
- $gt: ps.sinceId
- };
- } else if (ps.untilId) {
- query._id = {
- $lt: ps.untilId
- };
- }
+ const query = makePaginationQuery(DriveFiles.createQueryBuilder('file'), ps.sinceId, ps.untilId)
+ .andWhere('file.userId = :userId', { userId: user.id });
if (ps.type) {
- query.contentType = new RegExp(`^${ps.type.replace(/\*/g, '.+?')}$`);
+ if (ps.type.endsWith('/*')) {
+ query.andWhere('file.type like :type', { type: ps.type.replace('/*', '/') + '%' });
+ } else {
+ query.andWhere('file.type = :type', { type: ps.type });
+ }
}
- const files = await DriveFile
- .find(query, {
- limit: ps.limit,
- sort: sort
- });
+ const files = await query.take(ps.limit).getMany();
- return await packMany(files, { self: true });
+ return await DriveFiles.packMany(files, { detail: false, self: true });
});
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 16:04:17 +0000