heartles/egirlskey
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix #5468 (#5470)

Browse source 
* Update activitypub.ts

* Update activitypub.ts

* Update activitypub.ts

* Update activitypub.ts

* fix type error

* trust the module

* remove space

* accept charset
This commit is contained in:
Acid Chicken (硫酸鶏) 2019-10-04 10:29:28 +09:00 committed by syuilo
parent 533884dcaa
commit 75e2b075e1
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/server/activitypub.ts
View file

@ -40,18 +40,21 @@ function inbox(ctx: Router.RouterContext) {
ctx.status = 202; ctx.status = 202;
} }
const ACTIVITY_JSON = 'application/activity+json; charset=utf-8';
const LD_JSON = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8';
function isActivityPubReq(ctx: Router.RouterContext) { function isActivityPubReq(ctx: Router.RouterContext) {
ctx.response.vary('Accept'); ctx.response.vary('Accept');
const accepted = ctx.accepts('html', 'application/activity+json', 'application/ld+json'); const accepted = ctx.accepts('html', ACTIVITY_JSON, LD_JSON);
return ['application/activity+json', 'application/ld+json'].includes(accepted as string); return typeof accepted === 'string' && !accepted.match(/html/);
} }
export function setResponseType(ctx: Router.RouterContext) { export function setResponseType(ctx: Router.RouterContext) {
const accept = ctx.accepts('application/activity+json', 'application/ld+json'); const accept = ctx.accepts(ACTIVITY_JSON, LD_JSON);
if (accept === 'application/ld+json') { if (accept === LD_JSON) {
ctx.response.type = 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"; charset=utf-8'; ctx.response.type = LD_JSON;
} else { } else {
ctx.response.type = 'application/activity+json; charset=utf-8'; ctx.response.type = ACTIVITY_JSON;
} }
} }