リモートで投票を見たりしたりできるように (#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
This commit is contained in:
@ -16,6 +16,7 @@ import Outbox, { packActivity } from './activitypub/outbox';
|
||||
import Followers from './activitypub/followers';
|
||||
import Following from './activitypub/following';
|
||||
import Featured from './activitypub/featured';
|
||||
import renderQuestion from '../remote/activitypub/renderer/question';
|
||||
|
||||
// Init router
|
||||
const router = new Router();
|
||||
@ -110,6 +111,36 @@ router.get('/notes/:note/activity', async ctx => {
|
||||
setResponseType(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),
|
||||
visibility: { $in: ['public', 'home'] },
|
||||
localOnly: { $ne: true },
|
||||
poll: {
|
||||
$exists: true,
|
||||
$ne: null
|
||||
},
|
||||
});
|
||||
|
||||
if (poll === null) {
|
||||
ctx.status = 404;
|
||||
return;
|
||||
}
|
||||
|
||||
const user = await User.findOne({
|
||||
_id: poll.userId
|
||||
});
|
||||
|
||||
ctx.body = pack(await renderQuestion(user as ILocalUser, poll));
|
||||
setResponseType(ctx);
|
||||
});
|
||||
|
||||
// outbox
|
||||
router.get('/users/:user/outbox', Outbox);
|
||||
|
||||
|
@ -6,6 +6,8 @@ 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 User from '../../../../../models/user';
|
||||
|
||||
export const meta = {
|
||||
desc: {
|
||||
@ -114,4 +116,19 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
|
||||
if (user.settings.autoWatch !== false) {
|
||||
watch(user._id, note);
|
||||
}
|
||||
|
||||
// リモート投票の場合リプライ送信
|
||||
if (note._user.host != null) {
|
||||
const pollOwner = await User.findOne({
|
||||
_id: note.userId
|
||||
});
|
||||
|
||||
createNote(user, {
|
||||
createdAt: new Date(),
|
||||
text: ps.choice.toString(),
|
||||
reply: note,
|
||||
visibility: 'specified',
|
||||
visibleUsers: [ pollOwner ],
|
||||
});
|
||||
}
|
||||
}));
|
||||
|
Reference in New Issue
Block a user