diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2022-12-25 18:23:08 +0000 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2022-12-25 18:23:08 +0000 |
| commit | 65be6494543bbbb887f29f8f7e9c53774cfd3b80 (patch) | |
| tree | 39b976c9e64ca386323c253de9ba4551f54eac63 /packages | |
| parent | :art: fix #9414 (diff) | |
| parent | encodeURIComponent for static image proxy filename (#9410) (diff) | |
| download | misskey-65be6494543bbbb887f29f8f7e9c53774cfd3b80.tar.gz misskey-65be6494543bbbb887f29f8f7e9c53774cfd3b80.tar.bz2 misskey-65be6494543bbbb887f29f8f7e9c53774cfd3b80.zip | |
Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/client/src/scripts/get-static-image-url.ts | 5 | ||||
| -rw-r--r-- | packages/sw/src/scripts/create-notification.ts | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/client/src/scripts/get-static-image-url.ts b/packages/client/src/scripts/get-static-image-url.ts index 79dbcf9325..cbd1761983 100644 --- a/packages/client/src/scripts/get-static-image-url.ts +++ b/packages/client/src/scripts/get-static-image-url.ts @@ -8,7 +8,10 @@ export function getStaticImageUrl(baseUrl: string): string { u.searchParams.set('static', '1'); return u.href; } - const dummy = `${u.host}${u.pathname}`; // 拡張子がないとキャッシュしてくれないCDNがあるので + + // 拡張子がないとキャッシュしてくれないCDNがあるのでダミーの名前を指定する + const dummy = `${encodeURIComponent(`${u.host}${u.pathname}`)}.webp`; + return `${instanceUrl}/proxy/${dummy}?${url.query({ url: u.href, static: '1', diff --git a/packages/sw/src/scripts/create-notification.ts b/packages/sw/src/scripts/create-notification.ts index fd5b0fa312..a324851fe2 100644 --- a/packages/sw/src/scripts/create-notification.ts +++ b/packages/sw/src/scripts/create-notification.ts @@ -137,7 +137,8 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data u.searchParams.set('badge', '1'); badge = u.href; } else { - const dummy = `${u.host}${u.pathname}`; // 拡張子がないとキャッシュしてくれないCDNがあるので + // 拡張子がないとキャッシュしてくれないCDNがあるので + const dummy = `${encodeURIComponent(`${u.host}${u.pathname}`)}.png`; badge = `${origin}/proxy/${dummy}?${url.query({ url: u.href, badge: '1' |