summaryrefslogtreecommitdiff
path: root/src/server/api/endpoints/drive/files/update.ts
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-07 21:50:36 +0900
committerGitHub <noreply@github.com>2019-04-07 21:50:36 +0900
commitf0a29721c9fb10f97faf386bc9d6b1b2fad97895 (patch)
treeb5c1d38d698589bb444c0881a431391db91eb5bc /src/server/api/endpoints/drive/files/update.ts
parentUpdate README.md [AUTOGEN] (#4639) (diff)
downloadmisskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.gz
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.bz2
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.zip
Use PostgreSQL instead of MongoDB (#4572)
* wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * :v: * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * :pizza: * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * :v: * clean up * docs * Update push.ts * wip * Update api.ts * wip * :v: * Update make-pagination-query.ts * :v: * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * :art: * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * :v: * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * :art: * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * :v: * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * :sushi: * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * :clock4: * Fix bug * Add test * Add test * rename * Fix bug
Diffstat (limited to 'src/server/api/endpoints/drive/files/update.ts')
-rw-r--r--src/server/api/endpoints/drive/files/update.ts70
1 files changed, 22 insertions, 48 deletions
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;
});