Merge branch 'develop'

2 files changed, 44 insertions, 27 deletions

diff --git a/src/server/web/index.ts b/src/server/web/index.ts
index 7b0b82eedf..ea356206ff 100644
--- a/src/server/web/index.ts
+++ b/src/server/web/index.ts
@@ -29,6 +29,7 @@ const markdown = MarkdownIt({
 });
 
 const staticAssets = `${__dirname}/../../../assets/`;
+const docAssets = `${__dirname}/../../../src/docs/`;
 const assets = `${__dirname}/../../assets/`;
 
 // Init app
@@ -44,7 +45,7 @@ app.use(views(__dirname + '/views', {
 }));
 
 // Serve favicon
-app.use(favicon(`${__dirname}/../../../assets/favicon.png`));
+app.use(favicon(`${__dirname}/../../../assets/favicon.ico`));
 
 // Common request handler
 app.use(async (ctx, next) => {
@@ -65,6 +66,13 @@ router.get('/static-assets/(.*)', async ctx => {
 	});
 });
 
+router.get('/doc-assets/(.*)', async ctx => {
+	await send(ctx as any, ctx.path.replace('/doc-assets/', ''), {
+		root: docAssets,
+		maxage: ms('7 days'),
+	});
+});
+
 router.get('/assets/(.*)', async ctx => {
 	await send(ctx as any, ctx.path.replace('/assets/', ''), {
 		root: assets,
@@ -75,7 +83,7 @@ router.get('/assets/(.*)', async ctx => {
 // Apple touch icon
 router.get('/apple-touch-icon.png', async ctx => {
 	await send(ctx as any, '/apple-touch-icon.png', {
-		root: assets
+		root: staticAssets
 	});
 });
 
diff --git a/src/server/web/views/flush.pug b/src/server/web/views/flush.pug
index 59fed1f15d..ec585a34db 100644
--- a/src/server/web/views/flush.pug
+++ b/src/server/web/views/flush.pug
@@ -4,35 +4,44 @@ html
 	#msg
 	script.
 		const msg = document.getElementById('msg');
+		const successText = `\nSuccess Flush! <a href="/">Back to Misskey</a>\n成功しました。<a href="/">Misskeyを開き直してください。</a>`;
 
-		try {
-			localStorage.clear();
-			message('localStorage cleared');
+		message('Start flushing.');
 
-			const delidb = indexedDB.deleteDatabase('MisskeyClient');
-			delidb.onsuccess = () => message('indexedDB cleared');
+		(async function() {
+			try {
+				localStorage.clear();
+				message('localStorage cleared.');
 
-			if (navigator.serviceWorker.controller) {
-				navigator.serviceWorker.controller.postMessage('clear');
-				navigator.serviceWorker.getRegistrations()
-					.then(registrations => {
-						return Promise.all(registrations.map(registration => registration.unregister()));
-					})
-					.then(() => {
-						message('Success Flush! Please reopen Misskey.\n成功しました。Misskeyを開き直してください。');
-					})
-					.catch(e => { throw Error(e) });
-			} else {
-				message('Success Flush! Please reopen Misskey.\n成功しました。Misskeyを開き直してください。');
+				const idbPromises = ['MisskeyClient', 'keyval-store'].map((name, i, arr) => new Promise((res, rej) => {
+					const delidb = indexedDB.deleteDatabase(name);
+					delidb.onsuccess = () => res(message(`indexedDB "${name}" cleared. (${i + 1}/${arr.length})`));
+					delidb.onerror = e => rej(e)
+				}));
+
+				await Promise.all(idbPromises);
+
+				if (navigator.serviceWorker.controller) {
+					navigator.serviceWorker.controller.postMessage('clear');
+					await navigator.serviceWorker.getRegistrations()
+						.then(registrations => {
+							return Promise.all(registrations.map(registration => registration.unregister()));
+						})
+						.catch(e => { throw Error(e) });
+				}
+
+				message(successText);
+			} catch (e) {
+				message(`\n${e}\n\nFlush Failed. <a href="/flush">Please retry.</a>\n失敗しました。<a href="/flush">もう一度試してみてください。</a>`);
+				message(`\nIf you retry more than 3 times, clear the browser cache or contact to instance admin.\n3回以上試しても失敗する場合、ブラウザのキャッシュを消去し、それでもだめならインスタンス管理者に連絡してみてください。\n`)
+
+				console.error(e);
+				setTimeout(() => {
+					location = '/';
+				}, 10000)
 			}
-		} catch (e) {
-			console.error(e);
-			message(`${e}¥n¥nFlush Failed. Please reopen Misskey.\n失敗しました。Misskeyを開き直してください。`);
-			setTimeout(() => {
-				location = '/';
-			}, 10000)
-		}
+		})();
 
 		function message(text) {
-			msg.insertAdjacentHTML('beforeend', `<p>[${(new Date()).toString()}] ${text.replace(/¥n/g,'<br>')}</p>`)
+			msg.insertAdjacentHTML('beforeend', `<p>[${(new Date()).toString()}] ${text.replace(/\n/g,'<br>')}</p>`)
 		}