%fa:exclamation-triangle% %i18n:@is-remote% %i18n:@view-remote%
%fa:exclamation-triangle% %i18n:@is-remote%%i18n:@view-remote%
From 50d56bdc2585a3bbd4ad996426f62d6ed186a34d Mon Sep 17 00:00:00 2001
From: syuilo
Date: Tue, 17 Apr 2018 22:31:52 +0900
Subject: [PATCH 014/292] 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 9638d15932..00c249849e 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 7e79912b1b..4435a6a3c8 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 e35e5ecfbd..391a3d7647 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
}
});
From a447ed1d106451b1e55f106d6aa4545680de3b82 Mon Sep 17 00:00:00 2001
From: syuilo
Date: Tue, 17 Apr 2018 22:33:27 +0900
Subject: [PATCH 015/292] oops
---
src/models/user.ts | 2 +-
src/server/api/endpoints/notes/create.ts | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/models/user.ts b/src/models/user.ts
index 00c249849e..bcb2a73e24 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -2,7 +2,7 @@ import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import rap from '@prezzemolo/rap';
import db from '../db/mongodb';
-import Note, { INote, pack as packNote, deleteNote } from './note';
+import Note, { pack as packNote, deleteNote } from './note';
import Following, { deleteFollowing } from './following';
import Mute, { deleteMute } from './mute';
import getFriends from '../server/api/common/get-friends';
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index 4435a6a3c8..14e906eb9d 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -2,7 +2,6 @@
* Module dependencies
*/
import $ from 'cafy';
-import deepEqual = require('deep-equal');
import Note, { INote, isValidText, isValidCw, pack } from '../../../../models/note';
import { ILocalUser } from '../../../../models/user';
import Channel, { IChannel } from '../../../../models/channel';
From 957cddf4dbe050b1c8a7aae46c00c16e8771710e Mon Sep 17 00:00:00 2001
From: syuilo
Date: Wed, 18 Apr 2018 07:23:27 +0900
Subject: [PATCH 016/292] :art:
---
src/client/app/desktop/views/components/note-detail.vue | 4 +++-
src/client/app/desktop/views/components/notes.note.vue | 4 +++-
src/client/app/mobile/views/components/note-detail.vue | 4 +++-
src/client/app/mobile/views/components/note.vue | 4 +++-
4 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
index b62a7cfd61..f5153bad63 100644
--- a/src/client/app/desktop/views/components/note-detail.vue
+++ b/src/client/app/desktop/views/components/note-detail.vue
@@ -56,7 +56,9 @@