From 1da9969410706b07de5f5d98c334256cb400bfa9 Mon Sep 17 00:00:00 2001
From: Braeden Sowinski <sowinskibraeden@gmail.com>
Date: Sat, 2 Sep 2023 18:28:45 -0700
Subject: [PATCH] change/explicit-ban-function-names

---
 commands/admin.js     |  6 +++---
 package.json          |  2 +-
 util/AlarmsHandler.js |  6 +++---
 util/NitradoAPI.js    | 13 ++++++++++++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/commands/admin.js b/commands/admin.js
index 4ee920a..07f05d8 100644
--- a/commands/admin.js
+++ b/commands/admin.js
@@ -1,6 +1,6 @@
 const { EmbedBuilder, ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js');
 const bitfieldCalculator = require('discord-bitfield-calculator');
-const { HandlePlayerBan } = require('../util/NitradoAPI');
+const { BanPlayer, UnbanPlayer } = require('../util/NitradoAPI');
 
 module.exports = {
   name: "admin",
@@ -344,7 +344,7 @@ module.exports = {
 
       } else if (args[0].name == 'ban-player') {
 
-        HandlePlayerBan(client, args[0].options[0].value, true);
+        BanPlayer(client, args[0].options[0].value);
 
         let banned = new EmbedBuilder()
           .setColor(client.config.Colors.Default)
@@ -354,7 +354,7 @@ module.exports = {
 
       } else if (args[0].name == 'unban-player') {
 
-        HandlePlayerBan(client, args[0].options[0].value, false);
+        UnbanPlayer(client, args[0].options[0].value);
 
         let banned = new EmbedBuilder()
           .setColor(client.config.Colors.Default)
diff --git a/package.json b/package.json
index 60b7700..a5e5f2f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dayzr-bot",
-  "version": "9.1.0",
+  "version": "9.1.1",
   "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.",
   "main": "index.js",
   "nodemonConfig": {
diff --git a/util/AlarmsHandler.js b/util/AlarmsHandler.js
index f38599d..3995758 100644
--- a/util/AlarmsHandler.js
+++ b/util/AlarmsHandler.js
@@ -1,4 +1,4 @@
-const { HandlePlayerBan } = require('./NitradoAPI');
+const { BanPlayer, UnbanPlayer } = require('./NitradoAPI');
 const { EmbedBuilder } = require('discord.js');
 
 module.exports = {
@@ -32,7 +32,7 @@ module.exports = {
         
           channel.send({ content: `<@&${alarm.role}>`, embeds: [alarmEmbed] });
 
-          HandlePlayerBan(client, data.player, true);
+          BanPlayer(client, data.player);
         }
 
         let alarmEmbed = new EmbedBuilder()
@@ -120,7 +120,7 @@ module.exports = {
       
         channel.send({ content: `<@&${alarm.role}>`, embeds: [alarmEmbed] });
 
-        HandlePlayerBan(client, data.killer, true);
+        BanPlayer(client, data.killer);
       }
     }
   },
diff --git a/util/NitradoAPI.js b/util/NitradoAPI.js
index f56a33a..dd1fd73 100644
--- a/util/NitradoAPI.js
+++ b/util/NitradoAPI.js
@@ -62,5 +62,16 @@ module.exports = {
       }
       sendList();
     }));
-  }
+  },
+
+  /*
+    Allows more explicit function names outside this file;
+    i.e BanPlayer() & UnbanPlayer() that both call to the 
+    parent function HandlePlayerBan() rather than write
+    two whole different functions for each.
+  */
+
+  BanPlayer:   async (client, gamertag) => module.exports.HandlePlayerBan(client, gamertag, true),
+  UnbanPlayer: async (client, gamertag) => module.exports.HandlePlayerBan(client, gamertag, false),
+
 }
\ No newline at end of file