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/server/api/endpoints/following/create.ts | 20 +++++++++----------- src/server/api/endpoints/following/delete.ts | 20 +++++++++----------- .../api/endpoints/following/requests/accept.ts | 5 ++--- .../api/endpoints/following/requests/cancel.ts | 9 ++++----- src/server/api/endpoints/following/requests/list.ts | 10 +++++----- .../api/endpoints/following/requests/reject.ts | 5 ++--- 6 files changed, 31 insertions(+), 38 deletions(-) (limited to 'src/server/api/endpoints/following') diff --git a/src/server/api/endpoints/following/create.ts b/src/server/api/endpoints/following/create.ts index 81b2399551..5b43815a5e 100644 --- a/src/server/api/endpoints/following/create.ts +++ b/src/server/api/endpoints/following/create.ts @@ -1,12 +1,11 @@ import $ from 'cafy'; -import ID, { transform } from '../../../../misc/cafy-id'; +import { ID } from '../../../../misc/cafy-id'; import * as ms from 'ms'; -import { pack } from '../../../../models/user'; -import Following from '../../../../models/following'; import create from '../../../../services/following/create'; import define from '../../define'; import { ApiError } from '../../error'; import { getUser } from '../../common/getters'; +import { Followings, Users } from '../../../../models'; export const meta = { stability: 'stable', @@ -25,12 +24,11 @@ export const meta = { requireCredential: true, - kind: 'following-write', + kind: 'write:following', params: { userId: { validator: $.type(ID), - transform: transform, desc: { 'ja-JP': '対象のユーザーのID', 'en-US': 'Target user ID' @@ -75,7 +73,7 @@ export default define(meta, async (ps, user) => { const follower = user; // 自分自身 - if (user._id.equals(ps.userId)) { + if (user.id === ps.userId) { throw new ApiError(meta.errors.followeeIsYourself); } @@ -86,12 +84,12 @@ export default define(meta, async (ps, user) => { }); // Check if already following - const exist = await Following.findOne({ - followerId: follower._id, - followeeId: followee._id + const exist = await Followings.findOne({ + followerId: follower.id, + followeeId: followee.id }); - if (exist !== null) { + if (exist != null) { throw new ApiError(meta.errors.alreadyFollowing); } @@ -103,5 +101,5 @@ export default define(meta, async (ps, user) => { throw e; } - return await pack(followee._id, user); + return await Users.pack(followee.id, user); }); diff --git a/src/server/api/endpoints/following/delete.ts b/src/server/api/endpoints/following/delete.ts index 8f8249b1e8..240a037c9e 100644 --- a/src/server/api/endpoints/following/delete.ts +++ b/src/server/api/endpoints/following/delete.ts @@ -1,12 +1,11 @@ import $ from 'cafy'; -import ID, { transform } from '../../../../misc/cafy-id'; +import { ID } from '../../../../misc/cafy-id'; import * as ms from 'ms'; -import { pack } from '../../../../models/user'; -import Following from '../../../../models/following'; import deleteFollowing from '../../../../services/following/delete'; import define from '../../define'; import { ApiError } from '../../error'; import { getUser } from '../../common/getters'; +import { Followings, Users } from '../../../../models'; export const meta = { stability: 'stable', @@ -25,12 +24,11 @@ export const meta = { requireCredential: true, - kind: 'following-write', + kind: 'write:following', params: { userId: { validator: $.type(ID), - transform: transform, desc: { 'ja-JP': '対象のユーザーのID', 'en-US': 'Target user ID' @@ -63,7 +61,7 @@ export default define(meta, async (ps, user) => { const follower = user; // Check if the followee is yourself - if (user._id.equals(ps.userId)) { + if (user.id === ps.userId) { throw new ApiError(meta.errors.followeeIsYourself); } @@ -74,16 +72,16 @@ export default define(meta, async (ps, user) => { }); // Check not following - const exist = await Following.findOne({ - followerId: follower._id, - followeeId: followee._id + const exist = await Followings.findOne({ + followerId: follower.id, + followeeId: followee.id }); - if (exist === null) { + if (exist == null) { throw new ApiError(meta.errors.notFollowing); } await deleteFollowing(follower, followee); - return await pack(followee._id, user); + return await Users.pack(followee.id, user); }); diff --git a/src/server/api/endpoints/following/requests/accept.ts b/src/server/api/endpoints/following/requests/accept.ts index 0975990c02..65c24f7be9 100644 --- a/src/server/api/endpoints/following/requests/accept.ts +++ b/src/server/api/endpoints/following/requests/accept.ts @@ -1,5 +1,5 @@ import $ from 'cafy'; -import ID, { transform } from '../../../../../misc/cafy-id'; +import { ID } from '../../../../../misc/cafy-id'; import acceptFollowRequest from '../../../../../services/following/requests/accept'; import define from '../../../define'; import { ApiError } from '../../../error'; @@ -15,12 +15,11 @@ export const meta = { requireCredential: true, - kind: 'following-write', + kind: 'write:following', params: { userId: { validator: $.type(ID), - transform: transform, desc: { 'ja-JP': '対象のユーザーのID', 'en-US': 'Target user ID' diff --git a/src/server/api/endpoints/following/requests/cancel.ts b/src/server/api/endpoints/following/requests/cancel.ts index 371f9f0ed3..79cdb776f2 100644 --- a/src/server/api/endpoints/following/requests/cancel.ts +++ b/src/server/api/endpoints/following/requests/cancel.ts @@ -1,10 +1,10 @@ import $ from 'cafy'; -import ID, { transform } from '../../../../../misc/cafy-id'; +import { ID } from '../../../../../misc/cafy-id'; import cancelFollowRequest from '../../../../../services/following/requests/cancel'; -import { pack } from '../../../../../models/user'; import define from '../../../define'; import { ApiError } from '../../../error'; import { getUser } from '../../../common/getters'; +import { Users } from '../../../../../models'; export const meta = { desc: { @@ -16,12 +16,11 @@ export const meta = { requireCredential: true, - kind: 'following-write', + kind: 'write:following', params: { userId: { validator: $.type(ID), - transform: transform, desc: { 'ja-JP': '対象のユーザーのID', 'en-US': 'Target user ID' @@ -58,5 +57,5 @@ export default define(meta, async (ps, user) => { throw e; } - return await pack(followee._id, user); + return await Users.pack(followee.id, user); }); diff --git a/src/server/api/endpoints/following/requests/list.ts b/src/server/api/endpoints/following/requests/list.ts index c9bcedf929..13e4a39388 100644 --- a/src/server/api/endpoints/following/requests/list.ts +++ b/src/server/api/endpoints/following/requests/list.ts @@ -1,5 +1,5 @@ -import FollowRequest, { pack } from '../../../../../models/follow-request'; import define from '../../../define'; +import { FollowRequests } from '../../../../../models'; export const meta = { desc: { @@ -11,13 +11,13 @@ export const meta = { requireCredential: true, - kind: 'following-read' + kind: 'read:following' }; export default define(meta, async (ps, user) => { - const reqs = await FollowRequest.find({ - followeeId: user._id + const reqs = await FollowRequests.find({ + followeeId: user.id }); - return await Promise.all(reqs.map(req => pack(req))); + return await Promise.all(reqs.map(req => FollowRequests.pack(req))); }); diff --git a/src/server/api/endpoints/following/requests/reject.ts b/src/server/api/endpoints/following/requests/reject.ts index 5e59d4bc97..cccb60b243 100644 --- a/src/server/api/endpoints/following/requests/reject.ts +++ b/src/server/api/endpoints/following/requests/reject.ts @@ -1,5 +1,5 @@ import $ from 'cafy'; -import ID, { transform } from '../../../../../misc/cafy-id'; +import { ID } from '../../../../../misc/cafy-id'; import rejectFollowRequest from '../../../../../services/following/requests/reject'; import define from '../../../define'; import { ApiError } from '../../../error'; @@ -15,12 +15,11 @@ export const meta = { requireCredential: true, - kind: 'following-write', + kind: 'write:following', params: { userId: { validator: $.type(ID), - transform: transform, desc: { 'ja-JP': '対象のユーザーのID', 'en-US': 'Target user ID' -- cgit v1.2.3-freya