fix crash?

Markus-Rost · Dec 31, 2023 · 3a71471 · 3a71471
1 parent 639a320
commit 3a71471
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 14 deletions.
diff --git a/RcGcDw_buttons b/RcGcDw_buttons
diff --git a/dashboard/functions/rcscript.js b/dashboard/functions/rcscript.js
@@ -385,8 +385,10 @@ function update_rcscript(res, userSettings, guild, type, settings) {
 		channel: settings.channel
 	} ).then( response => {
 		if ( !response ) {
-			userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
-			userSettings.guilds.isMember.delete(guild);
+			if ( userSettings.guilds.isMember.has(guild) ) {
+				userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
+				userSettings.guilds.isMember.delete(guild);
+			}
 			return res(`/guild/${guild}`, 'savefail');
 		}
 		if ( response === 'noMember' || !hasPerm(response.userPermissions, PermissionFlagsBits.ManageGuild) ) {
@@ -565,8 +567,10 @@ function update_rcscript(res, userSettings, guild, type, settings) {
 				newchannel: ( newChannel ? settings.channel : undefined )
 			} ).then( response => {
 				if ( !response ) {
-					userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
-					userSettings.guilds.isMember.delete(guild);
+					if ( userSettings.guilds.isMember.has(guild) ) {
+						userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
+						userSettings.guilds.isMember.delete(guild);
+					}
 					return res(`/guild/${guild}`, 'savefail');
 				}
 				if ( response === 'noMember' || !hasPerm(response.userPermissions, PermissionFlagsBits.ManageGuild) ) {

diff --git a/dashboard/functions/settings.js b/dashboard/functions/settings.js
@@ -469,8 +469,10 @@ function update_settings(res, userSettings, guild, type, settings) {
 		allowCategory: true
 	} ).then( response => {
 		if ( !response ) {
-			userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
-			userSettings.guilds.isMember.delete(guild);
+			if ( userSettings.guilds.isMember.has(guild) ) {
+				userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
+				userSettings.guilds.isMember.delete(guild);
+			}
 			return res(`/guild/${guild}`, 'savefail');
 		}
 		if ( response === 'noMember' || !hasPerm(response.userPermissions, PermissionFlagsBits.ManageGuild) ) {

diff --git a/dashboard/functions/verification.js b/dashboard/functions/verification.js
@@ -602,8 +602,10 @@ function update_verification(res, userSettings, guild, type, settings) {
 		guild: guild
 	} ).then( response => {
 		if ( !response ) {
-			userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
-			userSettings.guilds.isMember.delete(guild);
+			if ( userSettings.guilds.isMember.has(guild) ) {
+				userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
+				userSettings.guilds.isMember.delete(guild);
+			}
 			return res(`/guild/${guild}`, 'savefail');
 		}
 		if ( response === 'noMember' || !hasPerm(response.userPermissions, PermissionFlagsBits.ManageGuild) ) {
@@ -1013,8 +1015,10 @@ function update_notices(res, userSettings, guild, type, settings) {
 		newchannel: settings.channel
 	} ).then( response => {
 		if ( !response ) {
-			userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
-			userSettings.guilds.isMember.delete(guild);
+			if ( userSettings.guilds.isMember.has(guild) ) {
+				userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
+				userSettings.guilds.isMember.delete(guild);
+			}
 			return res(`/guild/${guild}`, 'savefail');
 		}
 		if ( response === 'noMember' || !hasPerm(response.userPermissions, PermissionFlagsBits.ManageGuild) ) {
@@ -1211,8 +1215,10 @@ function send_button(res, userSettings, guild, type, settings) {
 		allowForum: true
 	} ).then( response => {
 		if ( !response ) {
-			userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
-			userSettings.guilds.isMember.delete(guild);
+			if ( userSettings.guilds.isMember.has(guild) ) {
+				userSettings.guilds.notMember.set(guild, userSettings.guilds.isMember.get(guild));
+				userSettings.guilds.isMember.delete(guild);
+			}
 			return res(`/guild/${guild}`, 'sendfail');
 		}
 		if ( response === 'noMember' || !hasPerm(response.userPermissions, PermissionFlagsBits.ManageGuild) ) {

diff --git a/main.js b/main.js
@@ -174,7 +174,7 @@ if ( process.env.dashboard ) {
 						} );
 					}
 				} )
-			)
+			);
 		},
 		getMember: (discordClient, evalData) => {
 			if ( discordClient.guilds.cache.has(evalData.guild) ) {
+9 −6		i18n/de.json
+3 −0		i18n/en-US.json
+35 −1		i18n/pt-BR.json
+2 −1		src/api.js
+10 −5		src/block.js
+21 −4		src/index.js
+3 −0		src/undo.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -174,7 +174,7 @@ if ( process.env.dashboard ) { @@
     						} );
     					}
     				} )
-    			)
+    			);
     		},
     		getMember: (discordClient, evalData) => {
     			if ( discordClient.guilds.cache.has(evalData.guild) ) {
@@ Expand Down @@