vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix PWA manifest using /web paths (#19421)

Browse source
This commit is contained in:
Eugen Rochko 2022-10-23 14:05:18 +02:00 committed by GitHub
parent a43a823768
commit c2c14331b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/javascript/mastodon/service_worker/entry.js
View file

@ -60,24 +60,15 @@ registerRoute(
self.addEventListener('install', function(event) {
event.waitUntil(Promise.all([openWebCache(), fetchRoot()]).then(([cache, root]) => cache.put('/', root)));
});
self.addEventListener('activate', function(event) {
event.waitUntil(self.clients.claim());
});
self.addEventListener('fetch', function(event) {
const url = new URL(event.request.url);
if (url.pathname.startsWith('/web/')) {
const asyncResponse = fetchRoot();
const asyncCache = openWebCache();
event.respondWith(asyncResponse.then(
response => {
const clonedResponse = response.clone();
asyncCache.then(cache => cache.put('/', clonedResponse)).catch();
return response;
},
() => asyncCache.then(cache => cache.match('/'))));
} else if (url.pathname === '/auth/sign_out') {
if (url.pathname === '/auth/sign_out') {
const asyncResponse = fetch(event.request);
const asyncCache = openWebCache();

6
app/serializers/manifest_serializer.rb
View file

@ -52,7 +52,7 @@ class ManifestSerializer < ActiveModel::Serializer
end
def start_url
'/web/home'
'/home'
end
def scope
@ -77,11 +77,11 @@ class ManifestSerializer < ActiveModel::Serializer
[
{
name: 'Compose new post',
url: '/web/publish',
url: '/publish',
},
{
name: 'Notifications',
url: '/web/notifications',
url: '/notifications',
},
]
end