From 898daf24d12cb02b72ce128f8b143ad39d95620a Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 19 Mar 2017 15:22:55 +0900
Subject: [Client] Follow api changes and some cleanups

---
 src/web/app/boot.js | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/web/app/boot.js')

diff --git a/src/web/app/boot.js b/src/web/app/boot.js
index 24981c5889..cdedcd5003 100644
--- a/src/web/app/boot.js
+++ b/src/web/app/boot.js
@@ -65,7 +65,7 @@ export default callback => {
 	// Get cached account data
 	let cachedMe = JSON.parse(localStorage.getItem('me'));
 
-	if (cachedMe && cachedMe.data && cachedMe.data.cache) {
+	if (cachedMe) {
 		fetched(cachedMe);
 
 		// 後から新鮮なデータをフェッチ
@@ -74,11 +74,6 @@ export default callback => {
 			cachedMe.trigger('updated');
 		});
 	} else {
-		// キャッシュ無効なのにキャッシュが残ってたら掃除
-		if (cachedMe) {
-			localStorage.removeItem('me');
-		}
-
 		// Get token from cookie
 		const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1];
 
@@ -94,14 +89,12 @@ export default callback => {
 				me.trigger('updated');
 			};
 
-			if (me.data.cache) {
-				localStorage.setItem('me', JSON.stringify(me));
+			localStorage.setItem('me', JSON.stringify(me));
 
-				me.on('updated', () => {
-					// キャッシュ更新
-					localStorage.setItem('me', JSON.stringify(me));
-				});
-			}
+			me.on('updated', () => {
+				// キャッシュ更新
+				localStorage.setItem('me', JSON.stringify(me));
+			});
 		}
 
 		mixin(me);
@@ -164,7 +157,7 @@ function fetchme(token, cb) {
 	function init() {
 		const data = generateDefaultUserdata();
 		api(token, 'i/appdata/set', {
-			data: JSON.stringify(data)
+			set: data
 		}).then(() => {
 			me.data = data;
 			done();
-- 
cgit v1.3.1-freya