Resolve #3248

Co-authored-by: syuilo <syuilotan@yahoo.co.jp>

3 files changed, 83 insertions, 39 deletions

diff --git a/src/server/api/endpoints/messaging/history.ts b/src/server/api/endpoints/messaging/history.ts
index c026e5dd91..78abea269a 100644
--- a/src/server/api/endpoints/messaging/history.ts
+++ b/src/server/api/endpoints/messaging/history.ts
@@ -1,7 +1,6 @@
 import $ from 'cafy';
-import History from '../../../../models/messaging-history';
 import Mute from '../../../../models/mute';
-import { pack } from '../../../../models/messaging-message';
+import Message, { pack, IMessagingMessage } from '../../../../models/messaging-message';
 import define from '../../define';
 
 export const meta = {
@@ -28,19 +27,36 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 		deletedAt: { $exists: false }
 	});
 
-	// Get history
-	const history = await History
-		.find({
-			userId: user._id,
-			partnerId: {
-				$nin: mute.map(m => m.muteeId)
-			}
+	const history: IMessagingMessage[] = [];
+
+	for (let i = 0; i < ps.limit; i++) {
+		const found = history.map(m => m.userId.equals(user._id) ? m.recipientId : m.userId);
+
+		const message = await Message.findOne({
+			$or: [{
+				userId: user._id
+			}, {
+				recipientId: user._id
+			}],
+			$and: [{
+				userId: { $nin: found },
+				recipientId: { $nin: found }
+			}, {
+				userId: { $nin: mute.map(m => m.muteeId) },
+				recipientId: { $nin: mute.map(m => m.muteeId) }
+			}]
 		}, {
-			limit: ps.limit,
 			sort: {
-				updatedAt: -1
+				createdAt: -1
 			}
 		});
 
-	res(await Promise.all(history.map(h => pack(h.messageId, user))));
+		if (message) {
+			history.push(message);
+		} else {
+			break;
+		}
+	}
+
+	res(await Promise.all(history.map(h => pack(h._id, user))));
 }));
diff --git a/src/server/api/endpoints/messaging/messages/create.ts b/src/server/api/endpoints/messaging/messages/create.ts
index f8901449fe..3630dc0d54 100644
--- a/src/server/api/endpoints/messaging/messages/create.ts
+++ b/src/server/api/endpoints/messaging/messages/create.ts
@@ -1,7 +1,6 @@
 import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
 import Message from '../../../../../models/messaging-message';
 import { isValidText } from '../../../../../models/messaging-message';
-import History from '../../../../../models/messaging-history';
 import User from '../../../../../models/user';
 import Mute from '../../../../../models/mute';
 import DriveFile from '../../../../../models/drive-file';
@@ -114,6 +113,7 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 	// 2秒経っても(今回作成した)メッセージが既読にならなかったら「未読のメッセージがありますよ」イベントを発行する
 	setTimeout(async () => {
 		const freshMessage = await Message.findOne({ _id: message._id }, { isRead: true });
+		if (freshMessage == null) return; // メッセージが削除されている場合もある
 		if (!freshMessage.isRead) {
 			//#region ただしミュートされているなら発行しない
 			const mute = await Mute.find({
@@ -130,30 +130,4 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 			pushSw(message.recipientId, 'unreadMessagingMessage', messageObj);
 		}
 	}, 2000);
-
-	// 履歴作成(自分)
-	History.update({
-		userId: user._id,
-		partnerId: recipient._id
-	}, {
-		updatedAt: new Date(),
-		userId: user._id,
-		partnerId: recipient._id,
-		messageId: message._id
-	}, {
-		upsert: true
-	});
-
-	// 履歴作成(相手)
-	History.update({
-		userId: recipient._id,
-		partnerId: user._id
-	}, {
-		updatedAt: new Date(),
-		userId: recipient._id,
-		partnerId: user._id,
-		messageId: message._id
-	}, {
-		upsert: true
-	});
 }));
diff --git a/src/server/api/endpoints/messaging/messages/delete.ts b/src/server/api/endpoints/messaging/messages/delete.ts
new file mode 100644
index 0000000000..dc9bb51b91
--- /dev/null
+++ b/src/server/api/endpoints/messaging/messages/delete.ts
@@ -0,0 +1,54 @@
+
+import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
+import Message from '../../../../../models/messaging-message';
+import define from '../../../define';
+import { publishMessagingStream } from '../../../../../stream';
+const ms = require('ms');
+
+export const meta = {
+	stability: 'stable',
+
+	desc: {
+		'ja-JP': '指定したメッセージを削除します。',
+		'en-US': 'Delete a message.'
+	},
+
+	requireCredential: true,
+
+	kind: 'messaging-write',
+
+	limit: {
+		duration: ms('1hour'),
+		max: 300,
+		minInterval: ms('1sec')
+	},
+
+	params: {
+		messageId: {
+			validator: $.type(ID),
+			transform: transform,
+			desc: {
+				'ja-JP': '対象のメッセージのID',
+				'en-US': 'Target message ID.'
+			}
+		}
+	}
+};
+
+export default define(meta, (ps, user) => new Promise(async (res, rej) => {
+	const message = await Message.findOne({
+		_id: ps.messageId,
+		userId: user._id
+	});
+
+	if (message === null) {
+		return rej('message not found');
+	}
+
+	await Message.remove({ _id: message._id });
+
+	publishMessagingStream(message.userId, message.recipientId, 'deleted', message._id);
+	publishMessagingStream(message.recipientId, message.userId, 'deleted', message._id);
+
+	res();
+}));