summaryrefslogtreecommitdiff
path: root/src/services/note/polls
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2019-04-07 21:50:36 +0900
committerGitHub <noreply@github.com>2019-04-07 21:50:36 +0900
commitf0a29721c9fb10f97faf386bc9d6b1b2fad97895 (patch)
treeb5c1d38d698589bb444c0881a431391db91eb5bc /src/services/note/polls
parentUpdate README.md [AUTOGEN] (#4639) (diff)
downloadmisskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.gz
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.tar.bz2
misskey-f0a29721c9fb10f97faf386bc9d6b1b2fad97895.zip
Use PostgreSQL instead of MongoDB (#4572)
* 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
Diffstat (limited to 'src/services/note/polls')
-rw-r--r--src/services/note/polls/update.ts35
-rw-r--r--src/services/note/polls/vote.ts89
2 files changed, 58 insertions, 66 deletions
diff --git a/src/services/note/polls/update.ts b/src/services/note/polls/update.ts
index d4e183889d..ff8e8d59ef 100644
--- a/src/services/note/polls/update.ts
+++ b/src/services/note/polls/update.ts
@@ -1,51 +1,48 @@
-import * as mongo from 'mongodb';
-import Note, { INote } from '../../../models/note';
import { updateQuestion } from '../../../remote/activitypub/models/question';
import ms = require('ms');
import Logger from '../../logger';
-import User, { isLocalUser, isRemoteUser } from '../../../models/user';
-import Following from '../../../models/following';
import renderUpdate from '../../../remote/activitypub/renderer/update';
import { renderActivity } from '../../../remote/activitypub/renderer';
import { deliver } from '../../../queue';
import renderNote from '../../../remote/activitypub/renderer/note';
+import { Users, Notes, Followings } from '../../../models';
+import { Note } from '../../../models/entities/note';
const logger = new Logger('pollsUpdate');
-export async function triggerUpdate(note: INote) {
+export async function triggerUpdate(note: Note) {
if (!note.updatedAt || Date.now() - new Date(note.updatedAt).getTime() > ms('1min')) {
- logger.info(`Updating ${note._id}`);
+ logger.info(`Updating ${note.id}`);
try {
const updated = await updateQuestion(note.uri);
- logger.info(`Updated ${note._id} ${updated ? 'changed' : 'nochange'}`);
+ logger.info(`Updated ${note.id} ${updated ? 'changed' : 'nochange'}`);
} catch (e) {
logger.error(e);
}
}
}
-export async function deliverQuestionUpdate(noteId: mongo.ObjectID) {
- const note = await Note.findOne({
- _id: noteId,
- });
+export async function deliverQuestionUpdate(noteId: Note['id']) {
+ const note = await Notes.findOne(noteId);
- const user = await User.findOne({
- _id: note.userId
- });
+ const user = await Users.findOne(note.userId);
- const followers = await Following.find({
- followeeId: user._id
+ const followers = await Followings.find({
+ followeeId: user.id
});
const queue: string[] = [];
// フォロワーがリモートユーザーかつ投稿者がローカルユーザーならUpdateを配信
- if (isLocalUser(user)) {
+ if (Users.isLocalUser(user)) {
for (const following of followers) {
- const follower = following._follower;
+ const follower = {
+ inbox: following.followerInbox,
+ sharedInbox: following.followerSharedInbox
+ };
- if (isRemoteUser(follower)) {
+ if (following.followerHost !== null) {
const inbox = follower.sharedInbox || follower.inbox;
if (!queue.includes(inbox)) queue.push(inbox);
}
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index a23cdc1cb4..15f1ddffbc 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -1,79 +1,74 @@
-import Vote from '../../../models/poll-vote';
-import Note, { INote } from '../../../models/note';
-import Watching from '../../../models/note-watching';
import watch from '../../../services/note/watch';
import { publishNoteStream } from '../../stream';
-import notify from '../../../services/create-notification';
-import { isLocalUser, IUser } from '../../../models/user';
+import { User } from '../../../models/entities/user';
+import { Note } from '../../../models/entities/note';
+import { PollVotes, Users, NoteWatchings, Polls } from '../../../models';
+import { Not } from 'typeorm';
+import { genId } from '../../../misc/gen-id';
+import { createNotification } from '../../create-notification';
-export default (user: IUser, note: INote, choice: number) => new Promise(async (res, rej) => {
- if (!note.poll.choices.some(x => x.id == choice)) return rej('invalid choice param');
+export default (user: User, note: Note, choice: number) => new Promise(async (res, rej) => {
+ const poll = await Polls.findOne({ noteId: note.id });
+
+ // Check whether is valid choice
+ if (poll.choices[choice] == null) return rej('invalid choice param');
// if already voted
- const exist = await Vote.find({
- noteId: note._id,
- userId: user._id
+ const exist = await PollVotes.find({
+ noteId: note.id,
+ userId: user.id
});
- if (note.poll.multiple) {
- if (exist.some(x => x.choice === choice))
+ if (poll.multiple) {
+ if (exist.some(x => x.choice === choice)) {
return rej('already voted');
- } else if (exist.length) {
+ }
+ } else if (exist.length !== 0) {
return rej('already voted');
}
// Create vote
- await Vote.insert({
+ await PollVotes.save({
+ id: genId(),
createdAt: new Date(),
- noteId: note._id,
- userId: user._id,
+ noteId: note.id,
+ userId: user.id,
choice: choice
});
res();
- const inc: any = {};
- inc[`poll.choices.${note.poll.choices.findIndex(c => c.id == choice)}.votes`] = 1;
-
// Increment votes count
- await Note.update({ _id: note._id }, {
- $inc: inc
- });
+ const index = choice + 1; // In SQL, array index is 1 based
+ await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE id = '${poll.id}'`);
- publishNoteStream(note._id, 'pollVoted', {
+ publishNoteStream(note.id, 'pollVoted', {
choice: choice,
- userId: user._id.toHexString()
+ userId: user.id
});
// Notify
- notify(note.userId, user._id, 'poll_vote', {
- noteId: note._id,
+ createNotification(note.userId, user.id, 'pollVote', {
+ noteId: note.id,
choice: choice
});
// Fetch watchers
- Watching
- .find({
- noteId: note._id,
- userId: { $ne: user._id },
- // 削除されたドキュメントは除く
- deletedAt: { $exists: false }
- }, {
- fields: {
- userId: true
- }
- })
- .then(watchers => {
- for (const watcher of watchers) {
- notify(watcher.userId, user._id, 'poll_vote', {
- noteId: note._id,
- choice: choice
- });
- }
- });
+ NoteWatchings.find({
+ noteId: note.id,
+ userId: Not(user.id),
+ })
+ .then(watchers => {
+ for (const watcher of watchers) {
+ createNotification(watcher.userId, user.id, 'pollVote', {
+ noteId: note.id,
+ choice: choice
+ });
+ }
+ });
// ローカルユーザーが投票した場合この投稿をWatchする
- if (isLocalUser(user) && user.settings.autoWatch !== false) {
- watch(user._id, note);
+ if (Users.isLocalUser(user) && user.autoWatch) {
+ watch(user.id, note);
}
});