graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 09:23:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix #3149

Browse source
This commit is contained in:
syuilo 2018-11-07 19:43:21 +09:00
parent f5ddfb29f2
commit a8d05cba5a
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/remote/activitypub/models/image.ts
View file

@ -4,6 +4,7 @@ import uploadFromUrl from '../../../services/drive/upload-from-url';
import { IRemoteUser } from '../../../models/user';
import DriveFile, { IDriveFile } from '../../../models/drive-file';
import Resolver from '../resolver';
import fetchMeta from '../../../misc/fetch-meta';
const log = debug('misskey:activitypub');
@ -24,7 +25,10 @@ export async function createImage(actor: IRemoteUser, value: any): Promise<IDriv
log(`Creating the Image: ${image.url}`);
let file = await uploadFromUrl(image.url, actor, null, image.url, image.sensitive);
const instance = await fetchMeta();
const cache = instance.cacheRemoteFiles;
let file = await uploadFromUrl(image.url, actor, null, image.url, image.sensitive, false, !cache);
if (file.metadata.isRemote) {
// URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、

8
src/services/drive/upload-from-url.ts
View file

@ -10,7 +10,6 @@ import create from './add-file';
import config from '../../config';
import { IUser } from '../../models/user';
import * as mongodb from 'mongodb';
import fetchMeta from '../../misc/fetch-meta';
const log = debug('misskey:drive:upload-from-url');
@ -20,7 +19,8 @@ export default async (
folderId: mongodb.ObjectID = null,
uri: string = null,
sensitive = false,
force = false
force = false,
link = false
): Promise<IDriveFile> => {
log(`REQUESTED: ${url}`);
@ -77,13 +77,11 @@ export default async (
});
});
const instance = await fetchMeta();
let driveFile: IDriveFile;
let error;
try {
driveFile = await create(user, path, name, null, folderId, force, !instance.cacheRemoteFiles, url, uri, sensitive);
driveFile = await create(user, path, name, null, folderId, force, link, url, uri, sensitive);
log(`got: ${driveFile._id}`);
} catch (e) {
error = e;