11.0.0-beta.9

CONTRIBUTING.md

@@ -130,6 +130,40 @@ const users = userIds.length > 0 ? await Users.find({
 }) : [];
 ```
 
+### 配列のインデックス in SQL
+SQLでは配列のインデックスは**1始まり**。
+`[a, b, c]`の `a`にアクセスしたいなら`[0]`ではなく`[1]`と書く
+
 ### `undefined`にご用心
 MongoDBの時とは違い、findOneでレコードを取得する時に対象レコードが存在しない場合 **`undefined`** が返ってくるので注意。
 MongoDBは`null`で返してきてたので、その感覚で`if (x === null)`とか書くとバグる。代わりに`if (x == null)`と書いてください
+
+### 簡素な`undefined`チェック
+データベースからレコードを取得するときに、プログラムの流れ的に(ほぼ)絶対`undefined`にはならない場合でも、`undefined`チェックしないとTypeScriptに怒られます。
+でもいちいち複数行を費やして、発生するはずのない`undefined`をチェックするのも面倒なので、`ensure`というユーティリティ関数を用意しています。
+例えば、
+``` ts
+const user = await Users.findOne(userId);
+// この時点で user の型は User | undefined
+if (user == null) {
+	throw 'missing user';
+}
+// この時点で user の型は User
+```
+という処理を`ensure`を使うと
+``` ts
+const user = await Users.findOne(userId).then(ensure);
+// この時点で user の型は User
+```
+という風に書けます。
+もちろん`ensure`内部でエラーを握りつぶすようなことはしておらず、万が一`undefined`だった場合はPromiseがRejectされ後続の処理は実行されません。
+``` ts
+const user = await Users.findOne(userId).then(ensure);
+// 万が一 Users.findOne の結果が undefined だったら、ensure でエラーが発生するので
+// この行に到達することは無い
+// なので、.then(ensure) は
+// if (user == null) {
+//	throw 'missing user';
+// }
+// の糖衣構文のような扱いです
+```

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.0.0-beta.5",
+	"version": "11.0.0-beta.9",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",

src/migrate.ts

@@ -24,9 +24,14 @@ import { UserPublickey } from './models/entities/user-publickey';
 import { UserKeypair } from './models/entities/user-keypair';
 import { extractPublic } from './crypto_key';
 import { Emoji } from './models/entities/emoji';
-import { toPuny } from './misc/convert-host';
+import { toPuny as _toPuny } from './misc/convert-host';
 import { UserProfile } from './models/entities/user-profile';
 
+function toPuny(x: string | null): string | null {
+	if (x == null) return null;
+	return _toPuny(x);
+}
+
 const u = (config as any).mongodb.user ? encodeURIComponent((config as any).mongodb.user) : null;
 const p = (config as any).mongodb.pass ? encodeURIComponent((config as any).mongodb.pass) : null;
 

src/misc/convert-host.ts

@@ -19,3 +19,8 @@ export function extractDbHost(uri: string) {
 export function toPuny(host: string) {
 	return toASCII(host.toLowerCase());
 }
+
+export function toPunyNullable(host: string | null | undefined): string | null {
+	if (host == null) return null;
+	return toASCII(host.toLowerCase());
+}

src/models/repositories/note.ts

@@ -148,7 +148,7 @@ export class NoteRepository extends Repository<Note> {
 				return reaction.reaction;
 			}
 
-			return null;
+			return undefined;
 		}
 
 		let text = note.text;
@@ -162,15 +162,15 @@ export class NoteRepository extends Repository<Note> {
 		const packed = await rap({
 			id: note.id,
 			createdAt: note.createdAt,
-			app: note.appId ? Apps.pack(note.appId) : null,
+			app: note.appId ? Apps.pack(note.appId) : undefined,
 			userId: note.userId,
 			user: Users.pack(note.user || note.userId, meId),
 			text: text,
 			cw: note.cw,
 			visibility: note.visibility,
-			localOnly: note.localOnly,
-			visibleUserIds: note.visibleUserIds,
-			viaMobile: note.viaMobile,
+			localOnly: note.localOnly || undefined,
+			visibleUserIds: note.visibility === 'specified' ? note.visibleUserIds : undefined,
+			viaMobile: note.viaMobile || undefined,
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
 			reactions: note.reactions,
@@ -188,13 +188,13 @@ export class NoteRepository extends Repository<Note> {
 			...(opts.detail ? {
 				reply: note.replyId ? this.pack(note.replyId, meId, {
 					detail: false
-				}) : null,
+				}) : undefined,
 
 				renote: note.renoteId ? this.pack(note.renoteId, meId, {
 					detail: true
-				}) : null,
+				}) : undefined,
 
-				poll: note.hasPoll ? populatePoll() : null,
+				poll: note.hasPoll ? populatePoll() : undefined,
 
 				...(meId ? {
 					myReaction: populateMyReaction()

src/models/repositories/user-list.ts

@@ -1,6 +1,7 @@
 import { EntityRepository, Repository } from 'typeorm';
 import { UserList } from '../entities/user-list';
 import { ensure } from '../../prelude/ensure';
+import { UserListJoinings } from '..';
 
 @EntityRepository(UserList)
 export class UserListRepository extends Repository<UserList> {
@@ -9,9 +10,14 @@ export class UserListRepository extends Repository<UserList> {
 	) {
 		const userList = typeof src === 'object' ? src : await this.findOne(src).then(ensure);
 
+		const users = await UserListJoinings.find({
+			userListId: userList.id
+		});
+
 		return {
 			id: userList.id,
-			name: userList.name
+			name: userList.name,
+			userIds: users.map(x => x.userId)
 		};
 	}
 }

src/models/repositories/user.ts

@@ -89,13 +89,11 @@ export class UserRepository extends Repository<User> {
 			username: user.username,
 			host: user.host,
 			avatarUrl: user.avatarUrl,
-			bannerUrl: user.bannerUrl,
 			avatarColor: user.avatarColor,
-			bannerColor: user.bannerColor,
-			isAdmin: user.isAdmin,
-			isBot: user.isBot,
-			isCat: user.isCat,
-			isVerified: user.isVerified,
+			isAdmin: user.isAdmin || undefined,
+			isBot: user.isBot || undefined,
+			isCat: user.isCat || undefined,
+			isVerified: user.isVerified || undefined,
 
 			// カスタム絵文字添付
 			emojis: user.emojis.length > 0 ? Emojis.find({
@@ -121,6 +119,8 @@ export class UserRepository extends Repository<User> {
 				url: profile!.url,
 				createdAt: user.createdAt,
 				updatedAt: user.updatedAt,
+				bannerUrl: user.bannerUrl,
+				bannerColor: user.bannerColor,
 				description: profile!.description,
 				location: profile!.location,
 				birthday: profile!.birthday,

src/prelude/ensure.ts

@@ -1,3 +1,6 @@
+/**
+ * 値が null または undefined の場合はエラーを発生させ、そうでない場合は値をそのまま返します
+ */
 export function ensure<T>(x: T): NonNullable<T> {
 	if (x == null) {
 		throw 'ぬるぽ';

src/queue/processors/inbox.ts

@@ -12,7 +12,7 @@ import { Instances, Users, UserPublickeys } from '../../models';
 import { instanceChart } from '../../services/chart';
 import { UserPublickey } from '../../models/entities/user-publickey';
 import fetchMeta from '../../misc/fetch-meta';
-import { toPuny } from '../../misc/convert-host';
+import { toPuny, toPunyNullable } from '../../misc/convert-host';
 import { validActor } from '../../remote/activitypub/type';
 import { ensure } from '../../prelude/ensure';
 
@@ -36,7 +36,7 @@ export default async (job: Bull.Job): Promise<void> => {
 
 	if (keyIdLower.startsWith('acct:')) {
 		const acct = parseAcct(keyIdLower.slice('acct:'.length));
-		const host = acct.host ? toPuny(acct.host) : null;
+		const host = toPunyNullable(acct.host);
 		const username = toPuny(acct.username);
 
 		if (host === null) {

src/server/api/endpoints/admin/emoji/list.ts

@@ -1,7 +1,7 @@
 import $ from 'cafy';
 import define from '../../../define';
 import { Emojis } from '../../../../../models';
-import { toPuny } from '../../../../../misc/convert-host';
+import { toPunyNullable } from '../../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -23,7 +23,7 @@ export const meta = {
 
 export default define(meta, async (ps) => {
 	const emojis = await Emojis.find({
-		host: ps.host ? toPuny(ps.host) : null
+		host: toPunyNullable(ps.host)
 	});
 
 	return emojis.map(e => ({

src/server/api/endpoints/admin/logs.ts

@@ -34,7 +34,7 @@ export default define(meta, async (ps) => {
 
 	if (ps.domain) {
 		const whiteDomains = ps.domain.split(' ').filter(x => !x.startsWith('-'));
-		const blackDomains = ps.domain.split(' ').filter(x => x.startsWith('-'));
+		const blackDomains = ps.domain.split(' ').filter(x => x.startsWith('-')).map(x => x.substr(1));
 
 		if (whiteDomains.length > 0) {
 			query.andWhere(new Brackets(qb => {
@@ -53,11 +53,17 @@ export default define(meta, async (ps) => {
 		if (blackDomains.length > 0) {
 			query.andWhere(new Brackets(qb => {
 				for (const blackDomain of blackDomains) {
+					const subDomains = blackDomain.split('.');
 					let i = 0;
-					for (const subDomain of blackDomain.split('.')) {
+					for (const subDomain of subDomains) {
 						const p = `blackSubDomain_${subDomain}_${i}`;
-						// SQL is 1 based, so we need '+ 1'
-						qb.andWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain });
+						if (i === subDomains.length - 1) {
+							// SQL is 1 based, so we need '+ 1'
+							qb.andWhere(`log.domain[${i + 1}] != :${p}`, { [p]: subDomain });
+						} else {
+							// SQL is 1 based, so we need '+ 1'
+							qb.andWhere(`log.domain[${i + 1}] = :${p}`, { [p]: subDomain });
+						}
 						i++;
 					}
 				}

src/server/api/endpoints/i/update-email.ts

@@ -76,12 +76,12 @@ export default define(meta, async (ps, user) => {
 				user: meta.smtpUser,
 				pass: meta.smtpPass
 			} : undefined
-		});
+		} as any);
 
 		const link = `${config.url}/verify-email/${code}`;
 
 		transporter.sendMail({
-			from: meta.email,
+			from: meta.email!,
 			to: ps.email,
 			subject: meta.name || 'Misskey',
 			text: `To verify email, please click this link: ${link}`

src/server/api/endpoints/notes/polls/vote.ts

@@ -124,7 +124,7 @@ export default define(meta, async (ps, user) => {
 
 	// Increment votes count
 	const index = ps.choice + 1; // In SQL, array index is 1 based
-	await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE noteId = '${poll.noteId}'`);
+	await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE "noteId" = '${poll.noteId}'`);
 
 	publishNoteStream(note.id, 'pollVoted', {
 		choice: ps.choice,

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

@@ -4,7 +4,7 @@ import define from '../../define';
 import { ApiError } from '../../error';
 import { Users, Followings } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
-import { toPuny } from '../../../../misc/convert-host';
+import { toPunyNullable } from '../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -66,7 +66,7 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId != null
 		? { id: ps.userId }
-		: { usernameLower: ps.username!.toLowerCase(), host: toPuny(ps.host!) });
+		: { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(ps.host) });
 
 	if (user == null) {
 		throw new ApiError(meta.errors.noSuchUser);

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

@@ -4,7 +4,7 @@ import define from '../../define';
 import { ApiError } from '../../error';
 import { Users, Followings } from '../../../../models';
 import { makePaginationQuery } from '../../common/make-pagination-query';
-import { toPuny } from '../../../../misc/convert-host';
+import { toPunyNullable } from '../../../../misc/convert-host';
 
 export const meta = {
 	desc: {
@@ -66,7 +66,7 @@ export const meta = {
 export default define(meta, async (ps, me) => {
 	const user = await Users.findOne(ps.userId != null
 		? { id: ps.userId }
-		: { usernameLower: ps.username!.toLowerCase(), host: toPuny(ps.host!) });
+		: { usernameLower: ps.username!.toLowerCase(), host: toPunyNullable(ps.host) });
 
 	if (user == null) {
 		throw new ApiError(meta.errors.noSuchUser);

src/server/api/private/signup.ts

@@ -10,7 +10,7 @@ import { genId } from '../../../misc/gen-id';
 import { usersChart } from '../../../services/chart';
 import { User } from '../../../models/entities/user';
 import { UserKeypair } from '../../../models/entities/user-keypair';
-import { toPuny } from '../../../misc/convert-host';
+import { toPunyNullable } from '../../../misc/convert-host';
 import { UserProfile } from '../../../models/entities/user-profile';
 import { getConnection } from 'typeorm';
 
@@ -36,7 +36,7 @@ export default async (ctx: Koa.BaseContext) => {
 
 	const username = body['username'];
 	const password = body['password'];
-	const host = process.env.NODE_ENV === 'test' ? (body['host'] || null) : null;
+	const host: string | null = process.env.NODE_ENV === 'test' ? (body['host'] || null) : null;
 	const invitationCode = body['invitationCode'];
 
 	if (instance && instance.disableRegistration) {
@@ -96,7 +96,7 @@ export default async (ctx: Koa.BaseContext) => {
 				cipher: undefined,
 				passphrase: undefined
 			}
-		}, (e, publicKey, privateKey) =>
+		} as any, (e, publicKey, privateKey) =>
 			e ? j(e) : s([publicKey, privateKey])
 		));
 
@@ -109,7 +109,7 @@ export default async (ctx: Koa.BaseContext) => {
 			createdAt: new Date(),
 			username: username,
 			usernameLower: username.toLowerCase(),
-			host: toPuny(host),
+			host: toPunyNullable(host),
 			token: secret,
 			isAdmin: config.autoAdmin && usersCount === 0,
 		}));