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

3 files changed, 28 insertions, 19 deletions

diff --git a/src/api/authenticate.ts b/src/api/authenticate.ts
index d4cc3fc41f..b289959ac1 100644
--- a/src/api/authenticate.ts
+++ b/src/api/authenticate.ts
@@ -1,6 +1,6 @@
 import * as express from 'express';
 import App from './models/app';
-import User from './models/user';
+import { default as User, IUser } from './models/user';
 import AccessToken from './models/access-token';
 import isNativeToken from './common/is-native-token';
 
@@ -13,10 +13,10 @@ export interface IAuthContext {
 	/**
 	 * Authenticated user
 	 */
-	user: any;
+	user: IUser;
 
 	/**
-	 * Weather if the request is via the User-Native Token or not
+	 * Whether requested with a User-Native Token
 	 */
 	isSecure: boolean;
 }
@@ -25,11 +25,15 @@ export default (req: express.Request) => new Promise<IAuthContext>(async (resolv
 	const token = req.body['i'] as string;
 
 	if (token == null) {
-		return resolve({ app: null, user: null, isSecure: false });
+		return resolve({
+			app: null,
+			user: null,
+			isSecure: false
+		});
 	}
 
 	if (isNativeToken(token)) {
-		const user = await User
+		const user: IUser = await User
 			.findOne({ token: token });
 
 		if (user === null) {
@@ -56,6 +60,10 @@ export default (req: express.Request) => new Promise<IAuthContext>(async (resolv
 		const user = await User
 			.findOne({ _id: accessToken.user_id });
 
-		return resolve({ app: app, user: user, isSecure: false });
+		return resolve({
+			app: app,
+			user: user,
+			isSecure: false
+		});
 	}
 });
diff --git a/src/api/serializers/user.ts b/src/api/serializers/user.ts
index 57599fe85c..23a176096a 100644
--- a/src/api/serializers/user.ts
+++ b/src/api/serializers/user.ts
@@ -37,7 +37,9 @@ export default (
 		data: false
 	} : {
 		data: false,
-		profile: false
+		profile: false,
+		keywords: false,
+		domains: false
 	};
 
 	// Populate the user if 'user' is ID
@@ -119,6 +121,7 @@ export default (
 
 	if (opts.detail) {
 		if (_user.pinned_post_id) {
+			// Populate pinned post
 			_user.pinned_post = await serializePost(_user.pinned_post_id, meId, {
 				detail: true
 			});
diff --git a/src/api/streaming.ts b/src/api/streaming.ts
index c71132100c..db600013b9 100644
--- a/src/api/streaming.ts
+++ b/src/api/streaming.ts
@@ -2,7 +2,7 @@ import * as http from 'http';
 import * as websocket from 'websocket';
 import * as redis from 'redis';
 import config from '../conf';
-import User from './models/user';
+import { default as User, IUser } from './models/user';
 import AccessToken from './models/access-token';
 import isNativeToken from './common/is-native-token';
 
@@ -26,7 +26,7 @@ module.exports = (server: http.Server) => {
 			return;
 		}
 
-		const user = await authenticate(connection, request.resourceURL.query.i);
+		const user = await authenticate(request.resourceURL.query.i);
 
 		if (user == null) {
 			connection.send('authentication-failed');
@@ -56,7 +56,11 @@ module.exports = (server: http.Server) => {
 	});
 };
 
-function authenticate(connection: websocket.connection, token: string): Promise<any> {
+/**
+ * 接続してきたユーザーを取得します
+ * @param token 送信されてきたトークン
+ */
+function authenticate(token: string): Promise<IUser> {
 	if (token == null) {
 		return Promise.resolve(null);
 	}
@@ -64,8 +68,7 @@ function authenticate(connection: websocket.connection, token: string): Promise<
 	return new Promise(async (resolve, reject) => {
 		if (isNativeToken(token)) {
 			// Fetch user
-			// SELECT _id
-			const user = await User
+			const user: IUser = await User
 				.findOne({
 					token: token
 				});
@@ -81,13 +84,8 @@ function authenticate(connection: websocket.connection, token: string): Promise<
 			}
 
 			// Fetch user
-			// SELECT _id
-			const user = await User
-				.findOne({ _id: accessToken.user_id }, {
-					fields: {
-						_id: true
-					}
-				});
+			const user: IUser = await User
+				.findOne({ _id: accessToken.user_id });
 
 			resolve(user);
 		}