Apply several fixes

ANSH3LL · Apr 20, 2021 · e3df0af · e3df0af
1 parent c70c5a4
commit e3df0af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "Picture",
-  "version": "0.1",
+  "version": "0.12",
   "manifest_version": 2,
   "description": "Redirects all instagram URLs to smihub.com or picuki.com per user choice",
 

diff --git a/picture.js b/picture.js
@@ -20,12 +20,18 @@ function getUsername(igurl) {
 function getMediaId(igurl) {
     mediaId = BigInt(0);
     url = decodeURIComponent(igurl);
-    shortcode = url.match(instaPost)[2].split('');
+    shortcode = url.match(postRegex)[2].split('');
     alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_';
     shortcode.forEach((letter) => {
         mediaId = BigInt((mediaId * 64n)) + BigInt(alphabet.indexOf(letter));
     });
-    return mediaId.toString().split('').reverse().join('');
+    if(document.igRequestHandler == 1) {
+        return mediaId.toString().split('').reverse().join('');
+    } else if(document.igRequestHandler == 2) {
+        return mediaId.toString().split('').join('');
+    } else {
+        return '';
+    }
 }
 
 function setPrefix(result) {
@@ -66,5 +72,5 @@ function igRedirect(details) {
     return {redirectUrl: url};
 }
 
-browser.storage.onChanged.addListener(loadPreferences);
-browser.webRequest.onBeforeRequest.addListener(igRedirect, filter, ['blocking']);
+loadPreferences('dummy', 'dummy');
+browser.storage.onChanged.addListener(loadPreferences);
diff --git a/popup/options.html b/popup/options.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
     </head>
     <body>
-        <p id="status">Status: Using smihub.com</p>
+        <p id="status"></p>
         <button id="smihub">Use smihub.com</button>
         <button id="picuki">Use picuki.com</button>
         <button id="disabled">Disable Picture</button>