Merge pull request #13 from JPGarCar/MISC-embed-colors

MISC-embed-colors
nwplus · Nov 29, 2020 · 99af0d4 · 99af0d4
2 parents 91474d8 + b741c89
commit 99af0d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/commands/a_activity/init-workshop.js b/commands/a_activity/init-workshop.js
@@ -90,10 +90,13 @@ module.exports = class InitWorkshop extends Command {
             ]
         });
 
+        // embed color for mentors
+        var mentorColor = (await message.guild.roles.fetch(discordServices.mentorRole)).color
+
         //makes ta console for workshop
         var targetChannel = message.guild.channels.cache.find(channel => channel.name === (activityName + "-ta-console"));
         const consoleEmbed = new Discord.MessageEmbed()
-            .setColor(discordServices.embedColor)
+            .setColor(mentorColor)
             .setTitle('Main console for ' + activityName)
             .setDescription('Here are some commands:\n' +
                 '🏕️ Will activate a stamp distribution that will be open for 20 seconds.\n' +
@@ -131,7 +134,7 @@ module.exports = class InitWorkshop extends Command {
 
         // embed message for TA console
         const taEmbed = new Discord.MessageEmbed()
-            .setColor(discordServices.embedColor)
+            .setColor(mentorColor)
             .setTitle('The Wait List')
             .setDescription('This is the wait list, it will always stay up to date! To get the next hacker that needs help click 🤝');
 

diff --git a/commands/utility/ask.js b/commands/utility/ask.js
@@ -46,7 +46,7 @@ module.exports = class AskQuestion extends Command {
 
         // message embed to be used for question
         const qEmbed = new Discord.MessageEmbed()
-            .setColor(discordServices.embedColor)
+            .setColor(discordServices.questionEmbedColor)
             .setTitle('Question from ' + message.author.username)
             .setDescription(question);
 

diff --git a/discord-services.js b/discord-services.js
@@ -46,8 +46,10 @@ module.exports.stamp11Role = stamp11Role;
 module.exports.stamp12Role = stamp12Role;
 
 // other project wide vars
-var embedColor = '#26fff4'
+var embedColor = '#26fff4';
 module.exports.embedColor = embedColor;
+var questionEmbedColor = '#f4ff26';
+module.exports.questionEmbedColor = questionEmbedColor;
 var announcementEmbedColor = '#8f26ff';
 module.exports.announcementEmbedColor = announcementEmbedColor;
 var tfTeamEmbedColor = '#1929ff';