usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
tamaina 2022-12-25 18:23:08 +00:00
parent 03ee60f81b af649b0480
commit 65be649454
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/client/src/scripts/get-static-image-url.ts
View File

@ -8,7 +8,10 @@ export function getStaticImageUrl(baseUrl: string): string {
u.searchParams.set('static', '1'); u.searchParams.set('static', '1');
return u.href; 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({ return `${instanceUrl}/proxy/${dummy}?${url.query({
url: u.href, url: u.href,
static: '1', static: '1',

3
packages/sw/src/scripts/create-notification.ts
View File

@ -137,7 +137,8 @@ async function composeNotification<K extends keyof pushNotificationDataMap>(data
u.searchParams.set('badge', '1'); u.searchParams.set('badge', '1');
badge = u.href; badge = u.href;
} else { } else {
const dummy = `${u.host}${u.pathname}`; // 拡張子がないとキャッシュしてくれないCDNがあるので // 拡張子がないとキャッシュしてくれないCDNがあるので
const dummy = `${encodeURIComponent(`${u.host}${u.pathname}`)}.png`;
badge = `${origin}/proxy/${dummy}?${url.query({ badge = `${origin}/proxy/${dummy}?${url.query({
url: u.href, url: u.href,
badge: '1' badge: '1'