sim1222/misskey
1
0
Fork 0
mirror of https://github.com/sim1222/misskey.git synced 2025-08-03 23:16:28 +09:00
Code Issues Projects Releases Wiki Activity

refactor, enhance: ドライブ引数のオブジェクト化, 追加時のcomment指定 (#8180)

Browse Source 
* refactor: ドライブの引数をオブジェクト化する Resolve #8177

* Resolve #8181

* fix

* archivePath
This commit is contained in:
MeiMei
2022-01-23 22:52:35 +09:00
committed by GitHub
parent d8905a9588
commit 7aecf15f94
13 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
View File

@ -6,7 +6,7 @@ import { getConnection } from 'typeorm';
import { ApiError } from '../../../error';
import { DriveFile } from '@/models/entities/drive-file';
import { ID } from '@/misc/cafy-id';
import uploadFromUrl from '@/services/drive/upload-from-url';
import { uploadFromUrl } from '@/services/drive/upload-from-url';
import { publishBroadcastStream } from '@/services/stream';
export const meta = {
@ -54,7 +54,7 @@ export default define(meta, async (ps, me) => {
try {
// Create file
driveFile = await uploadFromUrl(emoji.originalUrl, null, null, null, false, true);
driveFile = await uploadFromUrl({ url: emoji.originalUrl, user: null, force: true });
} catch (e) {
throw new ApiError();
}

8
packages/backend/src/server/api/endpoints/drive/files/create.ts
View File

@ -6,6 +6,7 @@ import define from '../../../define';
import { apiLogger } from '../../../logger';
import { ApiError } from '../../../error';
import { DriveFiles } from '@/models/index';
import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits';
export const meta = {
tags: ['drive'],
@ -32,6 +33,11 @@ export const meta = {
default: null,
},
comment: {
validator: $.optional.nullable.str.max(DB_MAX_IMAGE_COMMENT_LENGTH),
default: null,
},
isSensitive: {
validator: $.optional.either($.bool, $.str),
default: false,
@ -79,7 +85,7 @@ export default define(meta, async (ps, user, _, file, cleanup) => {
try {
// Create file
const driveFile = await addFile(user, file.path, name, null, ps.folderId, ps.force, false, null, null, ps.isSensitive);
const driveFile = await addFile({ user, path: file.path, name, comment: ps.comment, folderId: ps.folderId, force: ps.force, sensitive: ps.isSensitive });
return await DriveFiles.pack(driveFile, { self: true });
} catch (e) {
apiLogger.error(e);

4
packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts
View File

@ -1,7 +1,7 @@
import $ from 'cafy';
import { ID } from '@/misc/cafy-id';
import ms from 'ms';
import uploadFromUrl from '@/services/drive/upload-from-url';
import { uploadFromUrl } from '@/services/drive/upload-from-url';
import define from '../../../define';
import { DriveFiles } from '@/models/index';
import { publishMainStream } from '@/services/stream';
@ -54,7 +54,7 @@ export const meta = {
// eslint-disable-next-line import/no-default-export
export default define(meta, async (ps, user) => {
uploadFromUrl(ps.url, user, ps.folderId, null, ps.isSensitive, ps.force, false, ps.comment).then(file => {
uploadFromUrl({ url: ps.url, user, folderId: ps.folderId, sensitive: ps.isSensitive, force: ps.force, comment: ps.comment }).then(file => {
DriveFiles.pack(file, { self: true }).then(packedFile => {
publishMainStream(user.id, 'urlUploadFinished', {
marker: ps.marker,