fix: handle v2 instance property correctly for mastodon v4.2 or lower ()

pull/3225/head
TAKAHASHI Shuuji 2025-03-04 13:20:29 +09:00 zatwierdzone przez GitHub
rodzic 3b075847b0
commit 4422bf6286
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
1 zmienionych plików z 3 dodań i 1 usunięć
server/utils

Wyświetl plik

@ -73,13 +73,15 @@ async function fetchAppInfo(origin: string, server: string) {
.catch(() => null),
])
// vapid.public_key prop is only available on Mastodon v4.3+
const v2InstanceVapidKey: string | undefined = v2Instance?.configuration?.vapid?.public_key
const app: AppInfo = {
...apps,
// prefer vapid key from `/api/v2/instance` if available
// since `vapid_key` from `/api/v1/apps` was deprecated on Mastodon v4.3.0+
// ref. apps API methods - Mastodon documentation
// - https://docs.joinmastodon.org/methods/apps/#create
...v2Instance ? { vapid_key: v2Instance.configuration.vapid.public_key } : {},
...v2InstanceVapidKey ? { vapid_key: v2InstanceVapidKey } : {},
}
return app