From 84db15694d7223d6f46bae6340542b4c24e9bcb3 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 4 Nov 2018 03:32:20 +0900
Subject: Do not send needless emojis in note
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

投稿作成時に含まれている絵文字を保存しておくように

SEE: https://github.com/syuilo/misskey/pull/3085#issuecomment-435608434
---
 src/models/emoji.ts | 11 -----------
 src/models/note.ts  | 20 ++++++++++++++++++--
 2 files changed, 18 insertions(+), 13 deletions(-)

(limited to 'src/models')

diff --git a/src/models/emoji.ts b/src/models/emoji.ts
index fdedd28513..8e75868e62 100644
--- a/src/models/emoji.ts
+++ b/src/models/emoji.ts
@@ -16,14 +16,3 @@ export type IEmoji = {
 	aliases?: string[];
 	updatedAt?: Date;
 };
-
-export const packEmojis = async (
-	host: string,
-	// MeiTODO: filter
-) => {
-	return await Emoji.find({ host }, {
-		fields: {
-			_id: false
-		}
-	});
-};
diff --git a/src/models/note.ts b/src/models/note.ts
index 684e8c3b1e..6856d6d07d 100644
--- a/src/models/note.ts
+++ b/src/models/note.ts
@@ -12,7 +12,7 @@ import { packMany as packFileMany, IDriveFile } from './drive-file';
 import Favorite from './favorite';
 import Following from './following';
 import config from '../config';
-import { packEmojis } from './emoji';
+import Emoji from './emoji';
 
 const Note = db.get<INote>('notes');
 Note.createIndex('uri', { sparse: true, unique: true });
@@ -50,6 +50,7 @@ export type INote = {
 	text: string;
 	tags: string[];
 	tagsLower: string[];
+	emojis: string[];
 	cw: string;
 	userId: mongo.ObjectID;
 	appId: mongo.ObjectID;
@@ -231,7 +232,22 @@ export const pack = async (
 
 	// _note._userを消す前か、_note.userを解決した後でないとホストがわからない
 	if (_note._user) {
-		_note.emojis = packEmojis(_note._user.host);
+		const host = _note._user.host;
+		// 互換性のため。(古いMisskeyではNoteにemojisが無い)
+		if (_note.emojis == null) {
+			_note.emojis = Emoji.find({
+				host: host
+			}, {
+				fields: { _id: false }
+			});
+		} else {
+			_note.emojis = Emoji.find({
+				name: { $in: _note.emojis },
+				host: host
+			}, {
+				fields: { _id: false }
+			});
+		}
 	}
 
 	// Rename _id to id
-- 
cgit v1.2.3-freya