ローカルタイムラインとグローバルタイムラインを実装

2 files changed, 5 insertions, 15 deletions

diff --git a/src/server/api/endpoints/mute/create.ts b/src/server/api/endpoints/mute/create.ts
index 19894d07af..26ae612cab 100644
--- a/src/server/api/endpoints/mute/create.ts
+++ b/src/server/api/endpoints/mute/create.ts
@@ -30,7 +30,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	}, {
 		fields: {
 			data: false,
-			'profile': false
+			profile: false
 		}
 	});
 
@@ -41,8 +41,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Check if already muting
 	const exist = await Mute.findOne({
 		muterId: muter._id,
-		muteeId: mutee._id,
-		deletedAt: { $exists: false }
+		muteeId: mutee._id
 	});
 
 	if (exist !== null) {
diff --git a/src/server/api/endpoints/mute/delete.ts b/src/server/api/endpoints/mute/delete.ts
index 10096352ba..6f617416c8 100644
--- a/src/server/api/endpoints/mute/delete.ts
+++ b/src/server/api/endpoints/mute/delete.ts
@@ -7,10 +7,6 @@ import Mute from '../../../../models/mute';
 
 /**
  * Unmute a user
- *
- * @param {any} params
- * @param {any} user
- * @return {Promise<any>}
  */
 module.exports = (params, user) => new Promise(async (res, rej) => {
 	const muter = user;
@@ -30,7 +26,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	}, {
 		fields: {
 			data: false,
-			'profile': false
+			profile: false
 		}
 	});
 
@@ -41,8 +37,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	// Check not muting
 	const exist = await Mute.findOne({
 		muterId: muter._id,
-		muteeId: mutee._id,
-		deletedAt: { $exists: false }
+		muteeId: mutee._id
 	});
 
 	if (exist === null) {
@@ -50,12 +45,8 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
 	}
 
 	// Delete mute
-	await Mute.update({
+	await Mute.remove({
 		_id: exist._id
-	}, {
-		$set: {
-			deletedAt: new Date()
-		}
 	});
 
 	// Send response