diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2021-05-31 13:04:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 13:04:13 +0900 |
| commit | caf40e40fbd444c050d8d3cc60f4dd2898950900 (patch) | |
| tree | 480f907740d8c9e86d9dea7bd8d9845f3e31b68e /src/remote/activitypub/models/note.ts | |
| parent | New Crowdin updates (#7527) (diff) | |
| download | sharkey-caf40e40fbd444c050d8d3cc60f4dd2898950900.tar.gz sharkey-caf40e40fbd444c050d8d3cc60f4dd2898950900.tar.bz2 sharkey-caf40e40fbd444c050d8d3cc60f4dd2898950900.zip | |
Supports Array ActivityStreams type (#7536)
* Supports Array type
* Fix
* Fix Service to Note
* Update type.ts
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'src/remote/activitypub/models/note.ts')
| -rw-r--r-- | src/remote/activitypub/models/note.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/remote/activitypub/models/note.ts b/src/remote/activitypub/models/note.ts index 09e066708f..3b7452c3cb 100644 --- a/src/remote/activitypub/models/note.ts +++ b/src/remote/activitypub/models/note.ts @@ -17,7 +17,7 @@ import { deliverQuestionUpdate } from '../../../services/note/polls/update'; import { extractDbHost, toPuny } from '@/misc/convert-host'; import { Emojis, Polls, MessagingMessages } from '../../../models'; import { Note } from '../../../models/entities/note'; -import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji } from '../type'; +import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji, getApType } from '../type'; import { Emoji } from '../../../models/entities/emoji'; import { genId } from '@/misc/gen-id'; import { fetchMeta } from '@/misc/fetch-meta'; @@ -36,8 +36,8 @@ export function validateNote(object: any, uri: string) { return new Error('invalid Note: object is null'); } - if (!validPost.includes(object.type)) { - return new Error(`invalid Note: invalid object type ${object.type}`); + if (!validPost.includes(getApType(object))) { + return new Error(`invalid Note: invalid object type ${getApType(object)}`); } if (object.id && extractDbHost(object.id) !== expectHost) { |