Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enforce URI uniquness

Browse source
This commit is contained in:
Akihiko Odaki 2018-04-03 23:45:13 +09:00
parent 18f317a4ac
commit fdc81f395d
6 changed files with 82 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/drive/upload-from-url.ts
View file

@ -8,7 +8,7 @@ import * as request from 'request';
const log = debug('misskey:common:drive:upload_from_url');
export default async (url, user, folderId = null): Promise<IDriveFile> => {
export default async (url, user, folderId = null, uri = null): Promise<IDriveFile> => {
let name = URL.parse(url).pathname.split('/').pop();
if (!validateFileName(name)) {
name = null;
@ -35,7 +35,7 @@ export default async (url, user, folderId = null): Promise<IDriveFile> => {
.on('error', rej);
});
const driveFile = await create(user, path, name, null, folderId);
const driveFile = await create(user, path, name, null, folderId, false, uri);
// clean-up
fs.unlink(path, (e) => {