summaryrefslogtreecommitdiff
path: root/src/services/note
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-01-21 13:27:19 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-01-21 13:27:19 +0900
commit4a57482216c80e38b17158834b5c8d8a47bc73cf (patch)
treef64e6f1aba85a5037cb0ceec55a4d742d70c7424 /src/services/note
parent[Server] Fix #3528 (diff)
downloadsharkey-4a57482216c80e38b17158834b5c8d8a47bc73cf.tar.gz
sharkey-4a57482216c80e38b17158834b5c8d8a47bc73cf.tar.bz2
sharkey-4a57482216c80e38b17158834b5c8d8a47bc73cf.zip
リモートで投票を見たりしたりできるように (#3940)
* fix type * expose Question * Note refs Question * rename * wip * リモート投票の場合リプライ送信 * voteの実装をservicesに移動 * 投票受信 * debug * つくる * Revert "つくる" This reverts commit 0c9245886680b7d3b93a0278642f4cf6a43b5cb2. * APIの実装はもどし * Send Update * AP type * Recv Update * Revert "Recv Update" This reverts commit ffda39c0936d8e023f64603edabeb8e0eb9fc370. * Revert "AP type" This reverts commit 63d8bbe29dd6f326773214346350607cc4381996. * Revert "Send Update" This reverts commit 171b046de549f1478e928dee3177eeefab341fcf. * リモートで投票を見る * 投票はDM * Provides choices as text for AP * 絵文字 * fix error * revert * APからには不要な処理を削除 * Revert "APからには不要な処理を削除" This reverts commit 8b5d8af9b0cc4d4ad0cf21de59827ff21df99560. * てぬき * めんどい * ちっ * remove unused code
Diffstat (limited to 'src/services/note')
-rw-r--r--src/services/note/create.ts1
-rw-r--r--src/services/note/polls/vote.ts78
2 files changed, 79 insertions, 0 deletions
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index fbafe29107..8d1ab181be 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -103,6 +103,7 @@ type Option = {
apMentions?: IUser[];
apHashtags?: string[];
apEmojis?: string[];
+ questionUri?: string;
uri?: string;
app?: IApp;
};
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
new file mode 100644
index 0000000000..ee657f19cd
--- /dev/null
+++ b/src/services/note/polls/vote.ts
@@ -0,0 +1,78 @@
+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);
+ }
+});