2.2.0

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.1.2",
+	"version": "2.2.0",
 	"clientVersion": "1.0.5193",
 	"codename": "nighthike",
 	"main": "./built/index.js",

src/models/drive-file.ts

@@ -28,7 +28,8 @@ export type IMetadata = {
 	_user: any;
 	folderId: mongo.ObjectID;
 	comment: string;
-	uri: string;
+	uri?: string;
+	url?: string;
 	deletedAt?: Date;
 	isExpired?: boolean;
 };

src/remote/activitypub/models/image.ts

@@ -24,7 +24,7 @@ export async function createImage(actor: IRemoteUser, value): Promise<IDriveFile
 
 	log(`Creating the Image: ${image.url}`);
 
-	return await uploadFromUrl(image.url, actor);
+	return await uploadFromUrl(image.url, actor, null, image.url);
 }
 
 /**

src/server/file/send-drive-file.ts

@@ -6,6 +6,8 @@ import * as mongodb from 'mongodb';
 import DriveFile, { getDriveFileBucket } from '../../models/drive-file';
 import DriveFileThumbnail, { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';
 
+const assets = `${__dirname}/../../server/file/assets/`;
+
 const commonReadableHandlerGenerator = (ctx: Koa.Context) => (e: Error): void => {
 	console.error(e);
 	ctx.status = 500;
@@ -25,16 +27,16 @@ export default async function(ctx: Koa.Context) {
 
 	if (file == null) {
 		ctx.status = 404;
-		await send(ctx, `${__dirname}/assets/dummy.png`);
+		await send(ctx, '/dummy.png', { root: assets });
 		return;
 	}
 
 	if (file.metadata.deletedAt) {
 		ctx.status = 410;
 		if (file.metadata.isExpired) {
-			await send(ctx, `${__dirname}/assets/cache-expired.png`);
+			await send(ctx, '/cache-expired.png', { root: assets });
 		} else {
-			await send(ctx, `${__dirname}/assets/tombstone.png`);
+			await send(ctx, '/tombstone.png', { root: assets });
 		}
 		return;
 	}

src/server/web/index.ts

@@ -42,17 +42,21 @@ router.get('/assets/*', async ctx => {
 
 // Apple touch icon
 router.get('/apple-touch-icon.png', async ctx => {
-	await send(ctx, `${client}/assets/apple-touch-icon.png`);
+	await send(ctx, '/assets/apple-touch-icon.png', {
+		root: client
+	});
 });
 
 // ServiceWroker
-router.get(/^\/sw\.(.+?)\.js$/, async ctx => {
+//router.get(/^\/sw\.(.+?)\.js$/, async ctx => {
-	await send(ctx, `${client}/assets/sw.${ctx.params[0]}.js`);
+//	await send(ctx, `${client}/assets/sw.${ctx.params[0]}.js`);
-});
+//});
 
 // Manifest
 router.get('/manifest.json', async ctx => {
-	await send(ctx, `${client}/assets/manifest.json`);
+	await send(ctx, '/assets/manifest.json', {
+		root: client
+	});
 });
 
 //#endregion

src/services/drive/add-file.ts

@@ -62,6 +62,7 @@ const addFile = async (
 	comment: string = null,
 	folderId: mongodb.ObjectID = null,
 	force: boolean = false,
+	url: string = null,
 	uri: string = null
 ): Promise<IDriveFile> => {
 	log(`registering ${name} (user: ${getAcct(user)}, path: ${path})`);
@@ -296,6 +297,10 @@ const addFile = async (
 		properties: properties
 	} as IMetadata;
 
+	if (url !== null) {
+		metadata.url = url;
+	}
+
 	if (uri !== null) {
 		metadata.uri = uri;
 	}

src/services/drive/upload-from-url.ts

@@ -43,7 +43,7 @@ export default async (url, user, folderId = null, uri = null): Promise<IDriveFil
 	let error;
 
 	try {
-		driveFile = await create(user, path, name, null, folderId, false, uri);
+		driveFile = await create(user, path, name, null, folderId, false, url, uri);
 		log(`created: ${driveFile._id}`);
 	} catch (e) {
 		error = e;