From 44ae6efd50563b30d5836eeca949994914322db8 Mon Sep 17 00:00:00 2001
From: Lucas Pape <lucaspape25@gmail.com>
Date: Thu, 22 Feb 2024 14:08:16 +0100
Subject: [PATCH] fix issue #115

---
 common.js      |  4 +---
 ta_bg.js       | 36 ++++++++++++++++++------------------
 ta_database.js | 15 +++++++--------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/common.js b/common.js
index 3fdd856..c2920a0 100644
--- a/common.js
+++ b/common.js
@@ -1,6 +1,4 @@
 var { storage, runtime, browserAction, pageAction, tabs, windows, menus, extension } = browser;
-var { local } = storage;
+var { sync } = storage;
 
 var catchErr = e => console.error(e);
-
-
diff --git a/ta_bg.js b/ta_bg.js
index ef59f60..89d86a0 100644
--- a/ta_bg.js
+++ b/ta_bg.js
@@ -41,9 +41,9 @@ ta_bg.initPageAction = info => {
 ta_bg.listenMessageFromContentScript = () => {
     var me = ta_bg;
 
-    runtime.onMessage.addListener( (request, sender, sendBack) => {
+    runtime.onMessage.addListener((request, sender, sendBack) => {
 
-        switch(request.behavior) {
+        switch (request.behavior) {
             case 'init':
                 if (ta_database &&
                     ta_database.data &&
@@ -62,22 +62,22 @@ ta_bg.listenMessageFromContentScript = () => {
             case 'set_exceptions':
                 ta_database.set(
                     'exceptions', request.val.split('\n').filter(site => site)
-                ).then( () => sendBack({ msg: 'done'}) );
+                ).then(() => sendBack({ msg: 'done' }));
                 break;
             case 'set_options':
-                ta_database.setOptions(request).then( () => {
+                ta_database.setOptions(request).then(() => {
                     me.setupCacheList();
                     me.initPageAction({
                         forAll: true
                     });
-                    sendBack({ msg: 'done'});
+                    sendBack({ msg: 'done' });
                 });
                 break;
             case 'get_options':
                 sendBack(ta_database.data.setting);
                 break;
             case 'save':
-                var {title, val, type, id, url, sessionKey} = request;
+                var { title, val, type, id, url, sessionKey } = request;
                 ta_database.set(`${sessionKey} ${url} ${id}`, {
                     time: sessionKey,
                     type: type,
@@ -90,12 +90,12 @@ ta_bg.listenMessageFromContentScript = () => {
                 sendBack({ data: ta_database.data });
                 break;
             case 'delete':
-                ta_database.remove(request.id).then( () => {
+                ta_database.remove(request.id).then(() => {
                     sendBack({ msg: 'done', deleted: request.id, data: ta_database.data });
                 });
                 break;
             case 'clear':
-                ta_database.reset().then( () => {
+                ta_database.reset().then(() => {
                     sendBack({ msg: 'done' });
                 });
                 break;
@@ -111,7 +111,7 @@ ta_bg._popupListInWindow = () => {
         type: "popup", // "normal", "popup"
         height: 450,
         width: 800
-    }).then(()=>{});
+    }).then(() => { });
 };
 
 ta_bg._popupListInTab = () => {
@@ -186,8 +186,8 @@ ta_bg.setupCacheList = () => {
 
 ta_bg.setupContext = req => {
     var me = ta_bg;
-    var site_names = Object.keys(ta_database.data).filter( t => t.includes(req.url));
-    var datas = site_names.map( name => ta_database.data[name] ).filter( d => d.url == req.url ).map( d => d.val );
+    var site_names = Object.keys(ta_database.data).filter(t => t.includes(req.url));
+    var datas = site_names.map(name => ta_database.data[name]).filter(d => d.url == req.url).map(d => d.val);
     me.showCachesInContext(datas);
 };
 
@@ -215,7 +215,7 @@ ta_bg.showCachesInContext = caches => {
         type: 'separator'
     });
 
-    caches.forEach( cache => {
+    caches.forEach(cache => {
         menus.create({
             id: cache,
             title: cache,
@@ -239,15 +239,15 @@ ta_bg.setupAutoClear = () => {
 
         if (!data.setting.shouldAutoClear) return;
 
-        var day  = data.setting.autoClear_day,
+        var day = data.setting.autoClear_day,
             hour = data.setting.autoClear_hour,
-            min  = data.setting.autoClear_min;
+            min = data.setting.autoClear_min;
 
         if (day + hour + min == 0) return;
 
-        var lifetime = day  * 86400 +
-                       hour * 3600 +
-                       min  * 60;      // by second
+        var lifetime = day * 86400 +
+            hour * 3600 +
+            min * 60;      // by second
 
         var now = new Date();
 
@@ -265,4 +265,4 @@ ta_bg.setupAutoClear = () => {
 
     browser.alarms.onAlarm.addListener(checkAutoClear);
     checkAutoClear();
-};
+};
\ No newline at end of file
diff --git a/ta_database.js b/ta_database.js
index 8f7d28c..4112ad4 100644
--- a/ta_database.js
+++ b/ta_database.js
@@ -22,11 +22,11 @@ var ta_database = {
         ]
     },
 
-    _loadFromStorage: () => local.get().then( db_data => {
+    _loadFromStorage: () => sync.get().then(db_data => {
         ta_database.data = db_data;
     }),
 
-    init: () => ta_database._loadFromStorage().then( async () => {
+    init: () => ta_database._loadFromStorage().then(async () => {
         var me = ta_database;
         var add_on_version = me.VERSION;
         var current_version = me.data && me.data.version;
@@ -65,7 +65,7 @@ var ta_database = {
         }
     },
 
-    reset: () => local.clear().then( () => {
+    reset: () => sync.clear().then(() => {
         // reserve setting, clean caches
         var { data, _resetData } = ta_database;
 
@@ -73,12 +73,12 @@ var ta_database = {
         if (data.setting) keep_config.setting = data.setting;
         if (data.exceptions) keep_config.exceptions = data.exceptions;
 
-        return local.set(keep_config).then( () => {
+        return sync.set(keep_config).then(() => {
             ta_database.data = keep_config;
         });
     }),
 
-    remove: key => local.remove(key).then( () => {
+    remove: key => sync.remove(key).then(() => {
         delete ta_database.data[key];
     }),
 
@@ -87,7 +87,7 @@ var ta_database = {
 
         var tmp = {};
         tmp[name] = obj;
-        return local.set(tmp);
+        return sync.set(tmp);
     },
 
     setOptions: config => {
@@ -98,5 +98,4 @@ var ta_database = {
     },
 
     print: () => console.log(ta_database.data)
-};
-
+};
\ No newline at end of file