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/activitypub.ts | 116 ++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 71 deletions(-) (limited to 'src/server/activitypub.ts') diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts index df5f5b141d..3b39977d47 100644 --- a/src/server/activitypub.ts +++ b/src/server/activitypub.ts @@ -1,15 +1,11 @@ -import { ObjectID } from 'mongodb'; import * as Router from 'koa-router'; import * as json from 'koa-json-body'; import * as httpSignature from 'http-signature'; import { renderActivity } from '../remote/activitypub/renderer'; -import Note from '../models/note'; -import User, { isLocalUser, ILocalUser, IUser } from '../models/user'; -import Emoji from '../models/emoji'; import renderNote from '../remote/activitypub/renderer/note'; import renderKey from '../remote/activitypub/renderer/key'; -import renderPerson from '../remote/activitypub/renderer/person'; +import { renderPerson } from '../remote/activitypub/renderer/person'; import renderEmoji from '../remote/activitypub/renderer/emoji'; import Outbox, { packActivity } from './activitypub/outbox'; import Followers from './activitypub/followers'; @@ -18,6 +14,9 @@ import Featured from './activitypub/featured'; import renderQuestion from '../remote/activitypub/renderer/question'; import { inbox as processInbox } from '../queue'; import { isSelfHost } from '../misc/convert-host'; +import { Notes, Users, Emojis, UserKeypairs, Polls } from '../models'; +import { ILocalUser, User } from '../models/entities/user'; +import { In } from 'typeorm'; // Init router const router = new Router(); @@ -64,25 +63,20 @@ router.post('/users/:user/inbox', json(), inbox); router.get('/notes/:note', async (ctx, next) => { if (!isActivityPubReq(ctx)) return await next(); - if (!ObjectID.isValid(ctx.params.note)) { - ctx.status = 404; - return; - } - - const note = await Note.findOne({ - _id: new ObjectID(ctx.params.note), - visibility: { $in: ['public', 'home'] }, - localOnly: { $ne: true } + const note = await Notes.findOne({ + id: ctx.params.note, + visibility: In(['public', 'home']), + localOnly: false }); - if (note === null) { + if (note == null) { ctx.status = 404; return; } // リモートだったらリダイレクト - if (note._user.host != null) { - if (note.uri == null || isSelfHost(note._user.host)) { + if (note.userHost != null) { + if (note.uri == null || isSelfHost(note.userHost)) { ctx.status = 500; return; } @@ -97,19 +91,14 @@ router.get('/notes/:note', async (ctx, next) => { // note activity router.get('/notes/:note/activity', async ctx => { - if (!ObjectID.isValid(ctx.params.note)) { - ctx.status = 404; - return; - } - - const note = await Note.findOne({ - _id: new ObjectID(ctx.params.note), - '_user.host': null, - visibility: { $in: ['public', 'home'] }, - localOnly: { $ne: true } + const note = await Notes.findOne({ + id: ctx.params.note, + userHost: null, + visibility: In(['public', 'home']), + localOnly: false }); - if (note === null) { + if (note == null) { ctx.status = 404; return; } @@ -121,32 +110,23 @@ router.get('/notes/:note/activity', async ctx => { // question router.get('/questions/:question', async (ctx, next) => { - if (!ObjectID.isValid(ctx.params.question)) { - ctx.status = 404; - return; - } - - const poll = await Note.findOne({ - _id: new ObjectID(ctx.params.question), - '_user.host': null, - visibility: { $in: ['public', 'home'] }, - localOnly: { $ne: true }, - poll: { - $exists: true, - $ne: null - }, + const pollNote = await Notes.findOne({ + id: ctx.params.question, + userHost: null, + visibility: In(['public', 'home']), + localOnly: false, + hasPoll: true }); - if (poll === null) { + if (pollNote == null) { ctx.status = 404; return; } - const user = await User.findOne({ - _id: poll.userId - }); + const user = await Users.findOne(pollNote.userId); + const poll = await Polls.findOne({ noteId: pollNote.id }); - ctx.body = renderActivity(await renderQuestion(user as ILocalUser, poll)); + ctx.body = renderActivity(await renderQuestion(user as ILocalUser, pollNote, poll)); setResponseType(ctx); }); @@ -164,25 +144,24 @@ router.get('/users/:user/collections/featured', Featured); // publickey router.get('/users/:user/publickey', async ctx => { - if (!ObjectID.isValid(ctx.params.user)) { - ctx.status = 404; - return; - } - - const userId = new ObjectID(ctx.params.user); + const userId = ctx.params.user; - const user = await User.findOne({ - _id: userId, + const user = await Users.findOne({ + id: userId, host: null }); - if (user === null) { + if (user == null) { ctx.status = 404; return; } - if (isLocalUser(user)) { - ctx.body = renderActivity(renderKey(user)); + const keypair = await UserKeypairs.findOne({ + userId: user.id + }); + + if (Users.isLocalUser(user)) { + ctx.body = renderActivity(renderKey(user, keypair)); ctx.set('Cache-Control', 'public, max-age=180'); setResponseType(ctx); } else { @@ -191,8 +170,8 @@ router.get('/users/:user/publickey', async ctx => { }); // user -async function userInfo(ctx: Router.IRouterContext, user: IUser) { - if (user === null) { +async function userInfo(ctx: Router.IRouterContext, user: User) { + if (user == null) { ctx.status = 404; return; } @@ -205,15 +184,10 @@ async function userInfo(ctx: Router.IRouterContext, user: IUser) { router.get('/users/:user', async (ctx, next) => { if (!isActivityPubReq(ctx)) return await next(); - if (!ObjectID.isValid(ctx.params.user)) { - ctx.status = 404; - return; - } - - const userId = new ObjectID(ctx.params.user); + const userId = ctx.params.user; - const user = await User.findOne({ - _id: userId, + const user = await Users.findOne({ + id: userId, host: null }); @@ -223,7 +197,7 @@ router.get('/users/:user', async (ctx, next) => { router.get('/@:user', async (ctx, next) => { if (!isActivityPubReq(ctx)) return await next(); - const user = await User.findOne({ + const user = await Users.findOne({ usernameLower: ctx.params.user.toLowerCase(), host: null }); @@ -234,12 +208,12 @@ router.get('/@:user', async (ctx, next) => { // emoji router.get('/emojis/:emoji', async ctx => { - const emoji = await Emoji.findOne({ + const emoji = await Emojis.findOne({ host: null, name: ctx.params.emoji }); - if (emoji === null) { + if (emoji == null) { ctx.status = 404; return; } -- cgit v1.2.3-freya