30 - remove rosary and music commands (#32)

Author: TheBookKnight

Makefile

@@ -1,48 +1,31 @@
 # build
-.PHONY: build/full build/lite
+.PHONY: build
 
-## build/full: builds Saint Anonymous with music player
-build/full:
-	@docker build --tag cadav001/saint-anonymous:full --platform linux/amd64 --file ./deployments/full/Dockerfile .
-
-## build/lite: builds Saint Anonymous without music player
-build/lite:
-	@docker build --tag cadav001/saint-anonymous:lite --platform linux/amd64 --file ./deployments/lite/Dockerfile .
+## build: builds Saint Anonymous
+build:
+	@docker build --tag cadav001/saint-anonymous:latest --platform linux/amd64 --file ./deployments/Dockerfile .
 
 # deploy
-.PHONY: deploy/full deploy/lite
-
-## deploy/full: deploys Discord commands to server including music player's
-deploy/full:
-	@VERSION=FULL npm run setup
+.PHONY: deploy
 
-## deploy/lite: deploys Discord commands to server
-deploy/lite:
+## deploy: deploys Discord commands to server
+deploy:
 	@npm run setup
 
 # start
-.PHONY: start/full start/lite
+.PHONY: start
 
-## start/full: starts up Saint Anonymous docker image with music player
-start/full:
-	@docker-compose --file docker-compose.full.yml build
-	@docker-compose --file docker-compose.full.yml up --detach
-
-## start/lite: starts up Saint Anonymous docker image with music player
-start/lite:
-	@docker-compose --file docker-compose.lite.yml build
-	@docker-compose --file docker-compose.lite.yml up --detach
+## start: starts up Saint Anonymous docker image
+start:
+	@docker compose --file docker-compose.yml build
+	@docker compose --file docker-compose.yml up --detach
 
 # stop
-.PHONY: stop/full stop/lite
-
-## stop/full: Stops Saint Anonymous full setup
-stop/full:
-	@docker-compose --file docker-compose.full.yml down --volumes
+.PHONY: stop
 
-## stop/lite: Stops Saint Anonymous lite setup
-stop/lite:
-	@docker-compose --file docker-compose.lite.yml down --volumes
+## stop: Stops Saint Anonymous
+stop:
+	@docker compose --file docker-compose.yml down --volumes
 
 .PHONY: config 
 config:

README.md

@@ -33,14 +33,6 @@ See this repo's Wiki - [Chapter 0](https://github.com/JoshuaTheEngineer/joshua-c
 
 <img width="450" alt="image" src="https://user-images.githubusercontent.com/13317525/168947090-5a8f635c-cde5-4983-986c-efbeef7795aa.png">
 
-2. Slash command `/sing {youtube url}` in the channel. It will start playing the YouTube video in the first channel it finds with #music in its name. Only works if it has one. To stop it playing, run `/hush`
-
-<img width="458" alt="image" src="https://user-images.githubusercontent.com/13317525/168946833-378a2e32-f486-43ea-af09-debb88db4810.png">
-
-3. Slash command `/praise {enter praise}` in the channel. It will enter the praise with a GIF.
+2. Slash command `/praise {enter praise}` in the channel. It will enter the praise with a GIF.
 
 <img width="403" alt="image" src="https://user-images.githubusercontent.com/13317525/168947395-91975fc0-ca0b-4818-a2aa-aa5cda84217f.png">
-
-4. Slash command `/rosary` in the channel and it will assign all members roles in praying the Rosary in a Voice Channel with name 'rosary'. You have the option to choose who can do the opening/closing prayer and reading the mysteries.
-
-<img width="563" alt="image" src="https://user-images.githubusercontent.com/13317525/162878465-feb38fdc-cfd7-4177-adc9-88213d5d64cc.png">

commands/active/about-me.js

@@ -1,11 +1,11 @@
 const { SlashCommandBuilder } = require('@discordjs/builders');
-const message = 'Hello, I am Saint Anonymous.\n\nMy calling is to share your prayers anonymously. I am ordained by Joshua Cadavez, the almighty but humble tech master.\n\nRevere him with 10 decades of the Rosary.';
+const message = 'Hello, I am Saint Anonymous.\n\nMy calling is to share your prayers and praises anonymously. Joshua Cadavez is my creator. If you have any suggestions to how may I best serve you, reach out to the Core team.';
 
 module.exports = {
     data: new SlashCommandBuilder()
         .setName('about-me')
         .setDescription('About the Saint Anonymous bot'),
-        async execute(interaction) {
-            await interaction.reply({content: message, ephemeral: true});
-        }
+    async execute(interaction) {
+        await interaction.reply({ content: message, ephemeral: true });
+    }
 }

commands/active/tutorial.js

@@ -2,9 +2,7 @@ const { SlashCommandBuilder } = require('@discordjs/builders');
 
 const tutorials = [
     '**DM** Saint Anonymous your prayer. It will share it to the #prayers channel.\n\n',
-    'Slash command `/praise {your praise}`. It will share it to the #prayers channel.\n\n',
-    'Slash command `/rosary`. It will assign Rosary roles via people in the Rosary voice channel.\n\n',
-    'Slash command `/sing {YouTube URL}`. It will start playing it in the #music channel. To stop it, slash command `/hush`.'
+    'Slash command `/praise {your praise}`. It will share it to the #prayers channel.\n\n'
 ]
 
 const message = `To use Saint Anonymous, it'll do the following for you anonymously...\n\n${tutorials.join('')}`;
@@ -13,7 +11,7 @@ module.exports = {
     data: new SlashCommandBuilder()
         .setName('tutorial')
         .setDescription('How to use Saint Anonymous'),
-        async execute(interaction) {
-            await interaction.reply({content: message, ephemeral: true});
-        }
+    async execute(interaction) {
+        await interaction.reply({ content: message, ephemeral: true });
+    }
 }

commands/active/rosary.js commands/deprecated/rosary.js

@@ -11,15 +11,6 @@ for (const file of commandFiles) {
 	commands.push(command.data.toJSON());
 }
 
-// Adds music commands if full version is loaded
-if(process.env.VERSION == 'FULL') {
-	commandFiles = fs.readdirSync('./commands/music').filter(file => file.endsWith('.js'));
-	for (const file of commandFiles) {
-		const command = require(`./commands/music/${file}`);
-		commands.push(command.data.toJSON());
-	}
-}
-
 const rest = new REST({ version: '9' }).setToken(token);
 
 rest.put(Routes.applicationGuildCommands(clientId, guildId), { body: commands })

commands/music/hush.js

@@ -1,9 +1,9 @@
 version: "3.9"
 services:
   discord-bot:
-    image: cadav001/saint-anonymous:lite
+    image: cadav001/saint-anonymous:latest
     container_name: saint-anonymous
     restart: "on-failure"
     ports:
       - "8000:8000"
-    command: ["npm", "run", "dev"]
+    command: ["npm", "run", "dev"]

commands/music/sing.js

@@ -5,15 +5,15 @@ const { MessageEmbed } = require('discord.js')
 
 const { token } = require('./config.json');
 
-const client = new Client({ 
+const client = new Client({
 	intents: [
-		Intents.FLAGS.GUILDS, 
+		Intents.FLAGS.GUILDS,
 		Intents.FLAGS.DIRECT_MESSAGES,
 		Intents.FLAGS.GUILD_VOICE_STATES
 	],
 	partials: [
-        'CHANNEL', // Required to receive DMs
-    ]
+		'CHANNEL', // Required to receive DMs
+	]
 });
 
 let guild;
@@ -40,55 +40,36 @@ for (const file of commandFiles) {
 	client.commands.set(command.data.name, command);
 }
 
-// Adds music commands if full version is loaded
-if(process.env.VERSION == 'FULL') {
-	console.log("Loading Music Commands...")
-	commandFiles = fs.readdirSync('./commands/music').filter(file => file.endsWith('.js'));
-	for (const file of commandFiles) {
-		const command = require(`./commands/music/${file}`);
-		client.commands.set(command.data.name, command);
-	}
-}
-
 client.login(token);
 
-// Reminds to share prayers on Sunday, 3 pm EST  
-const reminder = new cron('0 19 * * 0', async function() {
+// Reminds to share prayers on every other Sunday, 3 pm EST  
+const reminder = new cron('0 19 * * 0/2', async function () {
 	let targetGuild = await client.guilds.fetch(guild['guildId']);
 	if (targetGuild) {
 		let banterChannel = await targetGuild.channels.fetch()
 			.then(channels => {
-				const targetChannel = channels.find(channel => 
-					{
-						return channel.name.toLowerCase().includes("banter") && channel.type == 'GUILD_TEXT';
-					})
+				const targetChannel = channels.find(channel => {
+					return channel.name.toLowerCase().includes("banter") && channel.type == 'GUILD_TEXT';
+				})
 				return targetChannel;
 			})
 
 		const reminderEmbed = new MessageEmbed()
 			.setTitle('Hello There!')
-			.setDescription('Share your prayer requests or praises to me for rosary tomorrow. \n\nOr play your music in the #music channel (keep it Christian 🧐) \n\nGod bless ya!')
+			.setDescription('Share your prayer requests or praises to me.')
 			.setColor('#add8e6')
 			.setImage('https://media.giphy.com/media/yNF0XKi2ZLuow/giphy.gif')
 			.addFields(
 				{
-					name: "Share your Prayer Request Anonymously", 
+					name: "Share your Prayer Request Anonymously",
 					value: "**DM** it to me. I'll share it to the #prayers channel"
 				},
 				{
-					name: "Share your Praises Anonymously", 
+					name: "Share your Praises Anonymously",
 					value: "In the banter channel. type `/praise {your praise}`"
-				},
-				{
-					name: "Assign Rosary roles", 
-					value: "Have all members in the Rosary voice channel. In the banter channel. type `/rosary`"
-				},
-				{
-					name: "Play your YouTube Music Anonymously", 
-					value: "In the banter channel, type `/sing {youtube url}`.\nI'll play it on the #music voice channel.\nTo stop it, run `/hush`"
 				}
 			);
-		await banterChannel.send({ embeds: [reminderEmbed]})
+		await banterChannel.send({ embeds: [reminderEmbed] })
 	}
 })