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/remote/activitypub/models/question.ts | 41 ++++++++++++++++--------------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'src/remote/activitypub/models/question.ts') diff --git a/src/remote/activitypub/models/question.ts b/src/remote/activitypub/models/question.ts index c073684349..a5091a6d96 100644 --- a/src/remote/activitypub/models/question.ts +++ b/src/remote/activitypub/models/question.ts @@ -1,8 +1,9 @@ import config from '../../../config'; -import Note, { IChoice, IPoll } from '../../../models/note'; import Resolver from '../resolver'; import { IQuestion } from '../type'; import { apLogger } from '../logger'; +import { Notes, Polls } from '../../../models'; +import { IPoll } from '../../../models/entities/poll'; export async function extractPollFromQuestion(source: string | IQuestion): Promise { const question = typeof source === 'string' ? await new Resolver().resolve(source) as IQuestion : source; @@ -14,14 +15,14 @@ export async function extractPollFromQuestion(source: string | IQuestion): Promi } const choices = question[multiple ? 'anyOf' : 'oneOf'] - .map((x, i) => ({ - id: i, - text: x.name, - votes: x.replies && x.replies.totalItems || x._misskey_votes || 0, - } as IChoice)); + .map((x, i) => x.name); + + const votes = question[multiple ? 'anyOf' : 'oneOf'] + .map((x, i) => x.replies && x.replies.totalItems || x._misskey_votes || 0); return { choices, + votes, multiple, expiresAt }; @@ -39,9 +40,11 @@ export async function updateQuestion(value: any) { if (uri.startsWith(config.url + '/')) throw 'uri points local'; //#region このサーバーに既に登録されているか - const note = await Note.findOne({ uri }); - + const note = await Notes.findOne({ uri }); if (note == null) throw 'Question is not registed'; + + const poll = await Polls.findOne({ noteId: note.id }); + if (poll == null) throw 'Question is not registed'; //#endregion // resolve new Question object @@ -52,27 +55,25 @@ export async function updateQuestion(value: any) { if (question.type !== 'Question') throw 'object is not a Question'; const apChoices = question.oneOf || question.anyOf; - const dbChoices = note.poll.choices; let changed = false; - for (const db of dbChoices) { - const oldCount = db.votes; - const newCount = apChoices.filter(ap => ap.name === db.text)[0].replies.totalItems; + for (const choice of poll.choices) { + const oldCount = poll.votes[poll.choices.indexOf(choice)]; + const newCount = apChoices.filter(ap => ap.name === choice)[0].replies.totalItems; if (oldCount != newCount) { changed = true; - db.votes = newCount; + poll.votes[poll.choices.indexOf(choice)] = newCount; } } - await Note.update({ - _id: note._id - }, { - $set: { - 'poll.choices': dbChoices, - updatedAt: new Date(), - } + await Notes.update(note.id, { + updatedAt: new Date(), + }); + + await Polls.update(poll.id, { + votes: poll.votes }); return changed; -- cgit v1.2.3-freya