Merge pull request #35 from NGIT-Open-Source/develop

v1.5

Author: prithvi2k2

commands/run.js

@@ -100,7 +100,8 @@ module.exports = {
 		const user = interaction.user.id;
 
 		// prompt user to send code
-		await interaction.reply({ content: `Send your **${lang}** code enclosed in a code block. Request expires in 15 minutes!`, ephemeral: true });
+		const helpLink = 'https://github.com/NGIT-Open-Source/Neil.js/wiki/Run-your-code-with-Neil.js';
+		await interaction.reply({ content: `Send your **${lang}** code enclosed in a code block. [Help](<${helpLink}>)?`, ephemeral: true });
 
 		// Check if any received message by user is a codeblock, if not wait for reply until timer ends
 		// `filter` returns a boolean, code will be processed only when it returns True

commands/server.js

@@ -1,16 +1,29 @@
+// Docs reference
+// Interaction: https://discord.js.org/#/docs/main/stable/class/Interaction
+// Guild: https://discord.js.org/#/docs/main/stable/class/Guild
+// GuildMembers: https://discord.js.org/#/docs/main/stable/class/GuildMemberManager
 const { SlashCommandBuilder } = require('@discordjs/builders');
+const { MessageEmbed } = require('discord.js');
+
+// EMBED CONSTRUCTOR
+const embed = (guild, count) => new MessageEmbed()
+	.setTitle(guild.name)
+	.setThumbnail(guild.iconURL())
+	.setFields(
+		{ name: '📅Created', value: `**<t:${Math.floor(guild.createdTimestamp / 1000)}:R>**`, inline: true },
+		{ name: `👥Members(${guild.memberCount})`, value: `**${count}** Users | **${guild.memberCount - count}** Bots`, inline: true },
+		{ name: '👑Owner:', value: `<@${guild.ownerId}>`, inline: true });
 
 module.exports = {
 	data: new SlashCommandBuilder()
 		.setName('server')
 		.setDescription('Replies with Server info!'),
 	async execute(interaction) {
-		// MultiLine strings using `Template Literals`, it outputs as we see in our code, So beware, don't add spaces/tabs below
-		await interaction.reply(`
-Server name: ${interaction.guild.name}
-Total members: ${interaction.guild.memberCount}
-Created on: ${interaction.guild.createdAt}
-VerificationLvl: ${interaction.guild.verificationLevel}
-        `);
+		// Guild
+		const guild = interaction.guild;
+		// GuildMembers
+		const userCount = guild.members.cache.filter(cnt => cnt.user.bot).size;
+
+		await interaction.reply({ embeds: [embed(guild, userCount)] });
 	},
 };

commands/together.js

@@ -0,0 +1,31 @@
+// Experimental feature. Stay away!
+const { SlashCommandBuilder } = require('@discordjs/builders');
+
+// supported task/game list
+const tasks = ['youtube', 'poker', 'chess', 'betrayal', 'fishing', 'lettertile', 'wordsnack', 'doodlecrew'];
+
+module.exports = {
+	data: new SlashCommandBuilder()
+		.setName('together')
+		.setDescription('Together have fun🎉[EXPERIMENTAL/UNSTABLE]')
+		.addStringOption(option => {
+			option
+				.setName('apps')
+				.setDescription('Choose a app/game to start!')
+				.setRequired(true);
+			for (const task of tasks) {
+				option.addChoice(task, task);
+			}
+			return option;
+		}),
+	async execute(interaction) {
+		const channel = interaction.member.voice.channel;
+		const task = interaction.options.getString('apps');
+		if (channel) {
+			interaction.client.discordTogether.createTogetherCode(channel.id, `${task}`).then(async invite => {
+				await interaction.reply(`Click here ${invite.code} to start the activity!`);
+			});
+		}
+		else {await interaction.reply({ content: 'You must be in a voice channel!', ephemeral: true });}
+	},
+};

commands/user.js

@@ -1,10 +1,42 @@
+// Docs reference
+// Interaction: https://discord.js.org/#/docs/main/stable/class/Interaction
+// GuildMember: https://discord.js.org/#/docs/main/stable/class/GuildMember
+// GuildMembers: https://discord.js.org/#/docs/main/stable/class/GuildMemberManager
 const { SlashCommandBuilder } = require('@discordjs/builders');
+const { MessageEmbed } = require('discord.js');
+
+// EMBED CONSTRUCTOR
+const embed = member => new MessageEmbed()
+	.setThumbnail(member.displayAvatarURL())
+	.setDescription(`**<@${member.user.id}>**`)
+	.setFields(
+		{ name: 'Joined Discord:', value: `**<t:${format(member.user.createdTimestamp)}:R>**`, inline: true },
+		{ name: 'Joined Server:', value: `**<t:${format(member.joinedTimestamp)}:R>**`, inline: true })
+	.setFooter(member.user.tag);
+
+// Format timestamp from 13 digits to 10, Discord uses 10 digit timestamps
+const format = timeStamp => Math.ceil(timeStamp / 1000);
 
 module.exports = {
 	data: new SlashCommandBuilder()
 		.setName('user')
-		.setDescription('Replies with User info!'),
+		.setDescription('Replies with User info!')
+		.addUserOption(option =>
+			option.setName('target_user')
+				.setDescription('Get targeted user info')),
+
 	async execute(interaction) {
-		await interaction.reply(`Your tag: ${interaction.user.tag}\nYour id: ${interaction.user.id}`);
+		// GuildMember
+		let member = interaction.member;
+		// Target member, if provided
+		const target = interaction.options.getUser('target_user');
+		// GuildMember Object for Targeted member
+		if (target) {
+			// GuildMembers
+			const members = interaction.guild.members;
+			member = await members.fetch(target);
+		}
+
+		await interaction.reply({ embeds: [embed(member)], ephemeral: true });
 	},
 };

index.js

@@ -5,12 +5,20 @@
 
 require('dotenv').config();
 const fs = require('fs');
-const { Client, Intents } = require('discord.js');
+const { Client } = require('discord.js');
 const startServer = require('./server');
 const { setSlashCmds } = require('./events/slashCommands');
+const { DiscordTogether } = require('discord-together');
+
+// Intents are like permissions for the bot. Here's a list of intents available
+// https://discord.com/developers/docs/topics/gateway#gateway-intents
+const gateway_intents = ['GUILDS', 'GUILD_MESSAGES', 'GUILD_VOICE_STATES'];
 
 // Creates a new client instance
-const client = new Client({ intents: [Intents.FLAGS.GUILDS, Intents.FLAGS.GUILD_MESSAGES] });
+const client = new Client({ intents: gateway_intents });
+
+// discord-together init
+client.discordTogether = new DiscordTogether(client);
 
 // Loops through events folder and an array of events .js files are stored in eventFiles
 const eventFiles = fs.readdirSync('./events').filter(file => file.endsWith('.js'));