fix NaNundefined and remove unnecessary caching

sir-kokabi · Oct 3, 2023 · abacccc · abacccc
1 parent fd5be65
commit abacccc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 76 deletions.
diff --git a/src/chrome/background.js b/src/chrome/background.js
@@ -120,13 +120,9 @@ async function inject(selector, githubToken) {
   }
 
   async function injectStars(link) {
-    let stars;
-    try {
-      stars = await getStars(link.href);
+    const stars = await getStars(link.href);    
+    if (!stars) return;
 
-    } catch (error) {
-      return;
-    }
     const strong = document.createElement("strong");
     strong.id = "github-stars-14151312";
     strong.setAttribute("stars", stars);
@@ -151,22 +147,13 @@ async function inject(selector, githubToken) {
   async function getStars(githubRepoURL) {
     const repoName = githubRepoURL.match(/github\.com\/([^/]+\/[^/]+)/)[1];
 
-    const cache = await chrome.storage.local.get(repoName);
-    const repoStars = cache?.[repoName]?.stars;
-
-    if (repoStars) {
-      return repoStars;
-    }
-
     const response = await fetch(`https://api.github.com/repos/${repoName}`, {
       headers: { Authorization: `Token ${githubToken}` },
     });
 
     const data = await response.json();
     const stars = data.stargazers_count;
 
-    await chrome.storage.local.set({ [repoName]: { stars, time: new Date().getTime() } });
-
     return stars;
   }
 
@@ -183,24 +170,4 @@ async function inject(selector, githubToken) {
     return `${formattedNumber}${suffixes[suffixIndex]}`;
   }
 
-}
-
-chrome.runtime.onInstalled.addListener(async (details) => {
-  await chrome.alarms.create("clear-expired-stars", {
-    periodInMinutes: 60
-  });
-});
-
-chrome.alarms.onAlarm.addListener(async (alarm) => {
-  if (alarm.name === "clear-expired-stars") {
-    const allSavedData = await chrome.storage.local.get();
-    for (let key in allSavedData) {
-      const time = allSavedData[key].time;
-
-      const currentTime = new Date().getTime();
-      if (currentTime - time < 24 * 60 * 60 * 1000) return
-
-      await chrome.storage.local.remove(key);
-    }
-  }
-});
+}
diff --git a/src/chrome/manifest.json b/src/chrome/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "Github Sorter",
   "short_name": "GithubSorter",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Sort github repos by stars",
   "author": "Ayub Kokabi",
   "homepage_url": "https://github.com/sir-kokabi/github-sorter",
@@ -28,6 +28,6 @@
       "128": "images/icon-128.png"
     }
   },
-  "permissions": ["webNavigation", "storage", "scripting", "alarms", "tabs", "activeTab"],
+  "permissions": ["storage", "scripting", "tabs", "activeTab"],
   "host_permissions": ["https://github.com/*"]
 }
diff --git a/src/firefox/background.js b/src/firefox/background.js
@@ -121,13 +121,9 @@ async function inject(selector, githubToken) {
   }
 
   async function injectStars(link) {
-    let stars;
-    try {
-      stars = await getStars(link.href);
+    const stars = await getStars(link.href);
+    if (!stars) return;
 
-    } catch (error) {
-      return;
-    }
     const strong = document.createElement("strong");
     strong.id = "github-stars-14151312";
     strong.setAttribute("stars", stars);
@@ -152,22 +148,13 @@ async function inject(selector, githubToken) {
   async function getStars(githubRepoURL) {
     const repoName = githubRepoURL.match(/github\.com\/([^/]+\/[^/]+)/)[1];
 
-    const cache = await chrome.storage.local.get(repoName);
-    const repoStars = cache?.[repoName]?.stars;
-
-    if (repoStars) {
-      return repoStars;
-    }
-
     const response = await fetch(`https://api.github.com/repos/${repoName}`, {
       headers: { Authorization: `Token ${githubToken}` },
     });
 
     const data = await response.json();
     const stars = data.stargazers_count;
 
-    await chrome.storage.local.set({ [repoName]: { stars, time: new Date().getTime() } });
-
     return stars;
   }
 
@@ -184,24 +171,4 @@ async function inject(selector, githubToken) {
     return `${formattedNumber}${suffixes[suffixIndex]}`;
   }
 
-}
-
-chrome.runtime.onInstalled.addListener(async (details) => {
-  await chrome.alarms.create("clear-expired-stars", {
-    periodInMinutes: 60
-  });
-});
-
-chrome.alarms.onAlarm.addListener(async (alarm) => {
-  if (alarm.name === "clear-expired-stars") {
-    const allSavedData = await chrome.storage.local.get();
-    for (let key in allSavedData) {
-      const time = allSavedData[key].time;
-
-      const currentTime = new Date().getTime();
-      if (currentTime - time < 24 * 60 * 60 * 1000) return
-
-      await chrome.storage.local.remove(key);
-    }
-  }
-});
+}
diff --git a/src/firefox/manifest.json b/src/firefox/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "Github Sorter",
   "short_name": "GithubSorter",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Sort github repos by stars",
   "author": "Ayub Kokabi",
   "homepage_url": "https://github.com/sir-kokabi/github-sorter",
@@ -27,7 +27,7 @@
       "128": "images/icon-128.png"
     }
   },
-  "permissions": ["webNavigation", "storage", "scripting", "alarms", "tabs", "activeTab"],
+  "permissions": ["storage", "scripting", "tabs", "activeTab"],
   "host_permissions": ["https://github.com/*"],
 
   "browser_specific_settings": {