shibdib / Dramiel

config/config.new.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
     "trigger" => "!", // what trigger is used for commands
     "guild" => 152677265635803136, // guildID 
     "token" => "", //enter the token for your app (https://discordapp.com/developers/applications/me)
-	"adminRoles" => array("Admin","")//enter the roles that you'd like to have access to admin commands
+    "adminRoles" => array("Admin","")//enter the roles that you'd like to have access to admin commands
 );
 
 $config["database"] = array(

Spacing +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
     "trigger" => "!", // what trigger is used for commands
     "guild" => 152677265635803136, // guildID 
     "token" => "", //enter the token for your app (https://discordapp.com/developers/applications/me)
-	"adminRoles" => array("Admin","")//enter the roles that you'd like to have access to admin commands
+	"adminRoles" => array("Admin", "")//enter the roles that you'd like to have access to admin commands
 );
 
 $config["database"] = array(
@@ -134,7 +134,7 @@ 
         "alertChannel" => 0, // if using periodic check put the channel you'd like the bot to log removing users in. (Recommended you don't use an active chat channel)
         "nameEnforce" => "false", // if "true" bot will automatically change nicknames so that they match player names.
         "url" => "http://.....", // put a url here if using sso auth for ur sso page.
-        "exempt" => array("","") // role names that are exempt from auth checks (wont be removed by the bot)
+        "exempt" => array("", "") // role names that are exempt from auth checks (wont be removed by the bot)
     ),
     //Killmail posting
     "getKillmails" => array(

Dramiel.php

Indentation +2 added lines, -2 removed lines

@@ -102,8 +102,8 @@
 $plugins = array();
 foreach ($pluginDirs as $dir) {
     foreach (glob($dir) as $plugin) {
-		var_dump($plugin);
-		var_dump($adminPlugins);
+        var_dump($plugin);
+        var_dump($adminPlugins);
         // Only load the plugins we want to load, according to the config
         if (!in_array(str_replace(".php", "", basename($plugin)), $config["enabledPlugins"]) && in_array(str_replace(".php", "", basename($plugin), $adminPlugins))) {
             continue;

Spacing +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
 
 // Load chat plugins
 $pluginDirs = array("src/plugins/onMessage/*.php", "src/plugins/admin/*.php");
-$adminPlugins = array("setNickname","updateBot","holder");
+$adminPlugins = array("setNickname", "updateBot", "holder");
 $logger->addInfo("Loading in chat plugins");
 $plugins = array();
 foreach ($pluginDirs as $dir) {

src/plugins/admin/updateBot.php

Indentation +15 added lines, -15 removed lines

@@ -74,32 +74,32 @@
         $data = command($message, $this->information()["trigger"], $this->config["bot"]["trigger"]);

         if (isset($data["trigger"])) {

 			

-			//Admin Check

-			$botID = $this->discord->id;

-		$userID = $msgData["message"]["fromID"];

+            //Admin Check

+            $botID = $this->discord->id;

+        $userID = $msgData["message"]["fromID"];

         $adminRoles = $this->config["bot"]["adminRoles"];

         $id = $this->config["bot"]["guild"];

         $guild = $this->discord->guilds->get('id', $id);

-		$member = $guild->members->get("id", $userID);

-		$roles = $member->roles;

-		foreach ($roles as $role) {

+        $member = $guild->members->get("id", $userID);

+        $roles = $member->roles;

+        foreach ($roles as $role) {

                     if(!isset($role->name)){

                         if(!in_array($role->name, $adminRoles, true)){

                             $msg = ":bangbang: You do not have the necessary roles to issue this command :bangbang:";

-							$this->message->reply($msg);

-							return null;

+                            $this->message->reply($msg);

+                            return null;

                         }

                     }

                 }

 

             $update = updateBot($this->logger);

-			if ($update = "1"){

-				$msg = "Bot succesfully updated, restarting.";

-				$this->logger->addInfo("Bot succesfully updated, restarting.");

-				$this->message->reply($msg);

-				sleep(5);

-				die();

-			}

+            if ($update = "1"){

+                $msg = "Bot succesfully updated, restarting.";

+                $this->logger->addInfo("Bot succesfully updated, restarting.");

+                $this->message->reply($msg);

+                sleep(5);

+                die();

+            }

         }

     }

 

Spacing +3 added lines, -3 removed lines

@@ -83,8 +83,8 @@ 
 		$member = $guild->members->get("id", $userID);

 		$roles = $member->roles;

 		foreach ($roles as $role) {

-                    if(!isset($role->name)){

-                        if(!in_array($role->name, $adminRoles, true)){

+                    if (!isset($role->name)) {

+                        if (!in_array($role->name, $adminRoles, true)) {

                             $msg = ":bangbang: You do not have the necessary roles to issue this command :bangbang:";

 							$this->message->reply($msg);

 							return null;

@@ -93,7 +93,7 @@ 
                 }

 

             $update = updateBot($this->logger);

-			if ($update = "1"){

+			if ($update = "1") {

 				$msg = "Bot succesfully updated, restarting.";

 				$this->logger->addInfo("Bot succesfully updated, restarting.");

 				$this->message->reply($msg);

src/plugins/admin/setNickname.php

Indentation +8 added lines, -8 removed lines

@@ -74,20 +74,20 @@
         $data = command($message, $this->information()["trigger"], $this->config["bot"]["trigger"]);

         if (isset($data["trigger"])) {

 			

-			//Admin Check

-			$botID = $this->discord->id;

-		$userID = $msgData["message"]["fromID"];

+            //Admin Check

+            $botID = $this->discord->id;

+        $userID = $msgData["message"]["fromID"];

         $adminRoles = $this->config["bot"]["adminRoles"];

         $id = $this->config["bot"]["guild"];

         $guild = $this->discord->guilds->get('id', $id);

-		$member = $guild->members->get("id", $userID);

-		$roles = $member->roles;

-		foreach ($roles as $role) {

+        $member = $guild->members->get("id", $userID);

+        $roles = $member->roles;

+        foreach ($roles as $role) {

                     if(!isset($role->name)){

                         if(!in_array($role->name, $adminRoles, true)){

                             $msg = ":bangbang: You do not have the necessary roles to issue this command :bangbang:";

-							$this->message->reply($msg);

-							return null;

+                            $this->message->reply($msg);

+                            return null;

                         }

                     }

                 }

Spacing +3 added lines, -3 removed lines

@@ -83,8 +83,8 @@ 
 		$member = $guild->members->get("id", $userID);

 		$roles = $member->roles;

 		foreach ($roles as $role) {

-                    if(!isset($role->name)){

-                        if(!in_array($role->name, $adminRoles, true)){

+                    if (!isset($role->name)) {

+                        if (!in_array($role->name, $adminRoles, true)) {

                             $msg = ":bangbang: You do not have the necessary roles to issue this command :bangbang:";

 							$this->message->reply($msg);

 							return null;

@@ -93,7 +93,7 @@ 
                 }

 

             $member = $guild->members->get("id", $botID);

-            $nick = (string)$data["messageString"];

+            $nick = (string) $data["messageString"];

             $member->setNickname($nick);

 

             $msg = "Bot nickname changed to **{$nick}** by {$msgData["message"]["from"]}";

src/lib/autoUpdate.php

Indentation +6 added lines, -6 removed lines

@@ -29,12 +29,12 @@
  */

 function updateBot($logger)

 {

-	$logger->addInfo("Updating Bot");

-	putenv("COMPOSER_HOME=/usr/local/bin/composer");

+    $logger->addInfo("Updating Bot");

+    putenv("COMPOSER_HOME=/usr/local/bin/composer");

     $output = shell_exec('sh ' . dirname(__FILE__) . '/update.sh');

-	if ($output = "1"){

-		$logger->addInfo("Update Complete");

-		return "1";

-	}

+    if ($output = "1"){

+        $logger->addInfo("Update Complete");

+        return "1";

+    }

 	

 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	$logger->addInfo("Updating Bot");

 	putenv("COMPOSER_HOME=/usr/local/bin/composer");

     $output = shell_exec('sh ' . dirname(__FILE__) . '/update.sh');

-	if ($output = "1"){

+	if ($output = "1") {

 		$logger->addInfo("Update Complete");

 		return "1";

 	}