add experimental notice

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "RcGcDb"]
 	path = RcGcDb
 	url = https://gitlab.com/chicken-riders/RcGcDb.git
-	branch = master
+	branch = master

RcGcDb

@@ -0,0 +1 @@
+Subproject commit b31d666459e8cb19ec4276041cb2b7f8dd921d13

cmds/help.js

@@ -66,7 +66,8 @@ const restrictions = {
 	minecraft: ['minecraftHelp', 'command', 'bug'],
 	admin: ['settings', 'verification', 'rcscript', 'voice', 'pause'],
 	inline: ['inline.link', 'inline.template'],
-	patreon: ['settings.prefix']
+	patreon: ['settings.prefix'],
+	experimental: ['rcscript.default']
 }
 
 /**
@@ -147,7 +148,7 @@ function formathelp(messages, msg, lang) {
 	} ).map( message => {
 		var cmd = message.split('.')[0];
 		var intro = ( restrictions.inline.includes( message ) ? '' : prefix );
-		return '🔹 `' + intro + lang.get('help.list.' + message + '.cmd', mention).replace( new RegExp( '^' + cmd ), ( lang.localNames[cmd] || cmd ) ) + '`\n\t' + lang.get('help.list.' + message + '.desc', prefix)
+		return '🔹 `' + intro + lang.get('help.list.' + message + '.cmd', mention).replace( new RegExp( '^' + cmd ), ( lang.localNames[cmd] || cmd ) ) + '`\n\t' + ( restrictions.experimental.includes( message ) ? lang.get('general.experimental') + '\n\t' : '' ) + lang.get('help.list.' + message + '.desc', prefix)
 	} ).join('\n');
 }
 

cmds/rcscript.js

@@ -152,7 +152,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 								}
 								console.log( '- RcGcDw successfully added.' );
 								if ( reaction ) reaction.removeEmoji();
-								msg.replyMsg( lang.get('rcscript.added') + ' <' + wikinew + '>\n`' + prefix + 'rcscript' + ( rows.length ? ' ' + new_configid : '' ) + '`', {}, true );
+								msg.replyMsg( lang.get('rcscript.added') + ' <' + wikinew + '>\n`' + prefix + 'rcscript' + ( rows.length ? ' ' + new_configid : '' ) + '`' + '\n' + lang.get('general.experimental'), {}, true );
 							} );
 						}, error => {
 							console.log( '- Error while creating the webhook: ' + error );
@@ -204,7 +204,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 					} );
 				}, error => {
 					log_error(error);
-					if ( error.toString() !== 'DiscordAPIError: Unknown Webhook' ) {
+					if ( error.name === 'DiscordAPIError' && ['Unknown Webhook', 'Invalid Webhook Token'].includes( error.message ) ) {
 						return msg.replyMsg( lang.get('settings.save_failed'), {}, true );
 					}
 					db.run( 'DELETE FROM rcgcdw WHERE webhook = ?', [selected_row.webhook], function (delerror) {
@@ -469,7 +469,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 				return webhook.channelID;
 			}, error => {
 				log_error(error);
-				if ( error.toString() !== 'DiscordAPIError: Unknown Webhook' ) return;
+				if ( error.name === 'DiscordAPIError' && ['Unknown Webhook', 'Invalid Webhook Token'].includes( error.message ) ) return;
 				db.run( 'DELETE FROM rcgcdw WHERE webhook = ?', [selected_row.webhook], function (delerror) {
 					if ( delerror ) {
 						console.log( '- Error while removing the RcGcDw: ' + delerror );
@@ -502,7 +502,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 
 		Promise.all(rows.map( row => msg.client.fetchWebhook(...row.webhook.split('/')).catch( error => {
 			log_error(error);
-			if ( error.toString() !== 'DiscordAPIError: Unknown Webhook' ) return {};
+			if ( error.name === 'DiscordAPIError' && ['Unknown Webhook', 'Invalid Webhook Token'].includes( error.message ) ) return {};
 			db.run( 'DELETE FROM rcgcdw WHERE webhook = ?', [row.webhook], function (delerror) {
 				if ( delerror ) {
 					console.log( '- Error while removing the RcGcDw: ' + delerror );
@@ -543,7 +543,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 			} ).join('');
 			else text += lang.get('rcscript.missing');
 			if ( rows.length < limit ) text += '\n\n' + lang.get('rcscript.add_more') + '\n`' + prefix + 'rcscript add ' + lang.get('rcscript.new_wiki') + '`';
-			msg.sendChannel( '<@' + msg.author.id + '>, ' + text, {split:true}, true );
+			msg.sendChannel( lang.get('general.experimental') + '\n' + '<@' + msg.author.id + '>, ' + text, {split:true}, true );
 		} );
 	} );
 }

functions/discussion.js

@@ -300,8 +300,8 @@ function discussion_send(lang, msg, wiki, discussion, embed, spoiler) {
 			discussion.poll.answers.forEach( answer => embed.addField( answer.text.escapeFormatting(), ( answer.image ? '[__' + lang.get('discussion.image').escapeFormatting() + '__](' + answer.image.url + ')\n' : '' ) + lang.get('discussion.votes', answer.votes), true ) );
 			break;
 		case 'QUIZ':
-			description = discussion.quiz.title.escapeFormatting();
-			if ( discussion._embedded.openGraph ) embed.setThumbnail( discussion._embedded.openGraph[0].imageUrl );
+			description = discussion._embedded.quizzes[0].title.escapeFormatting();
+			embed.setThumbnail( discussion._embedded.quizzes[0].image );
 			break;
 		default:
 			if ( discussion.jsonModel ) {