[Enhancement] allow server owners to play music and use other command…

…s without DJ role
naseif · Nov 3, 2021 · 87d428a · 87d428a
1 parent 9617281
commit 87d428a
Show file tree

Hide file tree

Showing 10 changed files with 100 additions and 20 deletions.
diff --git a/commands/Music/clear.js b/commands/Music/clear.js
@@ -24,7 +24,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -83,7 +87,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/disconnect.js b/commands/Music/disconnect.js
@@ -34,7 +34,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -104,7 +108,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/jump.js b/commands/Music/jump.js
@@ -22,7 +22,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -86,7 +90,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/pause.js b/commands/Music/pause.js
@@ -19,7 +19,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -71,7 +75,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/play.js b/commands/Music/play.js
@@ -23,7 +23,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -223,7 +227,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/playskip.js b/commands/Music/playskip.js
@@ -24,7 +24,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -171,7 +175,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/repeat.js b/commands/Music/repeat.js
@@ -20,7 +20,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -109,7 +113,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/resume.js b/commands/Music/resume.js
@@ -20,7 +20,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -74,7 +78,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/skip.js b/commands/Music/skip.js
@@ -23,7 +23,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -75,7 +79,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(

diff --git a/commands/Music/stop.js b/commands/Music/stop.js
@@ -22,7 +22,11 @@ module.exports = {
     const checkdj = await client.db.get(`djRole_${message.guildId}`);
     const userRoles = await message.member.roles.cache.map((role) => role.id);
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      message.guild.ownerId !== message.author.id
+    ) {
       return await message.channel.send({
         embeds: [
           embedMessage(
@@ -75,7 +79,11 @@ module.exports = {
       (role) => role.id
     );
 
-    if (checkdj && !userRoles.includes(checkdj)) {
+    if (
+      checkdj &&
+      !userRoles.includes(checkdj) &&
+      interaction.guild.ownerId !== interaction.member.id
+    ) {
       return await interaction.followUp({
         embeds: [
           embedMessage(