Merge pull request #162 from mnao305/develop

version 1.5.2
mnao305 · Dec 19, 2020 · ab1e6cf · ab1e6cf
2 parents 9cdff11 + bfa397e
commit ab1e6cf
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vrcfriendcheck",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "VRChatにてフレンドのオンライ状況が確認できる拡張機能です",
   "author": "mnao305 <naomasa305@gmail.com>",
   "scripts": {

diff --git a/src/background.js b/src/background.js
@@ -32,48 +32,59 @@ Browser.alarms.onAlarm.addListener(async (alarm) => {
       Browser.browserAction.setBadgeText({ text: '' })
 
       // リスト取得
-      let favOnlineUsers, onlineFriends
+      let favUsers, onlineFriends
       if (
         favFriendOnlyNotification === 'on' ||
         showNumberIconIsFavFriend === 'on'
       ) {
-        const tmp = await getFavFriend()
-        favOnlineUsers = tmp.favOnlineUsers
-        Browser.storage.local.set(
-          {
-            favOfflineUsers: tmp.favOfflineUsers,
-            favOnlineUsers: favOnlineUsers,
-            favLastUpdate: Date.now()
-          }
-        )
+        favUsers = await getFavFriend()
       }
       if (
         favFriendOnlyNotification === 'off' ||
         showNumberIconIsFavFriend === 'off'
       ) {
         onlineFriends = await getOnlineFriends()
-        Browser.storage.local.set(
-          {
-            onlineUsers: onlineFriends,
-            lastUpdate: Date.now()
-          }
-        )
       }
 
       // 通知
       if (favFriendOnlyNotification === 'on') {
-        newOnlineFriendCheck(favOnlineUsers)
+        newOnlineFriendCheck(favUsers.favOnlineUsers)
       } else {
         newOnlineFriendCheck(onlineFriends)
       }
       // バッジ表示
       if (showNumberIcon === 'on') {
         if (showNumberIconIsFavFriend === 'on') {
-          setOnlineUserNumOverIcon(favOnlineUsers.length)
+          setOnlineUserNumOverIcon(favUsers.favOnlineUsers.length)
         } else {
           setOnlineUserNumOverIcon(onlineFriends.length)
         }
       }
+
+      // リスト保存
+      if (
+        favFriendOnlyNotification === 'on' ||
+        showNumberIconIsFavFriend === 'on'
+      ) {
+        Browser.storage.local.set(
+          {
+            favOfflineUsers: favUsers.favOfflineUsers,
+            favOnlineUsers: favUsers.favOnlineUsers,
+            favLastUpdate: Date.now()
+          }
+        )
+      }
+      if (
+        favFriendOnlyNotification === 'off' ||
+        showNumberIconIsFavFriend === 'off'
+      ) {
+        Browser.storage.local.set(
+          {
+            onlineUsers: onlineFriends,
+            lastUpdate: Date.now()
+          }
+        )
+      }
     } catch (error) {
       console.error(error)
       Browser.browserAction.setBadgeText({ text: '！' })