Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add fallback to Object intent for FEP-3b86 in remote interaction helper (#38130)

Browse Source
This commit is contained in:
Claire
2026-03-11 10:42:24 +01:00
committed by GitHub
parent 316290ba9d
commit 9916c786e6
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/javascript/entrypoints/remote_interaction_helper.ts
View File

@@ -39,26 +39,27 @@ const findLink = (rel: string, data: unknown): JRDLink | undefined => {
}
};
const intentParams = (intent: string) => {
const intentParams = (intent: string): [string, string] | null => {
switch (intent) {
case 'follow':
return ['https://w3id.org/fep/3b86/Follow', 'object'] as [string, string];
return ['https://w3id.org/fep/3b86/Follow', 'object'];
case 'reblog':
return ['https://w3id.org/fep/3b86/Announce', 'object'] as [
string,
string,
];
return ['https://w3id.org/fep/3b86/Announce', 'object'];
case 'favourite':
return ['https://w3id.org/fep/3b86/Like', 'object'] as [string, string];
return ['https://w3id.org/fep/3b86/Like', 'object'];
case 'vote':
case 'reply':
return ['https://w3id.org/fep/3b86/Object', 'object'] as [string, string];
return ['https://w3id.org/fep/3b86/Object', 'object'];
default:
return null;
}
};
const findTemplateLink = (data: unknown, intent: string) => {
const findTemplateLink = (
data: unknown,
intent: string,
): [string, string] | [null, null] => {
// Find the FEP-3b86 handler for the specific intent
const [needle, param] = intentParams(intent) ?? [
'http://ostatus.org/schema/1.0/subscribe',
'uri',
@@ -66,14 +67,21 @@ const findTemplateLink = (data: unknown, intent: string) => {
const match = findLink(needle, data);
if (match) {
return [match.template, param] as [string, string];
if (match?.template) {
return [match.template, param];
}
const fallback = findLink('http://ostatus.org/schema/1.0/subscribe', data);
// If the specific intent wasn't found, try the FEP-3b86 handler for the `Object` intent
let fallback = findLink('https://w3id.org/fep/3b86/Object', data);
if (fallback?.template) {
return [fallback.template, 'object'];
}
if (fallback) {
return [fallback.template, 'uri'] as [string, string];
// If it's still not found, try the legacy OStatus subscribe handler
fallback = findLink('http://ostatus.org/schema/1.0/subscribe', data);
if (fallback?.template) {
return [fallback.template, 'uri'];
}
return [null, null];