Merge branch 'develop'

CHANGELOG.md

@@ -5,6 +5,14 @@ If you encounter any problems with updating, please try the following:
 1. `npm run clean` or `npm run cleanall`
 2. Retry update (Don't forget `npm i`)
 
+11.1.2 (2019/04/15)
+-------------------
+### Fixes
+* 画像描画の依存関係を変更
+* リモートユーザーのファイルを削除するときに古い方からではなく新しい方から削除されるのを修正
+* リアクションしてないのにリアクションしたことになる問題を修正
+* APIドキュメントの修正
+
 11.1.1 (2019/04/15)
 -------------------
 ### Fixes

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.1.1",
+	"version": "11.1.2",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",
@@ -104,7 +104,6 @@
 		"bootstrap-vue": "2.0.0-rc.13",
 		"bull": "3.7.0",
 		"cafy": "15.1.1",
-		"canvas": "2.4.1",
 		"chai": "4.2.0",
 		"chalk": "2.4.2",
 		"cli-highlight": "2.1.0",
@@ -189,6 +188,7 @@
 		"promise-sequential": "1.1.1",
 		"pug": "2.0.3",
 		"punycode": "2.1.1",
+		"pureimage": "0.1.6",
 		"qrcode": "1.3.3",
 		"random-seed": "0.3.0",
 		"randomcolor": "0.5.4",

src/misc/gen-avatar.ts

@@ -2,10 +2,11 @@
  * Random avatar generator
  */
 
-import { createCanvas } from 'canvas';
+const p = require('pureimage');
 import * as gen from 'random-seed';
+import { WriteStream } from 'fs';
 
-const size = 512; // px
+const size = 256; // px
 const n = 5; // resolution
 const margin = (size / n) / 1.5;
 const colors = [
@@ -35,9 +36,9 @@ const sideN = Math.floor(n / 2);
 /**
  * Generate buffer of random avatar by seed
  */
-export function genAvatar(seed: string) {
+export function genAvatar(seed: string, stream: WriteStream): Promise<void> {
 	const rand = gen.create(seed);
-	const canvas = createCanvas(size, size);
+	const canvas = p.make(size, size);
 	const ctx = canvas.getContext('2d');
 
 	ctx.fillStyle = bg;
@@ -85,5 +86,5 @@ export function genAvatar(seed: string) {
 		}
 	}
 
-	return canvas.toBuffer();
+	return p.encodePNGToStream(canvas, stream);
 }

src/server/api/endpoints/app/create.ts

@@ -10,24 +10,68 @@ export const meta = {
 
 	requireCredential: false,
 	
+	desc: {
+		'ja-JP': 'アプリを作成します。',
+		'en-US': 'Create a application.'
+	},
+
 	params: {
 		name: {
-			validator: $.str
+			validator: $.str,
+			desc: {
+				'ja-JP': 'アプリの名前',
+				'en-US': 'Name of application'
+			}
 		},
 
 		description: {
-			validator: $.str
+			validator: $.str,
+			desc: {
+				'ja-JP': 'アプリの説明',
+				'en-US': 'Description of application'
+			}
 		},
 
 		permission: {
-			validator: $.arr($.str).unique()
+			validator: $.arr($.str).unique(),
+			desc: {
+				'ja-JP': 'このアプリに割り当てる権限（権限については"Permissions"を参照）',
+				'en-US': 'Permissions assigned to this app (see "Permissions" for the permissions)'
+			}
 		},
 
 		// TODO: Check it is valid url
 		callbackUrl: {
 			validator: $.optional.nullable.str,
-			default: null as any
+			default: null as any,
+			desc: {
+				'ja-JP': 'アプリ認証時にコールバックするURL',
+				'en-US': 'URL to call back at app authentication'
+			}
 		},
+	},
+	
+	res: {
+		type: 'object',
+		properties: {
+			id: {
+				type: 'string',
+				description: 'アプリケーションのID'
+			},
+			name: {
+				type: 'string',
+				description: 'アプリケーションの名前'
+			},
+			callbackUrl: {
+				type: 'string',
+				nullable: true,
+				description: 'コールバックするURL'
+			},
+			secret: {
+				type: 'string',
+				description: 'アプリケーションのシークレットキー'
+			}
+		}
 	}
 };
 

src/server/api/endpoints/auth/session/generate.ts

@@ -11,6 +11,11 @@ export const meta = {
 
 	requireCredential: false,
 	
+	desc: {
+		'ja-JP': 'アプリを認証するためのトークンを作成します。',
+		'en-US': 'Generate a token for authorize application.'
+	},
+
 	params: {
 		appSecret: {
 			validator: $.str,

src/server/api/endpoints/users/notes.ts

@@ -196,5 +196,5 @@ export default define(meta, async (ps, me) => {
 
 	const timeline = await query.take(ps.limit!).getMany();
 
-	return await Notes.packMany(timeline, user);
+	return await Notes.packMany(timeline, me);
 });

src/server/index.ts

@@ -26,6 +26,7 @@ import { program } from '../argv';
 import { UserProfiles } from '../models';
 import { networkChart } from '../services/chart';
 import { genAvatar } from '../misc/gen-avatar';
+import { createTemp } from '../misc/create-temp';
 
 export const serverLogger = new Logger('server', 'gray', false);
 
@@ -73,10 +74,11 @@ router.use(activityPub.routes());
 router.use(nodeinfo.routes());
 router.use(wellKnown.routes());
 
-router.get('/avatar/:x', ctx => {
-	const avatar = genAvatar(ctx.params.x);
+router.get('/avatar/:x', async ctx => {
+	const [temp] = await createTemp();
+	await genAvatar(ctx.params.x, fs.createWriteStream(temp));
 	ctx.set('Content-Type', 'image/png');
-	ctx.body = avatar;
+	ctx.body = fs.createReadStream(temp);
 });
 
 router.get('/verify-email/:code', async ctx => {

src/services/drive/add-file.ts

@@ -212,7 +212,7 @@ async function deleteOldFile(user: IRemoteUser) {
 		q.andWhere('file.id != :bannerId', { bannerId: user.bannerId });
 	}
 
-	q.orderBy('file.id', 'DESC');
+	q.orderBy('file.id', 'ASC');
 
 	const oldFile = await q.getOne();