Markus-Rost 4 gadi atpakaļ
vecāks
revīzija
266dfd342d
4 mainītis faili ar 16 papildinājumiem un 12 dzēšanām
  1. 9 5
      cmds/verify.js
  2. 4 4
      functions/verify.js
  3. 2 2
      interactions/verify.js
  4. 1 1
      main.js

+ 9 - 5
cmds/verify.js

@@ -235,13 +235,17 @@ function cmd_verify(lang, msg, args, line, wiki) {
 							}
 							log_error(error);
 							msg.reactEmoji('error');
-						} );
-						if ( result.logging.channel && msg.guild.channels.cache.has(result.logging.channel) ) {
+						} ).then( message => {
+							if ( !result.logging.channel || !msg.guild.channels.cache.has(result.logging.channel) ) return;
+							if ( message ) {
+								if ( result.logging.embed ) result.logging.embed.addField(message.url, '<#' + msg.channelId + '>');
+								else result.logging.content += '\n<#' + msg.channelId + '> – <' + message.url + '>';
+							}
 							msg.guild.channels.cache.get(result.logging.channel).send( {
 								content: result.logging.content,
-								embeds: [result.logging.embed]
+								embeds: ( result.logging.embed ? [result.logging.embed] : [] )
 							} ).catch(log_error);
-						}
+						} );
 					}
 					else msg.replyMsg( options, false, false ).then( message => {
 						if ( !result.logging.channel || !msg.guild.channels.cache.has(result.logging.channel) ) return;
@@ -251,7 +255,7 @@ function cmd_verify(lang, msg, args, line, wiki) {
 						}
 						msg.guild.channels.cache.get(result.logging.channel).send( {
 							content: result.logging.content,
-							embeds: [result.logging.embed]
+							embeds: ( result.logging.embed ? [result.logging.embed] : [] )
 						} ).catch(log_error);
 					} );
 				}

+ 4 - 4
functions/verify.js

@@ -679,7 +679,7 @@ global.verifyOauthUser = function(state, access_token, settings) {
 					}
 					verifynotice.logchannel.send( {
 						content: logtext,
-						embeds: [logembed]
+						embeds: ( logembed ? [logembed] : [] )
 					} ).catch(log_error);
 				}, log_error );
 			}
@@ -701,7 +701,7 @@ global.verifyOauthUser = function(state, access_token, settings) {
 					}
 					verifynotice.logchannel.send( {
 						content: logtext,
-						embeds: [logembed]
+						embeds: ( logembed ? [logembed] : [] )
 					} ).catch(log_error);
 				}, log_error );
 			}
@@ -833,7 +833,7 @@ global.verifyOauthUser = function(state, access_token, settings) {
 						}
 						verifynotice.logchannel.send( {
 							content: logtext,
-							embeds: [logembed]
+							embeds: ( logembed ? [logembed] : [] )
 						} ).catch(log_error);
 					}, log_error );
 				}, log_error );
@@ -880,7 +880,7 @@ global.verifyOauthUser = function(state, access_token, settings) {
 				}
 				verifynotice.logchannel.send( {
 					content: logtext,
-					embeds: [logembed]
+					embeds: ( logembed ? [logembed] : [] )
 				} ).catch(log_error);
 			}, log_error );
 

+ 2 - 2
interactions/verify.js

@@ -210,7 +210,7 @@ function slash_verify(interaction, lang, wiki) {
 					}
 					interaction.guild.channels.cache.get(result.logging.channel).send( {
 						content: result.logging.content,
-						embeds: [result.logging.embed]
+						embeds: ( result.logging.embed ? [result.logging.embed] : [] )
 					} ).catch(log_error);
 				} );
 			}, error => {
@@ -410,7 +410,7 @@ function slash_verify(interaction, lang, wiki) {
 					else result.logging.content += '\n<#' + interaction.channelId + '> – <' + interaction.message.url + '>';
 					interaction.guild.channels.cache.get(result.logging.channel).send( {
 						content: result.logging.content,
-						embeds: [result.logging.embed]
+						embeds: ( result.logging.embed ? [result.logging.embed] : [] )
 					} ).catch(log_error);
 				}
 				interaction.followUp( {

+ 1 - 1
main.js

@@ -190,7 +190,7 @@ if ( process.env.dashboard ) {
 				let channel = discordClient.guilds.cache.get(evalData.guild).publicUpdatesChannel;
 				if ( channel ) channel.send( {
 					content: evalData.text,
-					embeds: [evalData.embed],
+					embeds: ( evalData.embed ? [evalData.embed] : [] ),
 					files: evalData.file,
 					allowedMentions: {parse: []}
 				} ).catch(log_error);