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/blocking/create.ts | 89 +++++++++++++++++------------------------ src/services/blocking/delete.ts | 18 ++++----- 2 files changed, 44 insertions(+), 63 deletions(-) (limited to 'src/services/blocking') diff --git a/src/services/blocking/create.ts b/src/services/blocking/create.ts index c20666ef26..79ca0d59f1 100644 --- a/src/services/blocking/create.ts +++ b/src/services/blocking/create.ts @@ -1,6 +1,3 @@ -import User, { isLocalUser, isRemoteUser, pack as packUser, IUser } from '../../models/user'; -import Following from '../../models/following'; -import FollowRequest from '../../models/follow-request'; import { publishMainStream } from '../stream'; import { renderActivity } from '../../remote/activitypub/renderer'; import renderFollow from '../../remote/activitypub/renderer/follow'; @@ -8,11 +5,12 @@ import renderUndo from '../../remote/activitypub/renderer/undo'; import renderBlock from '../../remote/activitypub/renderer/block'; import { deliver } from '../../queue'; import renderReject from '../../remote/activitypub/renderer/reject'; -import perUserFollowingChart from '../../services/chart/per-user-following'; -import Blocking from '../../models/blocking'; - -export default async function(blocker: IUser, blockee: IUser) { +import { User } from '../../models/entities/user'; +import { Blockings, Users, FollowRequests, Followings } from '../../models'; +import { perUserFollowingChart } from '../chart'; +import { genId } from '../../misc/gen-id'; +export default async function(blocker: User, blockee: User) { await Promise.all([ cancelRequest(blocker, blockee), cancelRequest(blockee, blocker), @@ -20,105 +18,90 @@ export default async function(blocker: IUser, blockee: IUser) { unFollow(blockee, blocker) ]); - await Blocking.insert({ + await Blockings.save({ + id: genId(), createdAt: new Date(), - blockerId: blocker._id, - blockeeId: blockee._id, + blockerId: blocker.id, + blockeeId: blockee.id, }); - if (isLocalUser(blocker) && isRemoteUser(blockee)) { + if (Users.isLocalUser(blocker) && Users.isRemoteUser(blockee)) { const content = renderActivity(renderBlock(blocker, blockee)); deliver(blocker, content, blockee.inbox); } } -async function cancelRequest(follower: IUser, followee: IUser) { - const request = await FollowRequest.findOne({ - followeeId: followee._id, - followerId: follower._id +async function cancelRequest(follower: User, followee: User) { + const request = await FollowRequests.findOne({ + followeeId: followee.id, + followerId: follower.id }); if (request == null) { return; } - await FollowRequest.remove({ - followeeId: followee._id, - followerId: follower._id - }); - - await User.update({ _id: followee._id }, { - $inc: { - pendingReceivedFollowRequestsCount: -1 - } + await FollowRequests.delete({ + followeeId: followee.id, + followerId: follower.id }); - if (isLocalUser(followee)) { - packUser(followee, followee, { + if (Users.isLocalUser(followee)) { + Users.pack(followee, followee, { detail: true - }).then(packed => publishMainStream(followee._id, 'meUpdated', packed)); + }).then(packed => publishMainStream(followee.id, 'meUpdated', packed)); } - if (isLocalUser(follower)) { - packUser(followee, follower, { + if (Users.isLocalUser(follower)) { + Users.pack(followee, follower, { detail: true - }).then(packed => publishMainStream(follower._id, 'unfollow', packed)); + }).then(packed => publishMainStream(follower.id, 'unfollow', packed)); } // リモートにフォローリクエストをしていたらUndoFollow送信 - if (isLocalUser(follower) && isRemoteUser(followee)) { + if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) { const content = renderActivity(renderUndo(renderFollow(follower, followee), follower)); deliver(follower, content, followee.inbox); } // リモートからフォローリクエストを受けていたらReject送信 - if (isRemoteUser(follower) && isLocalUser(followee)) { + if (Users.isRemoteUser(follower) && Users.isLocalUser(followee)) { const content = renderActivity(renderReject(renderFollow(follower, followee, request.requestId), followee)); deliver(followee, content, follower.inbox); } } -async function unFollow(follower: IUser, followee: IUser) { - const following = await Following.findOne({ - followerId: follower._id, - followeeId: followee._id +async function unFollow(follower: User, followee: User) { + const following = await Followings.findOne({ + followerId: follower.id, + followeeId: followee.id }); if (following == null) { return; } - Following.remove({ - _id: following._id - }); + Followings.delete(following.id); //#region Decrement following count - User.update({ _id: follower._id }, { - $inc: { - followingCount: -1 - } - }); + Users.decrement({ id: follower.id }, 'followingCount', 1); //#endregion //#region Decrement followers count - User.update({ _id: followee._id }, { - $inc: { - followersCount: -1 - } - }); + Users.decrement({ id: followee.id }, 'followersCount', 1); //#endregion perUserFollowingChart.update(follower, followee, false); // Publish unfollow event - if (isLocalUser(follower)) { - packUser(followee, follower, { + if (Users.isLocalUser(follower)) { + Users.pack(followee, follower, { detail: true - }).then(packed => publishMainStream(follower._id, 'unfollow', packed)); + }).then(packed => publishMainStream(follower.id, 'unfollow', packed)); } // リモートにフォローをしていたらUndoFollow送信 - if (isLocalUser(follower) && isRemoteUser(followee)) { + if (Users.isLocalUser(follower) && Users.isRemoteUser(followee)) { const content = renderActivity(renderUndo(renderFollow(follower, followee), follower)); deliver(follower, content, followee.inbox); } diff --git a/src/services/blocking/delete.ts b/src/services/blocking/delete.ts index 099fa14b37..2c05cb7f3f 100644 --- a/src/services/blocking/delete.ts +++ b/src/services/blocking/delete.ts @@ -1,17 +1,17 @@ -import { isLocalUser, isRemoteUser, IUser } from '../../models/user'; -import Blocking from '../../models/blocking'; import { renderActivity } from '../../remote/activitypub/renderer'; import renderBlock from '../../remote/activitypub/renderer/block'; import renderUndo from '../../remote/activitypub/renderer/undo'; import { deliver } from '../../queue'; import Logger from '../logger'; +import { User } from '../../models/entities/user'; +import { Blockings, Users } from '../../models'; const logger = new Logger('blocking/delete'); -export default async function(blocker: IUser, blockee: IUser) { - const blocking = await Blocking.findOne({ - blockerId: blocker._id, - blockeeId: blockee._id +export default async function(blocker: User, blockee: User) { + const blocking = await Blockings.findOne({ + blockerId: blocker.id, + blockeeId: blockee.id }); if (blocking == null) { @@ -19,12 +19,10 @@ export default async function(blocker: IUser, blockee: IUser) { return; } - Blocking.remove({ - _id: blocking._id - }); + Blockings.delete(blocking.id); // deliver if remote bloking - if (isLocalUser(blocker) && isRemoteUser(blockee)) { + if (Users.isLocalUser(blocker) && Users.isRemoteUser(blockee)) { const content = renderActivity(renderUndo(renderBlock(blocker, blockee), blocker)); deliver(blocker, content, blockee.inbox); } -- cgit v1.2.3-freya