merge upstream 2025-02-03

2025-02-03 14:31:26 -05:00
parent 6bc0cd251f 9c70a4e631
commit a4e86758c1
264 changed files with 15775 additions and 4919 deletions
@@ -653,8 +653,8 @@ export class ActivityPubServerService {
 			},
 			deriveConstraint(request: IncomingMessage) {
 				const accepted = accepts(request).type(['html', ACTIVITY_JSON, LD_JSON]);
-				const isAp = typeof accepted === 'string' && !accepted.match(/html/);
-				return isAp ? 'ap' : 'html';
+				if (accepted === false) return null;
+				return accepted !== 'html' ? 'ap' : 'html';
 			},
 		});