Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-original/develop' into develop

Browse source 
# Conflicts:
#	packages/frontend/src/components/MkAbuseReport.vue
This commit is contained in:
mattyatea 2024-02-19 22:05:40 +09:00
commit cc69717f0d
28 changed files with 163 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/activitypub/misc/validator.ts
View file

@ -20,7 +20,7 @@ export function validateContentTypeSetAsActivityPub(response: Response): void {
throw new Error('Validate content type of AP response: Content type is not application/activity+json or application/ld+json');
}
const plusJsonSuffixRegex = /(application|text)\/[a-zA-Z0-9\.\-\+]+\+json/;
const plusJsonSuffixRegex = /^\s*(application|text)\/[a-zA-Z0-9\.\-\+]+\+json\s*(;|$)/;
export function validateContentTypeSetAsJsonLD(response: Response): void {
const contentType = (response.headers.get('content-type') ?? '').toLowerCase();