From f4ae9391248d9ba366210be215681537ce9ecb49 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 24 Feb 2019 17:57:49 +0900 Subject: ハイフンに統一 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/endpoints/drive/files/attached-notes.ts | 58 ++++++++++++++++++++++ .../api/endpoints/drive/files/attached_notes.ts | 58 ---------------------- .../api/endpoints/drive/files/check-existence.ts | 35 +++++++++++++ .../api/endpoints/drive/files/check_existence.ts | 35 ------------- .../api/endpoints/drive/files/upload-from-url.ts | 57 +++++++++++++++++++++ .../api/endpoints/drive/files/upload_from_url.ts | 57 --------------------- 6 files changed, 150 insertions(+), 150 deletions(-) create mode 100644 src/server/api/endpoints/drive/files/attached-notes.ts delete mode 100644 src/server/api/endpoints/drive/files/attached_notes.ts create mode 100644 src/server/api/endpoints/drive/files/check-existence.ts delete mode 100644 src/server/api/endpoints/drive/files/check_existence.ts create mode 100644 src/server/api/endpoints/drive/files/upload-from-url.ts delete mode 100644 src/server/api/endpoints/drive/files/upload_from_url.ts (limited to 'src/server/api/endpoints/drive') diff --git a/src/server/api/endpoints/drive/files/attached-notes.ts b/src/server/api/endpoints/drive/files/attached-notes.ts new file mode 100644 index 0000000000..c1d828b05a --- /dev/null +++ b/src/server/api/endpoints/drive/files/attached-notes.ts @@ -0,0 +1,58 @@ +import $ from 'cafy'; +import ID, { transform } from '../../../../../misc/cafy-id'; +import DriveFile from '../../../../../models/drive-file'; +import define from '../../../define'; +import { packMany } from '../../../../../models/note'; +import { ApiError } from '../../../error'; + +export const meta = { + stability: 'stable', + + desc: { + 'ja-JP': '指定したドライブのファイルが添付されている投稿一覧を取得します。', + 'en-US': 'Get the notes that specified file of drive attached.' + }, + + tags: ['drive', 'notes'], + + requireCredential: true, + + kind: 'drive-read', + + params: { + fileId: { + validator: $.type(ID), + transform: transform, + desc: { + 'ja-JP': '対象のファイルID', + 'en-US': 'Target file ID' + } + } + }, + + errors: { + noSuchFile: { + message: 'No such file.', + code: 'NO_SUCH_FILE', + id: 'c118ece3-2e4b-4296-99d1-51756e32d232', + } + } +}; + +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 } + }); + + if (file === null) { + throw new ApiError(meta.errors.noSuchFile); + } + + return await packMany(file.metadata.attachedNoteIds || [], user, { + detail: true + }); +}); diff --git a/src/server/api/endpoints/drive/files/attached_notes.ts b/src/server/api/endpoints/drive/files/attached_notes.ts deleted file mode 100644 index c1d828b05a..0000000000 --- a/src/server/api/endpoints/drive/files/attached_notes.ts +++ /dev/null @@ -1,58 +0,0 @@ -import $ from 'cafy'; -import ID, { transform } from '../../../../../misc/cafy-id'; -import DriveFile from '../../../../../models/drive-file'; -import define from '../../../define'; -import { packMany } from '../../../../../models/note'; -import { ApiError } from '../../../error'; - -export const meta = { - stability: 'stable', - - desc: { - 'ja-JP': '指定したドライブのファイルが添付されている投稿一覧を取得します。', - 'en-US': 'Get the notes that specified file of drive attached.' - }, - - tags: ['drive', 'notes'], - - requireCredential: true, - - kind: 'drive-read', - - params: { - fileId: { - validator: $.type(ID), - transform: transform, - desc: { - 'ja-JP': '対象のファイルID', - 'en-US': 'Target file ID' - } - } - }, - - errors: { - noSuchFile: { - message: 'No such file.', - code: 'NO_SUCH_FILE', - id: 'c118ece3-2e4b-4296-99d1-51756e32d232', - } - } -}; - -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 } - }); - - if (file === null) { - throw new ApiError(meta.errors.noSuchFile); - } - - 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 new file mode 100644 index 0000000000..12680d5419 --- /dev/null +++ b/src/server/api/endpoints/drive/files/check-existence.ts @@ -0,0 +1,35 @@ +import $ from 'cafy'; +import DriveFile, { pack } from '../../../../../models/drive-file'; +import define from '../../../define'; + +export const meta = { + desc: { + 'ja-JP': '与えられたMD5ハッシュ値を持つファイルがドライブに存在するかどうかを返します。', + 'en-US': 'Returns whether the file with the given MD5 hash exists in the user\'s drive.' + }, + + tags: ['drive'], + + requireCredential: true, + + kind: 'drive-read', + + params: { + md5: { + validator: $.str, + desc: { + 'ja-JP': 'ファイルのMD5ハッシュ' + } + } + } +}; + +export default define(meta, async (ps, user) => { + const file = await DriveFile.findOne({ + md5: ps.md5, + 'metadata.userId': user._id, + 'metadata.deletedAt': { $exists: false } + }); + + return { file: file ? await pack(file, { self: true }) : null }; +}); diff --git a/src/server/api/endpoints/drive/files/check_existence.ts b/src/server/api/endpoints/drive/files/check_existence.ts deleted file mode 100644 index 12680d5419..0000000000 --- a/src/server/api/endpoints/drive/files/check_existence.ts +++ /dev/null @@ -1,35 +0,0 @@ -import $ from 'cafy'; -import DriveFile, { pack } from '../../../../../models/drive-file'; -import define from '../../../define'; - -export const meta = { - desc: { - 'ja-JP': '与えられたMD5ハッシュ値を持つファイルがドライブに存在するかどうかを返します。', - 'en-US': 'Returns whether the file with the given MD5 hash exists in the user\'s drive.' - }, - - tags: ['drive'], - - requireCredential: true, - - kind: 'drive-read', - - params: { - md5: { - validator: $.str, - desc: { - 'ja-JP': 'ファイルのMD5ハッシュ' - } - } - } -}; - -export default define(meta, async (ps, user) => { - const file = await DriveFile.findOne({ - md5: ps.md5, - 'metadata.userId': user._id, - 'metadata.deletedAt': { $exists: false } - }); - - return { file: file ? await pack(file, { self: true }) : null }; -}); diff --git a/src/server/api/endpoints/drive/files/upload-from-url.ts b/src/server/api/endpoints/drive/files/upload-from-url.ts new file mode 100644 index 0000000000..93a9fa62fa --- /dev/null +++ b/src/server/api/endpoints/drive/files/upload-from-url.ts @@ -0,0 +1,57 @@ +import $ from 'cafy'; +import ID, { transform } 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'; + +export const meta = { + desc: { + 'ja-JP': 'ドライブに指定されたURLに存在するファイルをアップロードします。' + }, + + tags: ['drive'], + + limit: { + duration: ms('1hour'), + max: 60 + }, + + requireCredential: true, + + kind: 'drive-write', + + params: { + url: { + // TODO: Validate this url + validator: $.str, + }, + + folderId: { + validator: $.optional.nullable.type(ID), + default: null as any, + transform: transform + }, + + isSensitive: { + validator: $.optional.bool, + default: false, + desc: { + 'ja-JP': 'このメディアが「閲覧注意」(NSFW)かどうか', + 'en-US': 'Whether this media is NSFW' + } + }, + + force: { + validator: $.optional.bool, + default: false, + desc: { + 'ja-JP': 'true にすると、同じハッシュを持つファイルが既にアップロードされていても強制的にファイルを作成します。', + } + } + } +}; + +export default define(meta, async (ps, user) => { + return await pack(await uploadFromUrl(ps.url, user, ps.folderId, null, ps.isSensitive, ps.force), { self: true }); +}); diff --git a/src/server/api/endpoints/drive/files/upload_from_url.ts b/src/server/api/endpoints/drive/files/upload_from_url.ts deleted file mode 100644 index 93a9fa62fa..0000000000 --- a/src/server/api/endpoints/drive/files/upload_from_url.ts +++ /dev/null @@ -1,57 +0,0 @@ -import $ from 'cafy'; -import ID, { transform } 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'; - -export const meta = { - desc: { - 'ja-JP': 'ドライブに指定されたURLに存在するファイルをアップロードします。' - }, - - tags: ['drive'], - - limit: { - duration: ms('1hour'), - max: 60 - }, - - requireCredential: true, - - kind: 'drive-write', - - params: { - url: { - // TODO: Validate this url - validator: $.str, - }, - - folderId: { - validator: $.optional.nullable.type(ID), - default: null as any, - transform: transform - }, - - isSensitive: { - validator: $.optional.bool, - default: false, - desc: { - 'ja-JP': 'このメディアが「閲覧注意」(NSFW)かどうか', - 'en-US': 'Whether this media is NSFW' - } - }, - - force: { - validator: $.optional.bool, - default: false, - desc: { - 'ja-JP': 'true にすると、同じハッシュを持つファイルが既にアップロードされていても強制的にファイルを作成します。', - } - } - } -}; - -export default define(meta, async (ps, user) => { - return await pack(await uploadFromUrl(ps.url, user, ps.folderId, null, ps.isSensitive, ps.force), { self: true }); -}); -- cgit v1.2.3-freya