voteの実装をservicesに移動

This commit is contained in:
mei23 2019-01-21 04:00:44 +09:00
parent 2d31c67006
commit 520a0b6949
2 changed files with 89 additions and 82 deletions

View File

@ -1,12 +1,7 @@
import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id';
import Vote from '../../../../../models/poll-vote';
import Note from '../../../../../models/note';
import Watching from '../../../../../models/note-watching';
import watch from '../../../../../services/note/watch';
import { publishNoteStream } from '../../../../../stream';
import notify from '../../../../../notify';
import define from '../../../define';
import createNote from '../../../../../services/note/create';
import vote from '../../../../../services/note/polls/vote';
export const meta = {
desc: {
@ -48,80 +43,5 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
return rej('poll not found');
}
if (!note.poll.choices.some(x => x.id == ps.choice)) return rej('invalid choice param');
// if already voted
const exist = await Vote.findOne({
noteId: note._id,
userId: user._id
});
if (exist !== null) {
return rej('already voted');
}
// Create vote
await Vote.insert({
createdAt: new Date(),
noteId: note._id,
userId: user._id,
choice: ps.choice
});
// Send response
res();
const inc: any = {};
inc[`poll.choices.${note.poll.choices.findIndex(c => c.id == ps.choice)}.votes`] = 1;
// Increment votes count
await Note.update({ _id: note._id }, {
$inc: inc
});
publishNoteStream(note._id, 'pollVoted', {
choice: ps.choice,
userId: user._id.toHexString()
});
// Notify
notify(note.userId, user._id, 'poll_vote', {
noteId: note._id,
choice: ps.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: ps.choice
});
}
});
// この投稿をWatchする
if (user.settings.autoWatch !== false) {
watch(user._id, note);
}
// リモート投票の場合リプライ送信
if (note._user.host != null) {
createNote(user, {
createdAt: new Date(),
text: ps.choice.toString(),
reply: note,
});
}
await vote(user, note, ps.choice).catch(e => rej(e));
}));

View File

@ -0,0 +1,87 @@
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 '../../../notify';
import createNote from '../../../services/note/create';
import { isLocalUser, IUser } from '../../../models/user';
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');
// if already voted
const exist = await Vote.findOne({
noteId: note._id,
userId: user._id
});
if (exist !== null) {
return rej('already voted');
}
// Create vote
await Vote.insert({
createdAt: new Date(),
noteId: note._id,
userId: user._id,
choice: choice
});
// Send response
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
});
publishNoteStream(note._id, 'pollVoted', {
choice: choice,
userId: user._id.toHexString()
});
// Notify
notify(note.userId, user._id, 'poll_vote', {
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
});
}
});
// ローカルユーザーが投票した場合この投稿をWatchする
if (isLocalUser(user) && user.settings.autoWatch !== false) {
watch(user._id, note);
}
// ローカルからリモートへの投票の場合リプライ送信
if (isLocalUser(user) && note._user.host != null) {
createNote(user, {
createdAt: new Date(),
text: choice.toString(),
reply: note,
});
}
});