From f0a29721c9fb10f97faf386bc9d6b1b2fad97895 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 7 Apr 2019 21:50:36 +0900 Subject: Use PostgreSQL instead of MongoDB (#4572) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * wip * Update note.ts * Update timeline.ts * Update core.ts * wip * Update generate-visibility-query.ts * wip * wip * wip * wip * wip * Update global-timeline.ts * wip * wip * wip * Update vote.ts * wip * wip * Update create.ts * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update files.ts * wip * wip * Update CONTRIBUTING.md * wip * wip * wip * wip * wip * wip * wip * wip * Update read-notification.ts * wip * wip * wip * wip * wip * wip * wip * Update cancel.ts * wip * wip * wip * Update show.ts * wip * wip * Update gen-id.ts * Update create.ts * Update id.ts * wip * wip * wip * wip * wip * wip * wip * Docker: Update files about Docker (#4599) * Docker: Use cache if files used by `yarn install` was not updated This patch reduces the number of times to installing node_modules. For example, `yarn install` step will be skipped when only ".config/default.yml" is updated. * Docker: Migrate MongoDB to Postgresql Misskey uses Postgresql as a database instead of Mongodb since version 11. * Docker: Uncomment about data persistence This patch will save a lot of databases. * wip * wip * wip * Update activitypub.ts * wip * wip * wip * Update logs.ts * wip * Update drive-file.ts * Update register.ts * wip * wip * Update mentions.ts * wip * wip * wip * Update recommendation.ts * wip * Update index.ts * wip * Update recommendation.ts * Doc: Update docker.ja.md and docker.en.md (#1) (#4608) Update how to set up misskey. * wip * :v: * wip * Update note.ts * Update postgre.ts * wip * wip * wip * wip * Update add-file.ts * wip * wip * wip * Clean up * Update logs.ts * wip * :pizza: * wip * Ad notes * wip * Update api-visibility.ts * Update note.ts * Update add-file.ts * tests * tests * Update postgre.ts * Update utils.ts * wip * wip * Refactor * wip * Refactor * wip * wip * Update show-users.ts * Update update-instance.ts * wip * Update feed.ts * Update outbox.ts * Update outbox.ts * Update user.ts * wip * Update list.ts * Update update-hashtag.ts * wip * Update update-hashtag.ts * Refactor * Update update.ts * wip * wip * :v: * clean up * docs * Update push.ts * wip * Update api.ts * wip * :v: * Update make-pagination-query.ts * :v: * Delete hashtags.ts * Update instances.ts * Update instances.ts * Update create.ts * Update search.ts * Update reversi-game.ts * Update signup.ts * Update user.ts * id * Update example.yml * :art: * objectid * fix * reversi * reversi * Fix bug of chart engine * Add test of chart engine * Improve test * Better testing * Improve chart engine * Refactor * Add test of chart engine * Refactor * Add chart test * Fix bug * コミットし忘れ * Refactoring * :v: * Add tests * Add test * Extarct note tests * Refactor * 存在しないユーザーにメンションできなくなっていた問題を修正 * Fix bug * Update update-meta.ts * Fix bug * Update mention.vue * Fix bug * Update meta.ts * Update CONTRIBUTING.md * Fix bug * Fix bug * Fix bug * Clean up * Clean up * Update notification.ts * Clean up * Add mute tests * Add test * Refactor * Add test * Fix test * Refactor * Refactor * Add tests * Update utils.ts * Update utils.ts * Fix test * Update package.json * Update update.ts * Update manifest.ts * Fix bug * Fix bug * Add test * :art: * Update endpoint permissions * Updaye permisison * Update person.ts #4299 * データベースと同期しないように * Fix bug * Fix bug * Update reversi-game.ts * Use a feature of Node v11.7.0 to extract a public key (#4644) * wip * wip * :v: * Refactoring #1540 * test * test * test * test * test * test * test * Fix bug * Fix test * :sushi: * wip * #4471 * Add test for #4335 * Refactor * Fix test * Add tests * :clock4: * Fix bug * Add test * Add test * rename * Fix bug --- src/services/note/delete.ts | 94 ++++++++++----------------------------------- 1 file changed, 20 insertions(+), 74 deletions(-) (limited to 'src/services/note/delete.ts') diff --git a/src/services/note/delete.ts b/src/services/note/delete.ts index d71c97b2ca..7f04d12cd5 100644 --- a/src/services/note/delete.ts +++ b/src/services/note/delete.ts @@ -1,99 +1,50 @@ -import Note, { INote } from '../../models/note'; -import { IUser, isLocalUser, isRemoteUser } from '../../models/user'; import { publishNoteStream } from '../stream'; import renderDelete from '../../remote/activitypub/renderer/delete'; import { renderActivity } from '../../remote/activitypub/renderer'; import { deliver } from '../../queue'; -import Following from '../../models/following'; import renderTombstone from '../../remote/activitypub/renderer/tombstone'; -import notesChart from '../../services/chart/notes'; -import perUserNotesChart from '../../services/chart/per-user-notes'; import config from '../../config'; -import NoteUnread from '../../models/note-unread'; -import read from './read'; -import DriveFile from '../../models/drive-file'; import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; -import Instance from '../../models/instance'; -import instanceChart from '../../services/chart/instance'; -import Favorite from '../../models/favorite'; +import { User } from '../../models/entities/user'; +import { Note } from '../../models/entities/note'; +import { Notes, Users, Followings, Instances } from '../../models'; +import { Not } from 'typeorm'; +import { notesChart, perUserNotesChart, instanceChart } from '../chart'; /** * 投稿を削除します。 * @param user 投稿者 * @param note 投稿 */ -export default async function(user: IUser, note: INote, quiet = false) { +export default async function(user: User, note: Note, quiet = false) { const deletedAt = new Date(); - await Note.update({ - _id: note._id, - userId: user._id - }, { - $set: { - deletedAt: deletedAt, - text: null, - tags: [], - fileIds: [], - renoteId: null, - poll: null, - geo: null, - cw: null - } + await Notes.delete({ + id: note.id, + userId: user.id }); if (note.renoteId) { - Note.update({ _id: note.renoteId }, { - $inc: { - renoteCount: -1, - score: -1 - }, - $pull: { - _quoteIds: note._id - } - }); - } - - // この投稿が関わる未読通知を削除 - NoteUnread.find({ - noteId: note._id - }).then(unreads => { - for (const unread of unreads) { - read(unread.userId, unread.noteId); - } - }); - - // この投稿をお気に入りから削除 - Favorite.remove({ - noteId: note._id - }); - - // ファイルが添付されていた場合ドライブのファイルの「このファイルが添付された投稿一覧」プロパティからこの投稿を削除 - if (note.fileIds) { - for (const fileId of note.fileIds) { - DriveFile.update({ _id: fileId }, { - $pull: { - 'metadata.attachedNoteIds': note._id - } - }); - } + Notes.decrement({ id: note.renoteId }, 'renoteCount', 1); + Notes.decrement({ id: note.renoteId }, 'score', 1); } if (!quiet) { - publishNoteStream(note._id, 'deleted', { + publishNoteStream(note.id, 'deleted', { deletedAt: deletedAt }); //#region ローカルの投稿なら削除アクティビティを配送 - if (isLocalUser(user)) { - const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${note._id}`), user)); + if (Users.isLocalUser(user)) { + const content = renderActivity(renderDelete(renderTombstone(`${config.url}/notes/${note.id}`), user)); - const followings = await Following.find({ - followeeId: user._id, - '_follower.host': { $ne: null } + const followings = await Followings.find({ + followeeId: user.id, + followerHost: Not(null) }); for (const following of followings) { - deliver(user, content, following._follower.inbox); + deliver(user, content, following.followerInbox); } } //#endregion @@ -102,14 +53,9 @@ export default async function(user: IUser, note: INote, quiet = false) { notesChart.update(note, false); perUserNotesChart.update(user, note, false); - if (isRemoteUser(user)) { + if (Users.isRemoteUser(user)) { registerOrFetchInstanceDoc(user.host).then(i => { - Instance.update({ _id: i._id }, { - $inc: { - notesCount: -1 - } - }); - + Instances.decrement({ id: i.id }, 'notesCount', 1); instanceChart.updateNote(i.host, false); }); } -- cgit v1.2.3-freya