diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-04-11 23:13:18 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-04-11 23:13:18 +0900 |
| commit | 33c22b5f3efa4110c9b517c224c9fdfba7e6c64b (patch) | |
| tree | c029245de51666da7ab15cf5ae08f05b4ee32622 /packages/backend/src/services/fetch-instance-metadata.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 12.110.0 (diff) | |
| download | misskey-33c22b5f3efa4110c9b517c224c9fdfba7e6c64b.tar.gz misskey-33c22b5f3efa4110c9b517c224c9fdfba7e6c64b.tar.bz2 misskey-33c22b5f3efa4110c9b517c224c9fdfba7e6c64b.zip | |
Merge branch 'develop'
Diffstat (limited to 'packages/backend/src/services/fetch-instance-metadata.ts')
| -rw-r--r-- | packages/backend/src/services/fetch-instance-metadata.ts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/backend/src/services/fetch-instance-metadata.ts b/packages/backend/src/services/fetch-instance-metadata.ts index 2b6f82a910..d5294c5fe8 100644 --- a/packages/backend/src/services/fetch-instance-metadata.ts +++ b/packages/backend/src/services/fetch-instance-metadata.ts @@ -97,7 +97,7 @@ async function fetchNodeinfo(instance: Instance): Promise<NodeInfo> { } else { throw e.statusCode || e.message; } - }); + }) as Record<string, unknown>; if (wellknown.links == null || !Array.isArray(wellknown.links)) { throw 'No wellknown links'; @@ -121,7 +121,7 @@ async function fetchNodeinfo(instance: Instance): Promise<NodeInfo> { logger.succ(`Successfuly fetched nodeinfo of ${instance.host}`); - return info; + return info as NodeInfo; } catch (e) { logger.error(`Failed to fetch nodeinfo of ${instance.host}: ${e}`); @@ -142,12 +142,12 @@ async function fetchDom(instance: Instance): Promise<DOMWindow['document']> { return doc; } -async function fetchManifest(instance: Instance): Promise<Record<string, any> | null> { +async function fetchManifest(instance: Instance): Promise<Record<string, unknown> | null> { const url = 'https://' + instance.host; const manifestUrl = url + '/manifest.json'; - const manifest = await getJson(manifestUrl); + const manifest = await getJson(manifestUrl) as Record<string, unknown>; return manifest; } @@ -167,7 +167,8 @@ async function fetchFaviconUrl(instance: Instance, doc: DOMWindow['document'] | const faviconUrl = url + '/favicon.ico'; const favicon = await fetch(faviconUrl, { - timeout: 10000, + // TODO + //timeout: 10000, agent: getAgentByUrl, }); |