8 files changed, 151 insertions, 10 deletions
diff --git a/src/server/api/call.ts b/src/server/api/call.ts
index 1d0e858762..e4bb30b695 100644
--- a/src/server/api/call.ts
+++ b/src/server/api/call.ts
@@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks';
 import limitter from './limitter';
-import { IUser } from '../../models/user';
+import { IUser, isLocalUser } from '../../models/user';
 import { IApp } from '../../models/app';
 import endpoints from './endpoints';
 
@@ -21,6 +21,10 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any)
 		return rej('YOUR_ACCOUNT_HAS_BEEN_SUSPENDED');
 	}
 
+	if (ep.meta.requireAdmin && !(isLocalUser(user) && user.isAdmin)) {
+		return rej('YOU_ARE_NOT_ADMIN');
+	}
+
 	if (app && ep.meta.kind) {
 		if (!app.permission.some(p => p === ep.meta.kind)) {
 			return rej('PERMISSION_DENIED');
@@ -53,7 +57,7 @@ export default (endpoint: string, user: IUser, app: IApp, data: any, file?: any)
 		const time = after - before;
 
 		if (time > 1000) {
-			console.warn(`SLOW API CALL DETECTED: ${ep.name} (${ time }ms)`);
+			console.warn(`SLOW API CALL DETECTED: ${ep.name} (${time}ms)`);
 		}
 	} catch (e) {
 		rej(e);
diff --git a/src/server/api/endpoints.ts b/src/server/api/endpoints.ts
index 332a051ae1..d4a44070e6 100644
--- a/src/server/api/endpoints.ts
+++ b/src/server/api/endpoints.ts
@@ -15,6 +15,11 @@ export interface IEndpointMeta {
 	requireCredential?: boolean;
 
 	/**
+	 * 管理者のみ使えるエンドポイントか否か
+	 */
+	requireAdmin?: boolean;
+
+	/**
 	 * エンドポイントのリミテーションに関するやつ
 	 * 省略した場合はリミテーションは無いものとして解釈されます。
 	 * また、withCredential が false の場合はリミテーションを行うことはできません。
diff --git a/src/server/api/endpoints/admin/suspend-user.ts b/src/server/api/endpoints/admin/suspend-user.ts
new file mode 100644
index 0000000000..8698120cdb
--- /dev/null
+++ b/src/server/api/endpoints/admin/suspend-user.ts
@@ -0,0 +1,46 @@
+import $ from 'cafy';
+import ID from '../../../../misc/cafy-id';
+import getParams from '../../get-params';
+import User from '../../../../models/user';
+
+export const meta = {
+  desc: {
+    ja: '指定したユーザーを凍結します。',
+    en: 'Suspend a user.'
+  },
+
+  requireCredential: true,
+  requireAdmin: true,
+
+  params: {
+    userId: $.type(ID).note({
+      desc: {
+        ja: '対象のユーザーID',
+        en: 'The user ID which you want to suspend'
+      }
+    }),
+  }
+};
+
+export default (params: any) => new Promise(async (res, rej) => {
+  const [ps, psErr] = getParams(meta, params);
+  if (psErr) return rej(psErr);
+
+  const user = await User.findOne({
+    _id: ps.userId
+  });
+
+  if (user == null) {
+    return rej('user not found');
+  }
+
+  await User.findOneAndUpdate({
+    _id: user._id
+  }, {
+      $set: {
+        isSuspended: true
+      }
+    });
+
+  res();
+});
diff --git a/src/server/api/endpoints/admin/unsuspend-user.ts b/src/server/api/endpoints/admin/unsuspend-user.ts
new file mode 100644
index 0000000000..8409bd1b76
--- /dev/null
+++ b/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -0,0 +1,46 @@
+import $ from 'cafy';
+import ID from '../../../../misc/cafy-id';
+import getParams from '../../get-params';
+import User from '../../../../models/user';
+
+export const meta = {
+	desc: {
+		ja: '指定したユーザーの凍結を解除します。',
+		en: 'Unsuspend a user.'
+	},
+
+	requireCredential: true,
+	requireAdmin: true,
+
+	params: {
+		userId: $.type(ID).note({
+			desc: {
+				ja: '対象のユーザーID',
+				en: 'The user ID which you want to unsuspend'
+			}
+		}),
+	}
+};
+
+export default (params: any) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) return rej(psErr);
+
+	const user = await User.findOne({
+		_id: ps.userId
+	});
+
+	if (user == null) {
+		return rej('user not found');
+	}
+
+	await User.findOneAndUpdate({
+		_id: user._id
+	}, {
+			$set: {
+				isSuspended: false
+			}
+		});
+
+	res();
+});
diff --git a/src/server/api/endpoints/app/create.ts b/src/server/api/endpoints/app/create.ts
index 5df8bd2f25..b2a5fb73c1 100644
--- a/src/server/api/endpoints/app/create.ts
+++ b/src/server/api/endpoints/app/create.ts
@@ -4,7 +4,7 @@ import App, { isValidNameId, pack } from '../../../../models/app';
 import { ILocalUser } from '../../../../models/user';
 
 export const meta = {
-	requireCredential: true
+	requireCredential: false
 };
 
 /**
@@ -38,7 +38,7 @@ export default async (params: any, user: ILocalUser) => new Promise(async (res,
 	// Create account
 	const app = await App.insert({
 		createdAt: new Date(),
-		userId: user._id,
+		userId: user && user._id,
 		name: name,
 		nameId: nameId,
 		nameIdLower: nameId.toLowerCase(),
diff --git a/src/server/api/endpoints/messaging/history.ts b/src/server/api/endpoints/messaging/history.ts
index 66798d50c5..43cceacf95 100644
--- a/src/server/api/endpoints/messaging/history.ts
+++ b/src/server/api/endpoints/messaging/history.ts
@@ -40,6 +40,5 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		});
 
 	// Serialize
-	res(await Promise.all(history.map(async h =>
-		await pack(h.messageId, user))));
+	res(await Promise.all(history.map(h => pack(h.messageId, user))));
 });
diff --git a/src/server/api/endpoints/messaging/messages/read.ts b/src/server/api/endpoints/messaging/messages/read.ts
new file mode 100644
index 0000000000..f609337523
--- /dev/null
+++ b/src/server/api/endpoints/messaging/messages/read.ts
@@ -0,0 +1,43 @@
+import $ from 'cafy'; import ID from '../../../../../misc/cafy-id';
+import Message from '../../../../../models/messaging-message';
+import { ILocalUser } from '../../../../../models/user';
+import read from '../../../common/read-messaging-message';
+import getParams from '../../../get-params';
+
+export const meta = {
+	desc: {
+		ja: '指定した自分宛てのメッセージを既読にします。',
+		en: 'Mark as read a message of messaging.'
+	},
+
+	requireCredential: true,
+
+	kind: 'messaging-write',
+
+	params: {
+		messageId: $.type(ID).note({
+			desc: {
+				ja: '既読にするメッセージのID',
+				en: 'The ID of a message that you want to mark as read'
+			}
+		})
+	}
+};
+
+export default (params: any, user: ILocalUser) => new Promise(async (res, rej) => {
+	const [ps, psErr] = getParams(meta, params);
+	if (psErr) throw psErr;
+
+	const message = await Message.findOne({
+		_id: ps.messageId,
+		recipientId: user._id
+	});
+
+	if (message == null) {
+		return rej('message not found');
+	}
+
+	read(user._id, message.userId, message);
+
+	res();
+});
diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts
index faa8ccf3ca..c1b8644e4d 100644
--- a/src/server/api/endpoints/notes/timeline.ts
+++ b/src/server/api/endpoints/notes/timeline.ts
@@ -8,7 +8,8 @@ import getParams from '../../get-params';
 
 export const meta = {
 	desc: {
-		ja: 'タイムラインを取得します。'
+		ja: 'タイムラインを取得します。',
+		en: 'Get timeline of myself.'
 	},
 
 	requireCredential: true,
@@ -67,9 +68,6 @@ export const meta = {
 	}
 };
 
-/**
- * Get timeline of myself
- */
 export default async (params: any, user: ILocalUser) => {
 	const [ps, psErr] = getParams(meta, params);
 	if (psErr) throw psErr;