Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Dockerfile

@@ -8,7 +8,6 @@ WORKDIR /misskey
 
 FROM base AS builder
 
-RUN unlink /usr/bin/free
 RUN apk add --no-cache \
     autoconf \
     automake \
@@ -20,7 +19,6 @@ RUN apk add --no-cache \
     make \
     nasm \
     pkgconfig \
-    procps \
     python \
     zlib-dev
 RUN npm i -g yarn

src/client/app/common/scripts/get-static-image-url.ts

@@ -1,9 +1,11 @@
 import { url as instanceUrl } from '../../config';
+import * as url from '../../../../prelude/url';
 
-export function getStaticImageUrl(url: string): string {
+export function getStaticImageUrl(baseUrl: string): string {
-	const u = new URL(url);
+	const u = new URL(baseUrl);
 	const dummy = `${u.host}${u.pathname}`;	// 拡張子がないとキャッシュしてくれないCDNがあるので
-	let result = `${instanceUrl}/proxy/${dummy}?url=${encodeURIComponent(u.href)}`;
+	return `${instanceUrl}/proxy/${dummy}?${url.query({
-	result += '&static=1';
+		url: u.href,
-	return result;
+		static: '1'
+	})}`;
 }

src/prelude/url.ts

@@ -0,0 +1,7 @@
+import { stringify } from 'querystring';
+
+export function query(obj: {}): string {
+	return stringify(Object.entries(obj)
+		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined)
+		.reduce((a, [k, v]) => (a[k] = v, a), {} as Record<string, any>));
+}

src/server/activitypub/followers.ts

@@ -5,6 +5,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../misc/cafy-id';
 import User from '../../models/user';
 import Following from '../../models/following';
+import * as url from '../../prelude/url';
 import { renderActivity } from '../../remote/activitypub/renderer';
 import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
 import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
