From 50d56bdc2585a3bbd4ad996426f62d6ed186a34d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 17 Apr 2018 22:31:52 +0900
Subject: [PATCH] Clean up

---
 src/models/user.ts                       |  4 ---
 src/server/api/endpoints/notes/create.ts | 42 ------------------------
 src/services/note/create.ts              |  6 +---
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/src/models/user.ts b/src/models/user.ts
index 9638d1593..00c249849 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -47,7 +47,6 @@ type IUserBase = {
 	bannerId: mongo.ObjectID;
 	data: any;
 	description: string;
-	latestNote: INote;
 	pinnedNoteId: mongo.ObjectID;
 	isSuspended: boolean;
 	keywords: string[];
@@ -332,9 +331,6 @@ export const pack = (
 	_user.id = _user._id;
 	delete _user._id;
 
-	// Remove needless properties
-	delete _user.latestNote;
-
 	if (_user.host == null) {
 		// Remove private properties
 		delete _user.keypair;
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index 7e79912b1..4435a6a3c 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -97,31 +97,7 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
 			return rej('cannot renote to renote');
 		}
 
-		// Fetch recently note
-		const latestNote = await Note.findOne({
-			userId: user._id
-		}, {
-			sort: {
-				_id: -1
-			}
-		});
-
 		isQuote = text != null || files != null;
-
-		// 直近と同じRenote対象かつ引用じゃなかったらエラー
-		if (latestNote &&
-			latestNote.renoteId &&
-			latestNote.renoteId.equals(renote._id) &&
-			!isQuote) {
-			return rej('cannot renote same note that already reposted in your latest note');
-		}
-
-		// 直近がRenote対象かつ引用じゃなかったらエラー
-		if (latestNote &&
-			latestNote._id.equals(renote._id) &&
-			!isQuote) {
-			return rej('cannot renote your latest note');
-		}
 	}
 
 	// Get 'replyId' parameter
@@ -208,24 +184,6 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
 		return rej('text, mediaIds, renoteId or poll is required');
 	}
 
-	// 直近の投稿と重複してたらエラー
-	// TODO: 直近の投稿が一日前くらいなら重複とは見なさない
-	if (user.latestNote) {
-		if (deepEqual({
-			text: user.latestNote.text,
-			reply: user.latestNote.replyId ? user.latestNote.replyId.toString() : null,
-			renote: user.latestNote.renoteId ? user.latestNote.renoteId.toString() : null,
-			mediaIds: (user.latestNote.mediaIds || []).map(id => id.toString())
-		}, {
-			text: text,
-			reply: reply ? reply._id.toString() : null,
-			renote: renote ? renote._id.toString() : null,
-			mediaIds: (files || []).map(file => file._id.toString())
-		})) {
-			return rej('duplicate');
-		}
-	}
-
 	// 投稿を作成
 	const note = await create(user, {
 		createdAt: new Date(),
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index e35e5ecfb..391a3d764 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -89,14 +89,10 @@ export default async (user: IUser, data: {
 
 	res(note);
 
+	// Increment notes count
 	User.update({ _id: user._id }, {
-		// Increment notes count
 		$inc: {
 			notesCount: 1
-		},
-		// Update latest note
-		$set: {
-			latestNote: note
 		}
 	});