profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

Browse source
This commit is contained in:
syuilo 2022-02-23 21:31:51 +09:00
commit 28a24d30d2
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
packages/backend/src/services/fetch-instance-metadata.ts
View file

@ -156,7 +156,8 @@ async function fetchFaviconUrl(instance: Instance, doc: DOMWindow['document'] |
const url = 'https://' + instance.host; const url = 'https://' + instance.host;
if (doc) { if (doc) {
const href = doc.querySelector('link[rel="icon"]')?.getAttribute('href'); // https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
const href = Array.from(doc.getElementsByTagName('link')).reverse().find(link => link.relList.contains('icon'))?.href;
if (href) { if (href) {
return (new URL(href, url)).href; return (new URL(href, url)).href;
@ -186,11 +187,16 @@ async function fetchIconUrl(instance: Instance, doc: DOMWindow['document'] | nul
if (doc) { if (doc) {
const url = 'https://' + instance.host; const url = 'https://' + instance.host;
const hrefAppleTouchIconPrecomposed = doc.querySelector('link[rel="apple-touch-icon-precomposed"]')?.getAttribute('href'); // https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
const hrefAppleTouchIcon = doc.querySelector('link[rel="apple-touch-icon"]')?.getAttribute('href'); const links = Array.from(doc.getElementsByTagName('link')).reverse();
const hrefIcon = doc.querySelector('link[rel="icon"]')?.getAttribute('href'); // https://github.com/misskey-dev/misskey/pull/8220/files/0ec4eba22a914e31b86874f12448f88b3e58dd5a#r796487559
const href =
const href = hrefAppleTouchIconPrecomposed || hrefAppleTouchIcon || hrefIcon; [
links.find(link => link.relList.contains('apple-touch-icon-precomposed'))?.href,
links.find(link => link.relList.contains('apple-touch-icon'))?.href,
links.find(link => link.relList.contains('icon'))?.href,
]
.find(href => href);
if (href) { if (href) {
return (new URL(href, url)).href; return (new URL(href, url)).href;