fix stuff

BrianPetkovsek · Nov 29, 2019 · ffcb831 · ffcb831
1 parent f50819e
commit ffcb831
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 4 deletions.
diff --git a/YouTube_social_white_square_(2017).svg b/YouTube_social_white_square_(2017).svg
diff --git a/icon.ico b/icon.ico
diff --git a/main.js b/main.js
@@ -179,4 +179,30 @@ app.on('ready', () => {
 
 app.on('window-all-closed', () => {
     app.quit();
+});
+
+//stops extra app instances from opening
+var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) {
+	// Someone tried to run a second instance, we should focus our window.
+	if (mainWindow) {
+		if (mainWindow.isMinimized()) mainWindow.restore();
+		mainWindow.focus();
+	}
+});
+
+if (shouldQuit) {
+	app.quit();
+	return;
+}
+
+//only allows one electron window open
+var iSWindowOpen = false;
+app.on('browser-window-created', function(event, window) {
+	if (iSWindowOpen){
+		window.loadURL('javascript:window.close();');
+		console.log("Close new window");
+	}else{
+		iSWindowOpen = true;
+		console.log("Open one window");
+	}
 });
diff --git a/modules/youtube-js/get-youtube.js b/modules/youtube-js/get-youtube.js
@@ -60,8 +60,8 @@ async function injectRun(mainWindow) {
 					let now = moment.utc(),
                     remaining = moment.duration(videoDuration - videoCurrentTime, 'seconds');
 					endTimestamp = now.add(remaining).unix();
-					global.hasSeeked = videoCurrentTimeTemp != Math.floor(endTimestamp)
-					videoCurrentTimeTemp = Math.floor(endTimestamp)
+					global.hasSeeked = global.videoCurrentTimeTemp != Math.floor(endTimestamp)
+					global.videoCurrentTimeTemp = Math.floor(endTimestamp)
 
 					rpcData.endTimestamp = endTimestamp;
 					rpcData.state = 'By: '+ creator;
@@ -88,6 +88,7 @@ async function injectRun(mainWindow) {
 		rpcData.details = 'browsing';
 		rpcData.state = 'idle';
 	}
+
 	if (global.hasSeeked){
 		//update with endTimestamp has seeked
 		global.hasSeeked = false;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "YouTube",
   "github_repository": "discord-youtube",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "A YouTube wrapper with Discord Rich Presence",
   "main": "main.js",
   "scripts": {
@@ -50,6 +50,7 @@
   },
   "homepage": "https://github.com/BrianPetkovsek/discord-youtube#readme",
   "dependencies": {
+    "bad-words": "^1.6.4",
     "discord-rpc": "^3.0.0",
     "electron-widevinecdm": "^5.0.2",
     "moment": "^2.22.2",

diff --git a/updating.html b/updating.html
@@ -1 +1,9 @@
-<html><body>This app is downloading and installing an update please wait!</body></html>
+<html>
+<p>
+	This app is downloading and installing an update please wait!
+</p>
+<p>
+	If app taking a long time to update please download the latest release from GitHub.
+</p>
+<a href="https://github.com/BrianPetkovsek/discord-youtube/releases/latest">GitHub</a>
+</html>
diff --git a/youtube.png b/youtube.png
diff --git a/youtube_png.png b/youtube_png.png