Fix #952

8c70c9d6 · syuilo · 973d4463 · 8c70c9d6 · 8c70c9d6 · 8c70c9d6
Commit 8c70c9d6 authored 7 years ago by syuilo
--- a/src/web/app/boot.js
+++ b/src/web/app/boot.js
@@ -95,6 +95,10 @@
 			// Clear cache (serive worker)
 			try {
 				navigator.serviceWorker.controller.postMessage('clear');
+
+				navigator.serviceWorker.getRegistrations().then(registrations => {
+					registrations.forEach(registration => registration.unregister());
+				});
 			} catch (e) {
 				console.error(e);
 			}

--- a/src/web/app/common/scripts/check-for-update.ts
+++ b/src/web/app/common/scripts/check-for-update.ts
@@ -11,6 +11,10 @@ export default async function(mios: MiOS) {
 		// Clear cache (serive worker)
 		try {
 			navigator.serviceWorker.controller.postMessage('clear');
+
+			navigator.serviceWorker.getRegistrations().then(registrations => {
+				registrations.forEach(registration => registration.unregister());
+			});
 		} catch (e) {
 			console.error(e);
 		}

--- a/src/web/assets/404.js
+++ b/src/web/assets/404.js
@@ -5,6 +5,10 @@ if (yn) {
 	// Clear cache (serive worker)
 	try {
 		navigator.serviceWorker.controller.postMessage('clear');
+
+		navigator.serviceWorker.getRegistrations().then(registrations => {
+			registrations.forEach(registration => registration.unregister());
+		});
 	} catch (e) {
 		console.error(e);
 	}

--- a/src/web/assets/recover.html
+++ b/src/web/assets/recover.html
-<!DOCTYPE html>
-
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>Misskeyのリカバリ</title>
-		<script>
-
-			const yn = window.confirm('キャッシュをクリアしますか？\n\nDo you want to clear caches?');
-
-			if (yn) {
-				try {
-					navigator.serviceWorker.controller.postMessage('clear');
-
-					navigator.serviceWorker.getRegistrations().then(registrations => {
-						registrations.forEach(registration => registration.unregister());
-					});
-
-				} catch (e) {
-					console.error(e);
-				}
-
-				localStorage.setItem('should-refresh', 'true');
-
-				alert('キャッシュをクリアしました。');
-
-				location.href = '/';
-			} else {
-				alert('問題が解決しない場合はサーバー管理者までお問い合せください。');
-			}
-
-		</script>
-	</head>
-</html>
--- a/src/web/server.ts
+++ b/src/web/server.ts
@@ -44,8 +44,6 @@ app.use('/assets', (req, res) => {
 	res.sendStatus(404);
 });

-app.use('/recover', (req, res) => res.sendFile(`${__dirname}/assets/recover.html`));
-
 /**
 * ServiceWroker
 */