FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disable service worker media cache and IndexedDB storage (#7932) 

Fix #7893
Fix #7615
This commit is contained in:
Eugen Rochko 2018-07-03 19:50:18 +02:00 committed by GitHub
parent 4045b50bd6
commit 5b6db8a62a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/mastodon/actions/importer/index.js
View File

@ -1,5 +1,5 @@
import { autoPlayGif } from '../../initial_state'; // import { autoPlayGif } from '../../initial_state';
import { putAccounts, putStatuses } from '../../storage/modifier'; // import { putAccounts, putStatuses } from '../../storage/modifier';
import { normalizeAccount, normalizeStatus } from './normalizer'; import { normalizeAccount, normalizeStatus } from './normalizer';
export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT'; export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT';
@ -45,7 +45,7 @@ export function importFetchedAccounts(accounts) {
} }
accounts.forEach(processAccount); accounts.forEach(processAccount);
putAccounts(normalAccounts, !autoPlayGif); //putAccounts(normalAccounts, !autoPlayGif);
return importAccounts(normalAccounts); return importAccounts(normalAccounts);
} }
@ -69,7 +69,7 @@ export function importFetchedStatuses(statuses) {
} }
statuses.forEach(processStatus); statuses.forEach(processStatus);
putStatuses(normalStatuses); //putStatuses(normalStatuses);
dispatch(importFetchedAccounts(accounts)); dispatch(importFetchedAccounts(accounts));
dispatch(importStatuses(normalStatuses)); dispatch(importStatuses(normalStatuses));

16
app/javascript/mastodon/service_worker/entry.js
View File

@ -1,9 +1,9 @@
import { freeStorage, storageFreeable } from '../storage/modifier'; // import { freeStorage, storageFreeable } from '../storage/modifier';
import './web_push_notifications'; import './web_push_notifications';
function openSystemCache() { // function openSystemCache() {
return caches.open('mastodon-system'); // return caches.open('mastodon-system');
} // }
function openWebCache() { function openWebCache() {
return caches.open('mastodon-web'); return caches.open('mastodon-web');
@ -13,8 +13,8 @@ function fetchRoot() {
return fetch('/', { credentials: 'include', redirect: 'manual' }); return fetch('/', { credentials: 'include', redirect: 'manual' });
} }
const firefox = navigator.userAgent.match(/Firefox\/(\d+)/); // const firefox = navigator.userAgent.match(/Firefox\/(\d+)/);
const invalidOnlyIfCached = firefox && firefox[1] < 60; // const invalidOnlyIfCached = firefox && firefox[1] < 60;
// Cause a new version of a registered Service Worker to replace an existing one // Cause a new version of a registered Service Worker to replace an existing one
// that is already installed, and replace the currently active worker on open pages. // that is already installed, and replace the currently active worker on open pages.
@ -52,7 +52,7 @@ self.addEventListener('fetch', function(event) {
return response; return response;
})); }));
} else if (storageFreeable && (ATTACHMENT_HOST ? url.host === ATTACHMENT_HOST : url.pathname.startsWith('/system/'))) { } /* else if (storageFreeable && (ATTACHMENT_HOST ? url.host === ATTACHMENT_HOST : url.pathname.startsWith('/system/'))) {
event.respondWith(openSystemCache().then(cache => { event.respondWith(openSystemCache().then(cache => {
return cache.match(event.request.url).then(cached => { return cache.match(event.request.url).then(cached => {
if (cached === undefined) { if (cached === undefined) {
@ -73,5 +73,5 @@ self.addEventListener('fetch', function(event) {
return cached; return cached;
}); });
})); }));
} } */
}); });