diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-07-20 03:20:06 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-20 03:20:06 +0900 |
| commit | f1ab918ecd3bfe9ac5ceee7e79586645844d9623 (patch) | |
| tree | de9905df159d9673f37b0fc07c9b82d9507948c0 /src/remote/activitypub/models | |
| parent | Merge branch 'develop' of https://github.com/syuilo/misskey into develop (diff) | |
| download | sharkey-f1ab918ecd3bfe9ac5ceee7e79586645844d9623.tar.gz sharkey-f1ab918ecd3bfe9ac5ceee7e79586645844d9623.tar.bz2 sharkey-f1ab918ecd3bfe9ac5ceee7e79586645844d9623.zip | |
Fix question (#5197)
Diffstat (limited to 'src/remote/activitypub/models')
| -rw-r--r-- | src/remote/activitypub/models/note.ts | 4 | ||||
| -rw-r--r-- | src/remote/activitypub/models/question.ts | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts index 14425d7496..31e1ea10e7 100644 --- a/src/remote/activitypub/models/note.ts +++ b/src/remote/activitypub/models/note.ts @@ -215,8 +215,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s const apEmojis = emojis.map(emoji => emoji.name); - const questionUri = note._misskey_question; - const poll = await extractPollFromQuestion(note._misskey_question || note, resolver).catch(() => undefined); + const poll = await extractPollFromQuestion(note, resolver).catch(() => undefined); // ユーザーの情報が古かったらついでに更新しておく if (actor.lastFetchedAt == null || Date.now() - actor.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) { @@ -239,7 +238,6 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s apMentions, apHashtags, apEmojis, - questionUri, poll, uri: note.id }, silent); diff --git a/src/remote/activitypub/models/question.ts b/src/remote/activitypub/models/question.ts index 01086a7cf8..5c889db431 100644 --- a/src/remote/activitypub/models/question.ts +++ b/src/remote/activitypub/models/question.ts @@ -15,7 +15,7 @@ export async function extractPollFromQuestion(source: string | IObject, resolver } const multiple = !question.oneOf; - const expiresAt = question.endTime ? new Date(question.endTime) : null; + const expiresAt = question.endTime ? new Date(question.endTime) : question.closed ? new Date(question.closed) : null; if (multiple && !question.anyOf) { throw new Error('invalid question'); |