@@ -20,7 +21,7 @@ export default async (ctx: Router.IRouterContext) => {
 	const userId = new ObjectID(ctx.params.user);
 
 	// Get 'cursor' parameter
-	const [cursor = null, cursorErr] = $.optional.type(ID).get(ctx.request.query.cursor);
+	const [cursor, cursorErr] = $.optional.type(ID).get(ctx.request.query.cursor);
 
 	// Get 'page' parameter
 	const pageErr = !$.optional.str.or(['true', 'false']).ok(ctx.request.query.page);
@@ -72,10 +73,16 @@ export default async (ctx: Router.IRouterContext) => {
 
 		const renderedFollowers = await Promise.all(followings.map(following => renderFollowUser(following.followerId)));
 		const rendered = renderOrderedCollectionPage(
-			`${partOf}?page=true${cursor ? `&cursor=${cursor}` : ''}`,
+			`${partOf}?${url.query({
+				page: 'true',
+				cursor
+			})}`,
 			user.followersCount, renderedFollowers, partOf,
 			null,
-			inStock ? `${partOf}?page=true&cursor=${followings[followings.length - 1]._id}` : null
+			inStock ? `${partOf}?${url.query({
+				page: 'true',
+				cursor: followings[followings.length - 1]._id.toHexString()
+			})}` : null
 		);
 
 		ctx.body = renderActivity(rendered);

src/server/activitypub/following.ts

@@ -5,6 +5,7 @@ import $ from 'cafy';
 import ID, { transform } from '../../misc/cafy-id';
 import User from '../../models/user';
 import Following from '../../models/following';
+import * as url from '../../prelude/url';
 import { renderActivity } from '../../remote/activitypub/renderer';
 import renderOrderedCollection from '../../remote/activitypub/renderer/ordered-collection';
 import renderOrderedCollectionPage from '../../remote/activitypub/renderer/ordered-collection-page';
@@ -20,7 +21,7 @@ export default async (ctx: Router.IRouterContext) => {
 	const userId = new ObjectID(ctx.params.user);
 
 	// Get 'cursor' parameter
-	const [cursor = null, cursorErr] = $.optional.type(ID).get(ctx.request.query.cursor);
+	const [cursor, cursorErr] = $.optional.type(ID).get(ctx.request.query.cursor);
 
 	// Get 'page' parameter
 	const pageErr = !$.optional.str.or(['true', 'false']).ok(ctx.request.query.page);
@@ -72,10 +73,16 @@ export default async (ctx: Router.IRouterContext) => {
 
 		const renderedFollowees = await Promise.all(followings.map(following => renderFollowUser(following.followeeId)));
 		const rendered = renderOrderedCollectionPage(
-			`${partOf}?page=true${cursor ? `&cursor=${cursor}` : ''}`,
+			`${partOf}?${url.query({
+				page: 'true',
+				cursor
+			})}`,
 			user.followingCount, renderedFollowees, partOf,
 			null,
-			inStock ? `${partOf}?page=true&cursor=${followings[followings.length - 1]._id}` : null
+			inStock ? `${partOf}?${url.query({
+				page: 'true',
+				cursor: followings[followings.length - 1]._id.toHexString()
+			})}` : null
 		);
 
 		ctx.body = renderActivity(rendered);

src/server/activitypub/outbox.ts

@@ -14,6 +14,7 @@ import renderNote from '../../remote/activitypub/renderer/note';
 import renderCreate from '../../remote/activitypub/renderer/create';
 import renderAnnounce from '../../remote/activitypub/renderer/announce';
 import { countIf } from '../../prelude/array';
+import * as url from '../../prelude/url';
 
 export default async (ctx: Router.IRouterContext) => {
 	if (!ObjectID.isValid(ctx.params.user)) {
@@ -88,10 +89,20 @@ export default async (ctx: Router.IRouterContext) => {
 
 		const activities = await Promise.all(notes.map(note => packActivity(note)));
 		const rendered = renderOrderedCollectionPage(
-			`${partOf}?page=true${sinceId ? `&since_id=${sinceId}` : ''}${untilId ? `&until_id=${untilId}` : ''}`,
+			`${partOf}?${url.query({
+				page: 'true',
+				since_id: sinceId,
+				until_id: untilId
+			})}`,
 			user.notesCount, activities, partOf,
-			notes.length > 0 ? `${partOf}?page=true&since_id=${notes[0]._id}` : null,
+			notes.length ? `${partOf}?${url.query({
-			notes.length > 0 ? `${partOf}?page=true&until_id=${notes[notes.length - 1]._id}` : null
+				page: 'true',
+				since_id: notes[0]._id.toHexString()
+			})}` : null,
+			notes.length ? `${partOf}?${url.query({
+				page: 'true',
+				until_id: notes[notes.length - 1]._id.toHexString()
+			})}` : null
 		);
 
 		ctx.body = renderActivity(rendered);

tslint.json

@@ -7,15 +7,15 @@
 	"jsRules": {},
 	"rules": {
 		"align": false,
-		"indent": ["tab"],
+		"indent": [true, "tabs"],
-		"quotemark": ["single"],
+		"quotemark": [true, "single"],
 		"no-var-requires": false,
 		"no-string-throw": false,
 		"trailing-comma": [false],
 		"object-literal-sort-keys": false,
 		"curly": false,
 		"no-console": [false],
-		"no-empty":false,
+		"no-empty": false,
 		"ordered-imports": [false],
 		"arrow-parens": false,
 		"array-type": [true, "array"],
@@ -31,11 +31,12 @@
 		"max-classes-per-file": false,
 		"member-ordering": [false],
 		"ban-types": [
+			true,
 			"Object"
 		],
 		"ban": [
 			true,
-			{"name": ["*", "forEach"], "message": "Use for-of loop instead."}
+			{ "name": ["*", "forEach"], "message": "Use for-of loop instead." }
 		],
 		"no-duplicate-string": false,
 		"no-commented-code": false,