[skip ci] fix: service worker old setting - "Vladanja"

ChrisRoss5 · Jan 7, 2024 · 6de0106 · 6de0106
1 parent 67356d5
commit 6de0106
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 12 deletions.
diff --git a/dist/manifest.json b/dist/manifest.json
@@ -3,7 +3,7 @@
   "name": "e-Dnevnik Plus",
   "description": "Napredna verzija e-Dnevnika za učenike i roditelje.",
   "author": "Kristijan Rosandić",
-  "version": "5.1",
+  "version": "5.1.1",
   "permissions": [
     "storage",
     "declarativeNetRequest"

diff --git a/dist/service_worker.js b/dist/service_worker.js
@@ -27,7 +27,8 @@ async function onInstalled(details) {
         if (previousVersion == "5.0")
             await update501();
         if (["5.0", "5.0.1"].includes(previousVersion))
-            update502();
+            await update502();
+        update51();
         chrome.storage.sync.get("appEnabled", (state) => {
             if (!state.appEnabled)
                 return;
@@ -42,7 +43,7 @@ async function update501() {
     return new Promise((resolve) => {
         chrome.storage.local.get(null, (state) => {
             if (!state || !state.users)
-                return;
+                return resolve();
             state.users.forEach((user) => {
                 const subjectsSettings = user.settings.subjectsSettings;
                 const showColors = subjectsSettings.subjectColors;
@@ -59,11 +60,24 @@ async function update501() {
 }
 function update502() {
     chrome.storage.sync.set({ newUpdates: true, updateNotif: true });
+    return new Promise((resolve) => {
+        chrome.storage.local.get(null, (state) => {
+            if (!state || !state.users)
+                return resolve();
+            state.users.forEach((user) => {
+                user.settings.websitesSettings = user.settings.websitesSettings.filter((website) => !["Srednja.hr", "Školski e-Rudnik"].includes(website.name));
+            });
+            chrome.storage.local.set(state, resolve);
+        });
+    });
+}
+function update51() {
     chrome.storage.local.get(null, (state) => {
         if (!state || !state.users)
             return;
         state.users.forEach((user) => {
-            user.settings.websitesSettings = user.settings.websitesSettings.filter((website) => !["Srednja.hr", "Školski e-Rudnik"].includes(website.name));
+            user.settings.classTabsOrder = user.settings
+                .classTabsOrder.filter((t) => t != "Vladanja");
         });
         chrome.storage.local.set(state);
     });

diff --git a/docs/important.html b/docs/important.html
diff --git a/extension_scripts/service_worker.ts b/extension_scripts/service_worker.ts
@@ -26,7 +26,8 @@ async function onInstalled(details: any) {
       return;
     }
     if (previousVersion == "5.0") await update501();
-    if (["5.0", "5.0.1"].includes(previousVersion)) update502();
+    if (["5.0", "5.0.1"].includes(previousVersion)) await update502();
+    update51();
     chrome.storage.sync.get("appEnabled", (state) => {
       if (!state.appEnabled) return;
       chrome.declarativeNetRequest.updateEnabledRulesets({
@@ -40,7 +41,7 @@ async function update501() {
   chrome.storage.sync.set({ newUpdates: true, updateNotif: true });
   return new Promise<void>((resolve) => {
     chrome.storage.local.get(null, (state) => {
-      if (!state || !state.users) return;
+      if (!state || !state.users) return resolve();
       state.users.forEach((user: any) => {
         const subjectsSettings = user.settings.subjectsSettings;
         const showColors: boolean = subjectsSettings.subjectColors;
@@ -58,13 +59,26 @@ async function update501() {
 
 function update502() {
   chrome.storage.sync.set({ newUpdates: true, updateNotif: true });
+  return new Promise<void>((resolve) => {
+    chrome.storage.local.get(null, (state) => {
+      if (!state || !state.users) return resolve();
+      state.users.forEach((user: any) => {
+        user.settings.websitesSettings = user.settings.websitesSettings.filter(
+          (website: any) =>
+            !["Srednja.hr", "Školski e-Rudnik"].includes(website.name),
+        );
+      });
+      chrome.storage.local.set(state, resolve);
+    });
+  });
+}
+
+function update51() {
   chrome.storage.local.get(null, (state) => {
     if (!state || !state.users) return;
     state.users.forEach((user: any) => {
-      user.settings.websitesSettings = user.settings.websitesSettings.filter(
-        (website: any) =>
-          !["Srednja.hr", "Školski e-Rudnik"].includes(website.name),
-      );
+      user.settings.classTabsOrder = (user.settings
+        .classTabsOrder as string[]).filter((t) => t != "Vladanja");
     });
     chrome.storage.local.set(state);
   });

diff --git a/src/scripts/scrapers/scrapers.ts b/src/scripts/scrapers/scrapers.ts
@@ -153,7 +153,7 @@ async function updateSubjects(
   await Promise.allSettled(promises);
   if (window.isNewUser) {
     window.isNewUser = false;
-    getAds();
+    // getAds(); todo!
   }
   return true;
 }

diff --git a/zips/5.1.1.zip b/zips/5.1.1.zip