From 4a57482216c80e38b17158834b5c8d8a47bc73cf Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Mon, 21 Jan 2019 13:27:19 +0900 Subject: リモートで投票を見たりしたりできるように (#3940) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 --- src/server/activitypub.ts | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'src/server/activitypub.ts') diff --git a/src/server/activitypub.ts b/src/server/activitypub.ts index 9adc3dd943..ac8d3d4e26 100644 --- a/src/server/activitypub.ts +++ b/src/server/activitypub.ts @@ -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); -- cgit v1.2.3-freya