From 5b6db8a62a4305806b6257a78e0a85d3f91fcc54 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 3 Jul 2018 19:50:18 +0200 Subject: [PATCH] Disable service worker media cache and IndexedDB storage (#7932) Fix #7893 Fix #7615 --- .../mastodon/actions/importer/index.js | 8 ++++---- app/javascript/mastodon/service_worker/entry.js | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/javascript/mastodon/actions/importer/index.js b/app/javascript/mastodon/actions/importer/index.js index 5b18cbc1d7d..931711f4b05 100644 --- a/app/javascript/mastodon/actions/importer/index.js +++ b/app/javascript/mastodon/actions/importer/index.js @@ -1,5 +1,5 @@ -import { autoPlayGif } from '../../initial_state'; -import { putAccounts, putStatuses } from '../../storage/modifier'; +// import { autoPlayGif } from '../../initial_state'; +// import { putAccounts, putStatuses } from '../../storage/modifier'; import { normalizeAccount, normalizeStatus } from './normalizer'; export const ACCOUNT_IMPORT = 'ACCOUNT_IMPORT'; @@ -45,7 +45,7 @@ export function importFetchedAccounts(accounts) { } accounts.forEach(processAccount); - putAccounts(normalAccounts, !autoPlayGif); + //putAccounts(normalAccounts, !autoPlayGif); return importAccounts(normalAccounts); } @@ -69,7 +69,7 @@ export function importFetchedStatuses(statuses) { } statuses.forEach(processStatus); - putStatuses(normalStatuses); + //putStatuses(normalStatuses); dispatch(importFetchedAccounts(accounts)); dispatch(importStatuses(normalStatuses)); diff --git a/app/javascript/mastodon/service_worker/entry.js b/app/javascript/mastodon/service_worker/entry.js index 17b05a837bf..b354f3b3321 100644 --- a/app/javascript/mastodon/service_worker/entry.js +++ b/app/javascript/mastodon/service_worker/entry.js @@ -1,9 +1,9 @@ -import { freeStorage, storageFreeable } from '../storage/modifier'; +// import { freeStorage, storageFreeable } from '../storage/modifier'; import './web_push_notifications'; -function openSystemCache() { - return caches.open('mastodon-system'); -} +// function openSystemCache() { +// return caches.open('mastodon-system'); +// } function openWebCache() { return caches.open('mastodon-web'); @@ -13,8 +13,8 @@ function fetchRoot() { return fetch('/', { credentials: 'include', redirect: 'manual' }); } -const firefox = navigator.userAgent.match(/Firefox\/(\d+)/); -const invalidOnlyIfCached = firefox && firefox[1] < 60; +// const firefox = navigator.userAgent.match(/Firefox\/(\d+)/); +// const invalidOnlyIfCached = firefox && firefox[1] < 60; // 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. @@ -52,7 +52,7 @@ self.addEventListener('fetch', function(event) { 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 => { return cache.match(event.request.url).then(cached => { if (cached === undefined) { @@ -73,5 +73,5 @@ self.addEventListener('fetch', function(event) { return cached; }); })); - } + } */ });