From 81a370c18b0d14485d08a0163194f6353ecbbdd0 Mon Sep 17 00:00:00 2001
From: Mirco Wittrien <mirco.wittrien@gmail.com>
Date: Thu, 13 Oct 2022 13:15:23 +0200
Subject: [PATCH] stuff

---
 .../SpotifyControls/SpotifyControls.plugin.js | 49 +++++++++----------
 Plugins/UserNotes/UserNotes.plugin.js         | 13 ++---
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/Plugins/SpotifyControls/SpotifyControls.plugin.js b/Plugins/SpotifyControls/SpotifyControls.plugin.js
index 0460d7a6ba..0ad4529525 100644
--- a/Plugins/SpotifyControls/SpotifyControls.plugin.js
+++ b/Plugins/SpotifyControls/SpotifyControls.plugin.js
@@ -2,7 +2,7 @@
  * @name SpotifyControls
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 1.2.7
+ * @version 1.2.8
  * @description Adds a Control Panel while listening to Spotify on a connected Account
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -74,20 +74,19 @@ module.exports = (_ => {
 			}
 			request(socket, device, type, data) {
 				return new Promise(callback => {
-					let method = "PUT";
+					let method = "put";
 					switch (type) {
 						case "next":
 						case "previous":
-							method = "POST";
+							method = "post";
 							break;
 						case "get":
 							type = "";
-							method = "GET";
+							method = "get";
 							break;
 					};
-					BDFDB.LibraryRequires.request({
+					BDFDB.LibraryRequires.request[method]({
 						url: `https://api.spotify.com/v1/me/player${type ? "/" + type : ""}?${Object.entries(Object.assign({device_id: device.id}, data)).map(n => `${n[0]}=${n[1]}`).join("&")}`,
-						method: method,
 						headers: {
 							authorization: `Bearer ${socket.accessToken}`
 						}
@@ -443,7 +442,7 @@ module.exports = (_ => {
 				
 				this.defaults = {
 					general: {
-						addBy: 			{value: true,		description: "Adds the Word 'by' infront of the Author Name"},
+						addBy: 				{value: true,		description: "Adds the Word 'by' infront of the Author Name"},
 						addTimeline: 		{value: true,		description: "Shows the Song Timeline in the Controls"},
 						addActivityButton: 	{value: true,		description: "Shows the Activity Status Toggle Button in the Controls"},
 						doubleBack: 		{value: true,		description: "Requires the User to press the Back Button twice to go to previous Track"}
@@ -459,10 +458,10 @@ module.exports = (_ => {
 					}
 				};
 				
-				this.patchedModules = {
-					before: {
-						AnalyticsContext: "render"
-					}
+				this.modulePatches = {
+					after: [
+						"ChannelSidebar"
+					]
 				};
 				
 				this.css = `
@@ -691,11 +690,11 @@ module.exports = (_ => {
 					return false;
 				}});
 				
-				BDFDB.PatchUtils.forceAllUpdates(this);
+				BDFDB.DiscordUtils.rerenderAll();
 			}
 			
 			onStop () {
-				BDFDB.PatchUtils.forceAllUpdates(this);
+				BDFDB.DiscordUtils.rerenderAll();
 			}
 
 			getSettingsPanel (collapseStates = {}) {				
@@ -780,22 +779,20 @@ module.exports = (_ => {
 			onSettingsClosed () {
 				if (this.SettingsUpdated) {
 					delete this.SettingsUpdated;
-					BDFDB.PatchUtils.forceAllUpdates(this);
+					BDFDB.DiscordUtils.rerenderAll();
 				}
 			}
 
-			processAnalyticsContext (e) {
-				if (e.instance.props.section == BDFDB.DiscordConstants.AnalyticsSections.ACCOUNT_PANEL) e.instance.props.children = [
-					BDFDB.ReactUtils.createElement(SpotifyControlsComponent, {
-						key: "SPOTIFY_CONTROLS",
-						song: BDFDB.LibraryStores.SpotifyStore.getActivity(false),
-						maximized: BDFDB.DataUtils.load(this, "playerState", "maximized"),
-						buttonStates: [],
-						timeline: this.settings.general.addTimeline,
-						activityToggle: this.settings.general.addActivityButton
-					}, true),
-					[e.instance.props.children].flat(10).filter(n => !n || n.key != "SPOTIFY_CONTROLS")
-				].flat(10);
+			processChannelSidebar (e) {
+				let panels = BDFDB.ReactUtils.findChild(e.returnvalue, {props: [["className", BDFDB.disCN.channelpanels]]});
+				if (panels) panels.props.children.unshift(BDFDB.ReactUtils.createElement(SpotifyControlsComponent, {
+					key: "SPOTIFY_CONTROLS",
+					song: BDFDB.LibraryStores.SpotifyStore.getActivity(false),
+					maximized: BDFDB.DataUtils.load(this, "playerState", "maximized"),
+					buttonStates: [],
+					timeline: this.settings.general.addTimeline,
+					activityToggle: this.settings.general.addActivityButton
+				}, true));
 			}
 			
 			updatePlayer (song) {
diff --git a/Plugins/UserNotes/UserNotes.plugin.js b/Plugins/UserNotes/UserNotes.plugin.js
index 5fbdcd862e..ded16dbe5e 100644
--- a/Plugins/UserNotes/UserNotes.plugin.js
+++ b/Plugins/UserNotes/UserNotes.plugin.js
@@ -2,7 +2,7 @@
  * @name UserNotes
  * @author DevilBro
  * @authorId 278543574059057154
- * @version 1.0.9
+ * @version 1.1.0
  * @description Allows you to write User Notes locally
  * @invite Jx3TjNS
  * @donate https://www.paypal.me/MircoWittrien
@@ -89,14 +89,15 @@ module.exports = (_ => {
 			}
 
 			onUserContextMenu (e) {
-				if (e.instance.props.user && e.subType == "useBlockUserItem") {
-					if (e.returnvalue.length) e.returnvalue.push(BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuSeparator, {}));
-					e.returnvalue.push(BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, {
+				if (!e.instance.props.user) return;
+				let [children, index] = BDFDB.ContextMenuUtils.findItem(e.returnvalue, {id: "devmode-copy-id", group: true});
+				children.splice(index > -1 ? index : children.length, 0, BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuGroup, {
+					children: BDFDB.ContextMenuUtils.createItem(BDFDB.LibraryComponents.MenuItems.MenuItem, {
 						label: this.labels.user_note,
 						id: BDFDB.ContextMenuUtils.createItemId(this.name, "user-note"),
 						action: _ => this.openNotesModal(e.instance.props.user)
-					}));
-				}
+					})
+				}));
 			}
 
 			openNotesModal (user) {