v10.0.2 💣🚀🎉 Project rewrite

[instangram] Complete rewrite of the Project to support Firefox again. By rewriting, we were also able to increase the speed noticeably. Fixed bug on profile page modal showed twice. Fixed bug on some pages where nothing happens.
saschaheim · Jun 28, 2021 · e3a53e4 · e3a53e4
1 parent 9e0f1b1
commit e3a53e4
Show file tree

Hide file tree

Showing 12 changed files with 52 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# <img style="float: left; vertical-align: bottom; " width="35" src="https://upload.wikimedia.org/wikipedia/commons/4/4c/Typescript_logo_2020.svg"> [instantgram] v10.0.1
-![GitHub release](https://img.shields.io/badge/release-v10.0.1-green)
+# <img style="float: left; vertical-align: bottom; " width="35" src="https://upload.wikimedia.org/wikipedia/commons/4/4c/Typescript_logo_2020.svg"> [instantgram] v10.0.2
+![GitHub release](https://img.shields.io/badge/release-v10.0.2-green)
 
 ![badge](https://img.shields.io/badge/for-instagram-yellow.svg?style=flat-square)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/)
@@ -39,6 +39,10 @@ With this version we support all modern browsers that have ECMAScript 2015 (es6)
 Read [CONTRIBUTING.md](CONTRIBUTING.md) for more information. :heart:
 
 ## Changelog
+- v10.0.2 - [instangram] Complete rewrite of the Project to support Firefox again. \
+By rewriting, we were also able to increase the speed noticeably. \
+Fixed bug on profile page modal showed twice.
+Fixed bug on some pages where nothing happens.
 - v10.0.1 - [instangram] Complete rewrite of the Project to support Firefox again. \
 By rewriting, we were also able to increase the speed noticeably. \
 Fixed bug on some pages where nothing happens.

diff --git a/dist/main.js b/dist/main.js
diff --git a/index.html b/index.html
diff --git a/lang/de-de/index.html b/lang/de-de/index.html
diff --git a/lang/en-us/index.html b/lang/en-us/index.html
diff --git a/lang/es-ar/index.html b/lang/es-ar/index.html
diff --git a/lang/pt-br/index.html b/lang/pt-br/index.html
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "instantgram",
-  "version": "10.0.1",
+  "version": "10.0.2",
   "description": "A bookmarklet for download photos in Instagram",
   "author": "Matheus Falcão as of 4.0.0 Sascha Heim",
   "homepage": "https://thinkbig-company.github.io/instantgram/",

diff --git a/src/App.ts b/src/App.ts
@@ -13,4 +13,5 @@ export type Program = {
   foundByModule: null | string;
   foundVideo: boolean;
   foundImage: boolean;
+  foundProfile: boolean;
 }
diff --git a/src/_langs/partials/button.html b/src/_langs/partials/button.html
diff --git a/src/index.ts b/src/index.ts
@@ -22,7 +22,8 @@ const program: Program = {
 
     foundByModule: null,
     foundVideo: false,
-    foundImage: false
+    foundImage: false,
+    foundProfile: false
 }
 
 if (process.env.DEV) {
@@ -35,15 +36,27 @@ if (process.env.DEV) {
 // verify if are running on instagram site
 if (program.regexHostname.test(program.hostname)) {
 
-    new MediaScanner().execute(program, function (found: boolean, scannerProgram: Program) {
-        if (found == false) {
+    new MediaScanner().execute(program, function (scannerFound: boolean, scannerProgram: Program) {
+        if (process.env.DEV) {
+            console.log('scannerFound', scannerFound);
+        }
+
+        program.foundVideo = scannerProgram.foundVideo;
+        program.foundImage = scannerProgram.foundImage;
+        program.foundByModule = scannerProgram.foundByModule;
+
+        if (scannerFound == false) {
             // Profile page -> instagram.com/instagram/
             if (scannerProgram.regexProfilePath.test(scannerProgram.path)) {
                 new ProfilePageDownload().execute(scannerProgram, function (profilePageDownload: boolean, profilePageDownloadProgram: Program) {
                     if (process.env.DEV) {
                         console.log('profilePageDownload', profilePageDownload);
                     }
 
+                    program.foundVideo = profilePageDownloadProgram.foundVideo;
+                    program.foundImage = profilePageDownloadProgram.foundImage;
+                    program.foundByModule = profilePageDownloadProgram.foundByModule;
+
                     if (profilePageDownload == false) {
                         new Modal({
                             heading: [
@@ -63,17 +76,13 @@ if (program.regexHostname.test(program.hostname)) {
             }
         }
 
-        if (typeof scannerProgram.foundVideo !== 'undefined' && scannerProgram.foundByModule == undefined) {
+        if (program.foundByModule == undefined) {
             if (process.env.DEV) {
-                console.log('foundVideo', scannerProgram.foundVideo);
-                console.log('foundImage', scannerProgram.foundImage);
-                console.log('foundByModule', scannerProgram.foundByModule);
+                console.log('foundVideo', program.foundVideo);
+                console.log('foundImage', program.foundImage);
+                console.log('foundByModule', program.foundByModule);
             }
 
-            program.foundVideo = scannerProgram.foundVideo;
-            program.foundImage = scannerProgram.foundImage;
-            program.foundByModule = scannerProgram.foundByModule;
-
             if (program.foundVideo == false && program.foundImage == false) {
                 new Modal({
                     heading: [

diff --git a/src/modules/ProfilePageDownload.ts b/src/modules/ProfilePageDownload.ts
@@ -295,10 +295,16 @@ export class ProfilePageDownload implements Module {
 			if (document.querySelector('section > main > div:first-child > div > article > div:nth-child(1)').classList.length == 2) {
 				this.displayIsPrivateModal();
 
+				program.foundProfile = false;
+
 				callback(false, program);
 				return;
 			}
 
+			// Set some neccessary things
+			program.foundProfile = true;
+			program.foundByModule = this.getName();
+
 			// Get all links of content posts
 			const postLinks: Set<string> = await this.collectImageLinks(parseInt('1', 0) % 3);
 
@@ -316,8 +322,14 @@ export class ProfilePageDownload implements Module {
 			this.modal.close();
 
 			if (error == false) {
+				program.foundProfile = true;
+				program.foundByModule = this.getName();
+
 				callback(true, program);
 			} else {
+				program.foundProfile = false;
+				program.foundByModule = undefined;
+
 				callback(false, program);
 			}
 		}