updated pywal vulnerability + other

5 files changed, 87 insertions, 73 deletions

diff --git a/.config/BetterDiscord/plugins/NotificationSounds.config.json b/.config/BetterDiscord/plugins/NotificationSounds.config.json
index 23be4d7..88b73e0 100644
--- a/.config/BetterDiscord/plugins/NotificationSounds.config.json
+++ b/.config/BetterDiscord/plugins/NotificationSounds.config.json
@@ -53,7 +53,7 @@
 		}
 	},
 	"changelog": {
-		"currentversion": "3.4.7"
+		"currentversion": "3.4.9"
 	},
 	"choices": {
 		"message1": {
diff --git a/.config/BetterDiscord/plugins/NotificationSounds.plugin.js b/.config/BetterDiscord/plugins/NotificationSounds.plugin.js
index 0cdbc55..e40a415 100644
--- a/.config/BetterDiscord/plugins/NotificationSounds.plugin.js
+++ b/.config/BetterDiscord/plugins/NotificationSounds.plugin.js
@@ -69,7 +69,7 @@ var NotificationSounds = (_ => {
 	return class NotificationSounds {
 		getName () {return "NotificationSounds";}
 
-		getVersion () {return "3.4.7";}
+		getVersion () {return "3.4.9";}
 
 		getAuthor () {return "DevilBro";}
 
@@ -77,7 +77,7 @@ var NotificationSounds = (_ => {
 
 		constructor () {
 			this.changelog = {
-				"improved":[["Incoming","Works again"]]
+				"improved":[["Start Over","When someone calls you again the call sound now starts over instead of continuing from the last time"]]
 			};
 
 			this.patchedModules = {
@@ -292,9 +292,9 @@ var NotificationSounds = (_ => {
 				children: Object.keys(BDFDB.ObjectUtils.filter(types, typedata => !typedata.implemented)).map(type => createSoundCard(type)).flat(10).filter(n => n)
 			}));
 			
-			let removeableAudios = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios).filter(name => !defaultAudios[name]).map(name => ({value:name, label:name})));
+			let removeableCategories = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios).filter(category => !(defaultAudios[category] && !Object.keys(audios[category] || {}).filter(song => defaultAudios[category][song] === undefined).length)).map(name => ({value:name, label:name})));
 			let removeableSongs = {};
-			for (let audio of removeableAudios) removeableSongs[audio.value] = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios[audio.value] || {}).map(name => ({value:name, label:name})));
+			for (let category of removeableCategories) removeableSongs[category.value] = [{value:removeAllKey, label:BDFDB.LanguageUtils.LanguageStrings.FORM_LABEL_ALL}].concat(Object.keys(audios[category.value] || {}).filter(song => !(defaultAudios[category.value] && defaultAudios[category.value][song] !== undefined)).map(name => ({value:name, label:name})));
 			settingsItems.push(BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.CollapseContainer, {
 				title: "Remove Songs",
 				collapseStates: collapseStates,
@@ -311,12 +311,13 @@ var NotificationSounds = (_ => {
 								children: BDFDB.ReactUtils.createElement(BDFDB.LibraryComponents.Select, {
 									key: "REMOVE_CATEGORY",
 									value: removeAllKey,
-									options: removeableAudios,
+									options: removeableCategories,
 									searchable: true,
 									onChange: (category, instance) => {
 										let songSelectIns = BDFDB.ReactUtils.findOwner(BDFDB.ReactUtils.findOwner(instance, {name:["BDFDB_Modal", "BDFDB_SettingsPanel"], up:true}), {key:"REMOVE_SONG"});
 										if (songSelectIns && removeableSongs[category.value]) {
 											songSelectIns.props.options = removeableSongs[category.value];
+											songSelectIns.props.value = removeAllKey;
 											BDFDB.ReactUtils.forceUpdate(songSelectIns);
 										}
 									}
@@ -352,8 +353,8 @@ var NotificationSounds = (_ => {
 										let songAmount = 0;
 										let catAll = categorySelectIns.props.value == removeAllKey;
 										let songAll = songSelectIns.props.value == removeAllKey;
-										if (catAll) songAmount = BDFDB.ArrayUtils.sum(Object.keys(audios).filter(name => !defaultAudios[name]).map(category => Object.keys(audios[category] || {}).length));
-										else if (songAll) songAmount = Object.keys(audios[categorySelectIns.props.value] || {}).length;
+										if (catAll) songAmount = BDFDB.ArrayUtils.sum(Object.keys(audios).map(category => Object.keys(audios[category] || {}).filter(song => !(defaultAudios[category] && defaultAudios[category][song] !== undefined)).length));
+										else if (songAll) songAmount = Object.keys(audios[categorySelectIns.props.value] || {}).filter(song => !(defaultAudios[categorySelectIns.props.value] && defaultAudios[categorySelectIns.props.value][song] !== undefined)).length;
 										else if (audios[categorySelectIns.props.value][songSelectIns.props.value]) songAmount = 1;
 										
 										if (songAmount) BDFDB.ModalUtils.confirm(this, `Are you sure you want to delete ${songAmount} added song${songAmount == 1 ? "" : "s"}?`, _ => {
@@ -382,7 +383,9 @@ var NotificationSounds = (_ => {
 		}
 
 		// Legacy
-		load () {}
+		load () {
+			if (window.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) BDFDB.PluginUtils.load(this);
+		}
 
 		start () {
 			if (!window.BDFDB) window.BDFDB = {myPlugins:{}};
@@ -473,11 +476,13 @@ var NotificationSounds = (_ => {
 					audio.volume = choices[type].volume/100;
 					e.returnValue.play = _ => {
 						if (!audio.paused || this.dontPlayAudio(type)) return;
+						audio.currentTime = 0;
 						audio.loop = false;
 						audio.play();
 					};
 					e.returnValue.loop = _ => {
 						if (!audio.paused || this.dontPlayAudio(type)) return;
+						audio.currentTime = 0;
 						audio.loop = true;
 						audio.play();
 					};
diff --git a/.config/BetterDiscord/plugins/PinDMs.config.json b/.config/BetterDiscord/plugins/PinDMs.config.json
index ef732e3..0d43d13 100644
--- a/.config/BetterDiscord/plugins/PinDMs.config.json
+++ b/.config/BetterDiscord/plugins/PinDMs.config.json
@@ -1,12 +1,13 @@
 {
 	"changelog": {
-		"currentversion": "1.7.4"
+		"currentversion": "1.7.5"
 	},
 	"dmCategories": {
 		"3516090637537661": {
 			"collapsed": false,
 			"color": null,
 			"dms": [
+				"703197442098855997",
 				"642833698315698232",
 				"456428001463369729",
 				"390601823523962892",
diff --git a/.config/BetterDiscord/plugins/PinDMs.plugin.js b/.config/BetterDiscord/plugins/PinDMs.plugin.js
index 4fc8b3d..17fe404 100644
--- a/.config/BetterDiscord/plugins/PinDMs.plugin.js
+++ b/.config/BetterDiscord/plugins/PinDMs.plugin.js
@@ -9,7 +9,7 @@ var PinDMs = (_ => {
 	return class PinDMs {
 		getName () {return "PinDMs";}
 
-		getVersion () {return "1.7.4";}
+		getVersion () {return "1.7.5";}
 
 		getAuthor () {return "DevilBro";}
 
@@ -17,7 +17,7 @@ var PinDMs = (_ => {
 
 		constructor () {
 			this.changelog = {
-				"fixed":[["Sort by recent","Works again"]]
+				"fixed":[["All pinned","No longer acts weird if all DMs are pinned in a category"]]
 			};
 			
 			this.patchedModules = {
@@ -145,7 +145,9 @@ var PinDMs = (_ => {
 		}
 
 		// Legacy
-		load () {}
+		load () {
+			if (window.BDFDB && typeof BDFDB === "object" && BDFDB.loaded) BDFDB.PluginUtils.load(this);
+		}
 
 		start () {
 			if (!window.BDFDB) window.BDFDB = {myPlugins:{}};
@@ -355,6 +357,12 @@ var PinDMs = (_ => {
 						return rowHeightFunc(...args);
 					};
 					
+					let renderRow = e.returnvalue.props.renderRow;
+					e.returnvalue.props.renderRow = (...args) => {
+						let row = renderRow(...args);
+						return row && row.key == "no-private-channels" ? null : row;
+					};
+					
 					let renderSection = e.returnvalue.props.renderSection;
 					e.returnvalue.props.renderSection = (...args) => {
 						if (args[0].section != 0 && args[0].section != e.returnvalue.props.sections.length - 1) {
diff --git a/.config/BetterDiscord/themes/pywal.theme.css b/.config/BetterDiscord/themes/pywal.theme.css
index f64c0bf..ca71102 100644
--- a/.config/BetterDiscord/themes/pywal.theme.css
+++ b/.config/BetterDiscord/themes/pywal.theme.css
@@ -6,70 +6,70 @@
 */
 
 :root {
-	--pywal-shade0: #2C2D2F;
-	--pywal-shade1: #353638;
-	--pywal-shade2: #3A3B3D;
-	--pywal-shade3: #3E4041;
-	--pywal-shade4: #3C3F43;
+	--pywal-shade0: #4E3E3D;
+	--pywal-shade1: #5E4B49;
+	--pywal-shade2: #665150;
+	--pywal-shade3: #6D5756;
+	--pywal-shade4: #7B4C49;
 
-	--accent: 209, 196, 148;
+	--accent: 190, 213, 251;
 
-	--pywal-serverside: #1B1B1C;
-	--pywal-serverfolder-transparent: hsla(240, 1.6%, 10.8%, 0.75);
+	--pywal-serverside: #2C1F1F;
+	--pywal-serverfolder-transparent: hsla(4, 18.1%, 14.6%, 0.75);
 
-	--pywal-bg0: #1E1E1F;
-	--pywal-bg1: #242425;
-	--pywal-bg2: #2A2A2B;
-	--pywal-bg3: #303032;
+	--pywal-bg0: #312322;
+	--pywal-bg1: #3B2A29;
+	--pywal-bg2: #453130;
+	--pywal-bg3: #4E3836;
 
-	--pywal-color0: #1e1e1f;
-	--pywal-color1: #666b6d;
-	--pywal-color2: #8a8c8d;
-	--pywal-color3: #c59683;
-	--pywal-color4: #a7aeb0;
-	--pywal-color5: #aabbbe;
-	--pywal-color6: #d1c494;
-	--pywal-color7: #c6c6c7;
-	--pywal-color8: #565657;
-	--pywal-color9: #666b6d;
-	--pywal-color10: #8a8c8d;
-	--pywal-color11: #c59683;
-	--pywal-color12: #a7aeb0;
-	--pywal-color13: #aabbbe;
-	--pywal-color14: #d1c494;
-	--pywal-color15: #c6c6c7;
+	--pywal-color0: #312322;
+	--pywal-color1: #c3acaa;
+	--pywal-color2: #8eb8fb;
+	--pywal-color3: #f4b3aa;
+	--pywal-color4: #c0c3ef;
+	--pywal-color5: #e9bce1;
+	--pywal-color6: #bed5fb;
+	--pywal-color7: #cbc8c7;
+	--pywal-color8: #645a59;
+	--pywal-color9: #c3acaa;
+	--pywal-color10: #8eb8fb;
+	--pywal-color11: #f4b3aa;
+	--pywal-color12: #c0c3ef;
+	--pywal-color13: #e9bce1;
+	--pywal-color14: #bed5fb;
+	--pywal-color15: #cbc8c7;
 
-	--pywal-readable-color0: #69696B;
-	--pywal-readable-color1: #666B6D;
-	--pywal-readable-color2: #8A8C8D;
-	--pywal-readable-color3: #C59683;
-	--pywal-readable-color4: #A7AEB0;
-	--pywal-readable-color5: #AABBBE;
-	--pywal-readable-color6: #D1C494;
-	--pywal-readable-color7: #C6C6C7;
-	--pywal-readable-color8: #565657;
-	--pywal-readable-color9: #666B6D;
-	--pywal-readable-color10: #8A8C8D;
-	--pywal-readable-color11: #C59683;
-	--pywal-readable-color12: #A7AEB0;
-	--pywal-readable-color13: #AABBBE;
-	--pywal-readable-color14: #D1C494;
-	--pywal-readable-color15: #C6C6C7;
+	--pywal-readable-color0: #775957;
+	--pywal-readable-color1: #C3ACAA;
+	--pywal-readable-color2: #8EB8FB;
+	--pywal-readable-color3: #F4B3AA;
+	--pywal-readable-color4: #C0C3EF;
+	--pywal-readable-color5: #E9BCE1;
+	--pywal-readable-color6: #BED5FB;
+	--pywal-readable-color7: #CBC8C7;
+	--pywal-readable-color8: #645A59;
+	--pywal-readable-color9: #C3ACAA;
+	--pywal-readable-color10: #8EB8FB;
+	--pywal-readable-color11: #F4B3AA;
+	--pywal-readable-color12: #C0C3EF;
+	--pywal-readable-color13: #E9BCE1;
+	--pywal-readable-color14: #BED5FB;
+	--pywal-readable-color15: #CBC8C7;
 
-	--pywal-readableOn-color0: #c6c6c7;
-	--pywal-readableOn-color1: #c6c6c7;
-	--pywal-readableOn-color2: #1e1e1f;
-	--pywal-readableOn-color3: #1e1e1f;
-	--pywal-readableOn-color4: #1e1e1f;
-	--pywal-readableOn-color5: #1e1e1f;
-	--pywal-readableOn-color6: #1e1e1f;
-	--pywal-readableOn-color7: #1e1e1f;
-	--pywal-readableOn-color8: #c6c6c7;
-	--pywal-readableOn-color9: #c6c6c7;
-	--pywal-readableOn-color10: #1e1e1f;
-	--pywal-readableOn-color11: #1e1e1f;
-	--pywal-readableOn-color12: #1e1e1f;
-	--pywal-readableOn-color13: #1e1e1f;
-	--pywal-readableOn-color14: #1e1e1f;
-	--pywal-readableOn-color15: #1e1e1f;
+	--pywal-readableOn-color0: #cbc8c7;
+	--pywal-readableOn-color1: #312322;
+	--pywal-readableOn-color2: #312322;
+	--pywal-readableOn-color3: #312322;
+	--pywal-readableOn-color4: #312322;
+	--pywal-readableOn-color5: #312322;
+	--pywal-readableOn-color6: #312322;
+	--pywal-readableOn-color7: #312322;
+	--pywal-readableOn-color8: #cbc8c7;
+	--pywal-readableOn-color9: #312322;
+	--pywal-readableOn-color10: #312322;
+	--pywal-readableOn-color11: #312322;
+	--pywal-readableOn-color12: #312322;
+	--pywal-readableOn-color13: #312322;
+	--pywal-readableOn-color14: #312322;
+	--pywal-readableOn-color15: #312322;
 }
\ No newline at end of file