Merge branch 'master' into l10n_master

2 files changed, 1 insertions, 16 deletions

diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index 8ebf1a2a2b..d33d9e7e77 100644
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -9,7 +9,6 @@ import { pack } from '../../../../../models/messaging-message';
 import { publishUserStream } from '../../../../../stream';
 import { publishMessagingStream, publishMessagingIndexStream } from '../../../../../stream';
 import pushSw from '../../../../../push-sw';
-import config from '../../../../../config';
 
 export const meta = {
 	desc: {
@@ -123,20 +122,6 @@ export default (params: any, user: ILocalUser) => new Promise(async (res, rej) =
 		}
 	}, 3000);
 
-	// Register to search database
-	if (message.text && config.elasticsearch) {
-		const es = require('../../../db/elasticsearch');
-
-		es.index({
-			index: 'misskey',
-			type: 'messaging_message',
-			id: message._id.toString(),
-			body: {
-				text: message.text
-			}
-		});
-	}
-
 	// 履歴作成(自分)
 	History.update({
 		userId: user._id,
diff --git a/src/server/api/stream/user-list.ts b/src/server/api/stream/user-list.ts
index 33cc2a1ee1..30f94d5251 100644
--- a/src/server/api/stream/user-list.ts
+++ b/src/server/api/stream/user-list.ts
@@ -8,6 +8,6 @@ export default function(request: websocket.request, connection: websocket.connec
 
 	// Subscribe stream
 	subscriber.on(`user-list-stream:${listId}`, data => {
-		connection.send(data);
+		connection.send(JSON.stringify(data));
 	});
 }