sovereignbot / citadel

src/Plugins/onMessage/cleverbot.php

Doc Comments +9 added lines, -9 removed lines

@@ -57,16 +57,16 @@
 
     /**
      * cleverBotMessage constructor.
-     * @param $message
-     * @param $discord
-     * @param $log
-     * @param $config
-     * @param $db
-     * @param $curl
-     * @param $settings
-     * @param $permissions
+     * @param Message $message
+     * @param Discord $discord
+     * @param Logger $log
+     * @param Config $config
+     * @param Db $db
+     * @param cURL $curl
+     * @param Settings $settings
+     * @param Permissions $permissions
      * @param $serverConfig
-     * @param $users
+     * @param Users $users
      */
     public function __construct($message, $discord, $log, $config, $db, $curl, $settings, $permissions, $serverConfig, $users)
     {

src/Sovereign.php

Spacing +16 added lines, -16 removed lines

@@ -154,7 +154,7 @@ 
     public function run()
     {
         // Reap the threads!
-        $this->websocket->loop->addPeriodicTimer(600, function () {
+        $this->websocket->loop->addPeriodicTimer(600, function() {
             // Only restart the audioStream pool if it's actually empty..
             if (empty($this->voice)) {
                 $this->voice->shutdown();
@@ -173,7 +173,7 @@ 
         });
 
         // Handle the onReady event, and setup some timers and so forth
-        $this->websocket->on('ready', function (Discord $discord) {
+        $this->websocket->on('ready', function(Discord $discord) {
             $this->log->addInfo('Websocket connected..');
 
             // Update our presence status
@@ -194,7 +194,7 @@ 
 
             // Setup the timers for the timer plugins
             foreach ($this->onTimer as $command => $data) {
-                $this->websocket->loop->addPeriodicTimer($data['timer'], function () use ($data, $discord) {
+                $this->websocket->loop->addPeriodicTimer($data['timer'], function() use ($data, $discord) {
                     try {
                         $plugin = new $data['class']($discord, $this->log, $this->globalConfig, $this->db, $this->curl, $this->settings, $this->permissions, $this->container->get('serverConfig'), $this->users, $this->extras);
                         $this->timers->submit($plugin);
@@ -205,7 +205,7 @@ 
             }
 
             // Issue periodically recounting and other things (Needed because of pthreads not putting the entire context into children - leading to some weirdness in some plugins)
-            $this->websocket->loop->addPeriodicTimer(600, function () {
+            $this->websocket->loop->addPeriodicTimer(600, function() {
                 $this->extras['memberCount'] = 0;
                 $this->extras['guildCount'] = 0;
                 /** @var Guild $guild */
@@ -226,26 +226,26 @@ 
             // If not, stop the session and leave the channel (To save some bandwidth)
         });
 
-        $this->websocket->on('error', function ($error, $websocket) {
+        $this->websocket->on('error', function($error, $websocket) {
             $this->log->addError('An error occurred on the websocket', [$error->getMessage()]);
             die(1);
         });
 
-        $this->websocket->on('close', function ($opCode, $reason) {
+        $this->websocket->on('close', function($opCode, $reason) {
             $this->log->addWarning('Websocket got closed', ['code' => $opCode, 'reason' => $reason]);
             die(1);
         });
 
-        $this->websocket->on('reconnecting', function () {
+        $this->websocket->on('reconnecting', function() {
             $this->log->addInfo('Websocket is reconnecting..');
         });
 
-        $this->websocket->on('reconnected', function () {
+        $this->websocket->on('reconnected', function() {
             $this->log->addInfo('Websocket was reconnected..');
         });
 
         // Handle incoming message logging
-        $this->websocket->on(Event::MESSAGE_CREATE, function (Message $message, Discord $discord) {
+        $this->websocket->on(Event::MESSAGE_CREATE, function(Message $message, Discord $discord) {
             $this->log->addInfo("Message from {$message->author->username}", [$message->content]);
 
             // Don't update data for ourselves..
@@ -257,7 +257,7 @@ 
         });
 
         // Handle plugin running
-        $this->websocket->on(Event::MESSAGE_CREATE, function (Message $message, Discord $discord) {
+        $this->websocket->on(Event::MESSAGE_CREATE, function(Message $message, Discord $discord) {
             $guildID = $message->getChannelAttribute()->guild_id;
 
             // Get server config
@@ -316,7 +316,7 @@ 
         });
 
         // Handle joining a voice channel, and playing.. stuff....
-        $this->websocket->on(Event::MESSAGE_CREATE, function (Message $message, Discord $discord) {
+        $this->websocket->on(Event::MESSAGE_CREATE, function(Message $message, Discord $discord) {
             // Get the guildID
             $guildID = $message->getChannelAttribute()->guild_id;
 
@@ -354,7 +354,7 @@ 
         });
 
         // Handle if it's a message for the bot (CleverBot invocation)
-        $this->websocket->on(Event::MESSAGE_CREATE, function (Message $message, Discord $discord) {
+        $this->websocket->on(Event::MESSAGE_CREATE, function(Message $message, Discord $discord) {
             // If we got highlighted we should probably answer back
             if (stristr($message->content, $discord->getClient()->id)) {
                 try {
@@ -366,7 +366,7 @@ 
         });
 
         // Handle presence updates
-        $this->websocket->on(Event::PRESENCE_UPDATE, function (PresenceUpdate $presenceUpdate) {
+        $this->websocket->on(Event::PRESENCE_UPDATE, function(PresenceUpdate $presenceUpdate) {
             if ($presenceUpdate->user->id && $presenceUpdate->user->username) {
                 try {
                     $this->log->addInfo("Updating presence info for {$presenceUpdate->user->username}");
@@ -379,12 +379,12 @@ 
         });
 
         // Create a new cleverbot \nick\ for this new guild
-        $this->websocket->on(Event::GUILD_CREATE, function (Guild $guild) {
+        $this->websocket->on(Event::GUILD_CREATE, function(Guild $guild) {
             $cleverBotExists = $this->db->queryField("SELECT serverID FROM cleverbot WHERE serverID = :serverID", "serverID", array(":serverID" => $guild->id));
             $guildExists = $this->db->queryField("SELECT guildID FROM guilds WHERE guildID = :serverID", "guildID", array(":serverID" => $guild->id));
 
             // Only create a new server nick if the cleverbot instance doesn't exist.. (Hopefully cleverbot.io is done deleting them at random)
-            if(!isset($cleverBotExists)) {
+            if (!isset($cleverBotExists)) {
                 $this->log->addInfo("Setting up Cleverbot for {$guild->name}");
                 $serverID = $guild->id;
                 $result = $this->curl->post('https://cleverbot.io/1.0/create', ['user' => $this->globalConfig->get('user', 'cleverbot'), 'key' => $this->globalConfig->get('key', 'cleverbot')]);
@@ -399,7 +399,7 @@ 
                 }
             }
 
-            if(!isset($guildExists)) {
+            if (!isset($guildExists)) {
                 $this->db->execute("INSERT IGNORE INTO guilds (guildID) VALUES (:guildID)", array(":guildID" => $guild->id));
 
                 // Send a hello message to the channel (Only if it's new!)

Braces +15 added lines, -10 removed lines

@@ -277,20 +277,24 @@ 
                 $content = explode(' ', $message->content);
                 foreach ($this->onMessage as $command => $data) {
                     $parts = [];
-                    foreach ($content as $index => $c)
-                        foreach (explode("\n", $c) as $p)
+                    foreach ($content as $index => $c) {
+                                            foreach (explode("\n", $c) as $p)
                             $parts[] = $p;
+                    }
 
                     if ($parts[0] === $config->prefix . $command) {
                         // If they are listed under the admins array in the bot config, they're the super admins
-                        if (in_array($message->author->id, $this->globalConfig->get('admins', 'permissions')))
-                            $userPerms = 3;
+                        if (in_array($message->author->id, $this->globalConfig->get('admins', 'permissions'))) {
+                                                    $userPerms = 3;
+                        }
                         // If they are guild owner, they're automatically getting permission level 2
-                        elseif (null !== $message->getChannelAttribute()->getGuildAttribute()->owner_id && ($message->author->id === $message->getChannelAttribute()->getGuildAttribute()->owner_id))
-                            $userPerms = 2;
+                        elseif (null !== $message->getChannelAttribute()->getGuildAttribute()->owner_id && ($message->author->id === $message->getChannelAttribute()->getGuildAttribute()->owner_id)) {
+                                                    $userPerms = 2;
+                        }
                         // Everyone else are just users
-                        else
-                            $userPerms = 1;
+                        else {
+                                                    $userPerms = 1;
+                        }
 
                         if ($userPerms >= $data['permissions']) {
                             try {
@@ -331,8 +335,9 @@ 
                 foreach ($this->onVoice as $command => $data) {
                     $parts = [];
                     foreach ($content as $index => $c) {
-                        foreach (explode("\n", $c) as $p)
-                            $parts[] = $p;
+                        foreach (explode("\n", $c) as $p) {
+                                                    $parts[] = $p;
+                        }
                     }
 
                     if ($parts[0] === $config->prefix . $command) {

src/Command/StartCommand.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
         error_reporting(E_ALL);
         define('DISCORDPHP_STARTTIME', microtime(true));
         define('BASEDIR', __DIR__);
-        define('SOVEREIGN_CONFIG_FILE',  realpath('./' . ltrim($input->getOption('configFile'), '/')));
+        define('SOVEREIGN_CONFIG_FILE', realpath('./' . ltrim($input->getOption('configFile'), '/')));
 
         // Init the container object
         $container = getContainer();

src/Lib/Config.php

Spacing +6 added lines, -6 removed lines

@@ -31,18 +31,18 @@ 
     /**
      * @param $configFile
      */
-    public function loadFile ($configFile) {
+    public function loadFile($configFile) {
 
         if (!file_exists(realpath($configFile))) {
-            $this->logger->addError('Config file '.realpath($configFile).' not found.');
+            $this->logger->addError('Config file ' . realpath($configFile) . ' not found.');
             return;
         }
 
         try {
             $this->config = array_change_key_case(include($configFile), \CASE_LOWER);
-            $this->logger->addDebug('Config file loaded: '.realpath($configFile));
+            $this->logger->addDebug('Config file loaded: ' . realpath($configFile));
         } catch (\Exception $e) {
-            $this->logger->addError('Failed loading config file ('.realpath($configFile).'): '.$e->getMessage());
+            $this->logger->addError('Failed loading config file (' . realpath($configFile) . '): ' . $e->getMessage());
         }
     }
 
@@ -59,7 +59,7 @@ 
             return $this->config[$type][$key];
         }
 
-        $this->logger->addWarning('Config setting not found: ['.$type.']['.$key.']');
+        $this->logger->addWarning('Config setting not found: [' . $type . '][' . $key . ']');
 
         return $default;
     }
@@ -75,7 +75,7 @@ 
             return $this->config[$type];
         }
 
-        $this->logger->addWarning('Config group not found: ['.$type.']');
+        $this->logger->addWarning('Config group not found: [' . $type . ']');
 
         return array();
     }

src/Plugins/onMessage/help.php

Braces +5 added lines, -4 removed lines

@@ -96,10 +96,11 @@
         if (isset($cmd)) {
             foreach ($plugins as $command => $data) {
                 if ($command == $cmd) {
-                    if ($data["usage"])
-                        $this->message->reply("**{$this->channelConfig->prefix}{$command}** _{$data["usage"]}_\r\n {$data["description"]}");
-                    else
-                        $this->message->reply("**{$this->channelConfig->prefix}{$command}** \r\n {$data["description"]}");
+                    if ($data["usage"]) {
+                                            $this->message->reply("**{$this->channelConfig->prefix}{$command}** _{$data["usage"]}_\r\n {$data["description"]}");
+                    } else {
+                                            $this->message->reply("**{$this->channelConfig->prefix}{$command}** \r\n {$data["description"]}");
+                    }
                 }
             }
         } else {

src/Plugins/onMessage/porn.php

Spacing +3 added lines, -3 removed lines

@@ -122,10 +122,10 @@
                 "innie" => "https://api.imgur.com/3/gallery/r/innie/time/all/",
             );
 
-            foreach($categories as $catName => $catURL) {
+            foreach ($categories as $catName => $catURL) {
                 $categoryNames[] = ucfirst($catName);
-                if(strtolower($type) == strtolower($catName)) {
-                    if(is_array($catURL))
+                if (strtolower($type) == strtolower($catName)) {
+                    if (is_array($catURL))
                         $url = $catURL[array_rand($catURL)];
                     else
                         $url = $catURL;

Braces +5 added lines, -4 removed lines

@@ -125,10 +125,11 @@
             foreach($categories as $catName => $catURL) {
                 $categoryNames[] = ucfirst($catName);
                 if(strtolower($type) == strtolower($catName)) {
-                    if(is_array($catURL))
-                        $url = $catURL[array_rand($catURL)];
-                    else
-                        $url = $catURL;
+                    if(is_array($catURL)) {
+                                            $url = $catURL[array_rand($catURL)];
+                    } else {
+                                            $url = $catURL;
+                    }
                 }
             }
 

src/Plugins/onVoice/radio.php

Spacing +4 added lines, -4 removed lines

@@ -85,18 +85,18 @@ 
         $url = "";
 
         // Populate the radioNames, and also get the URL if the person actually defined one
-        foreach($radios as $radioName => $radioURL) {
+        foreach ($radios as $radioName => $radioURL) {
             $radioNames[] = ucfirst($radioName);
             if (strtolower($radioName) == strtolower($radioStation)) {
                 $url = $radioURL;
             }
         }
 
-        if(!$url)
+        if (!$url)
             $message->reply("You can listen to the following radios: " . implode(", ", $radioNames));
 
         if (!empty($url)) {
-            $webSocket->joinVoiceChannel($channel)->then(function (VoiceClient $vc) use ($message, $discord, &$webSocket, $log, &$audioStreams, $channel, $curl, $url) {
+            $webSocket->joinVoiceChannel($channel)->then(function(VoiceClient $vc) use ($message, $discord, &$webSocket, $log, &$audioStreams, $channel, $curl, $url) {
                 $guildID = $message->getChannelAttribute()->guild_id;
 
                 // Add this audio stream to the array of audio streams
@@ -121,7 +121,7 @@ 
                 $audioStreams["eveRadio"][$guildID] = new Process(implode(" ", $params));
                 $audioStreams["eveRadio"][$guildID]->start($webSocket->loop);
 
-                $vc->playRawStream($audioStreams["eveRadio"][$guildID]->stdout)->done(function () use (&$audioStreams, $vc, $guildID) {
+                $vc->playRawStream($audioStreams["eveRadio"][$guildID]->stdout)->done(function() use (&$audioStreams, $vc, $guildID) {
                     $audioStreams["eveRadio"][$guildID]->close();
                     unset($audioStreams[$guildID]);
                     $vc->close();

Braces +3 added lines, -2 removed lines

@@ -92,8 +92,9 @@
             }
         }
 
-        if(!$url)
-            $message->reply("You can listen to the following radios: " . implode(", ", $radioNames));
+        if(!$url) {
+                    $message->reply("You can listen to the following radios: " . implode(", ", $radioNames));
+        }
 
         if (!empty($url)) {
             $webSocket->joinVoiceChannel($channel)->then(function (VoiceClient $vc) use ($message, $discord, &$webSocket, $log, &$audioStreams, $channel, $curl, $url) {

src/Plugins/onVoice/radio90s.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
 {
     public function run(Message $message, Discord $discord, WebSocket $webSocket, Logger $log, &$audioStreams, Channel $channel, cURL $curl)
     {
-        $webSocket->joinVoiceChannel($channel)->then(function (VoiceClient $vc) use ($message, $discord, $webSocket, $log, &$audioStreams, $channel, $curl) {
+        $webSocket->joinVoiceChannel($channel)->then(function(VoiceClient $vc) use ($message, $discord, $webSocket, $log, &$audioStreams, $channel, $curl) {
             $guildID = $message->getChannelAttribute()->guild_id;
 
             // Add this audio stream to the array of audio streams
@@ -28,7 +28,7 @@ 
             $vc->setBitrate(128000);
             $vc->setFrameSize(40);
 
-            $tickQueue = function () use (&$tickQueue, &$vc, &$message, &$channel, &$curl, &$log, &$audioStreams, $guildID) {
+            $tickQueue = function() use (&$tickQueue, &$vc, &$message, &$channel, &$curl, &$log, &$audioStreams, $guildID) {
                 // Get the song we'll be playing this round
                 $data = $this->getSong($curl, $log);
                 $song = $data["songData"];
@@ -37,7 +37,7 @@ 
                 // Do we really want it to spam the origin channel with what song we're playing all the time?
                 //$message->getChannelAttribute()->sendMessage("Now playing **{$song->title}** by **{$song->artist}** in {$channel->name}");
                 $log->addInfo("Now playing **{$song->title}** by **{$song->artist}** in {$channel->name}");
-                $vc->playFile($songFile)->done(function () use (&$tickQueue, $vc, &$log, &$audioStreams, $guildID) {
+                $vc->playFile($songFile)->done(function() use (&$tickQueue, $vc, &$log, &$audioStreams, $guildID) {
                     if (isset($audioStreams[$guildID])) {
                         $log->addInfo("Going to next song..");
                         $vc->stop();

src/Plugins/onVoice/reapers.php

Spacing +3 added lines, -3 removed lines

@@ -14,15 +14,15 @@
 {
     public function run(Message $message, Discord $discord, WebSocket $webSocket, Logger $log, &$audioStreams, Channel $channel, cURL $curl)
     {
-        $webSocket->joinVoiceChannel($channel)->then(function (VoiceClient $vc) use ($message, $discord, $webSocket, $log, &$audioStreams, $channel) {
+        $webSocket->joinVoiceChannel($channel)->then(function(VoiceClient $vc) use ($message, $discord, $webSocket, $log, &$audioStreams, $channel) {
             $guildID = $message->getChannelAttribute()->guild_id;
             // Add this audio stream to the array of audio streams
             $audioStreams[$guildID] = $vc;
-            $vc->setFrameSize(40)->then(function () use ($vc, &$audioStreams, $guildID) {
+            $vc->setFrameSize(40)->then(function() use ($vc, &$audioStreams, $guildID) {
                 $vc->setBitrate(128000);
                 $number = mt_rand(1, 23);
                 $file = __DIR__ . "/../../../sounds/reapers/{$number}.mp3";
-                $vc->playFile($file, 2)->done(function () use ($vc, &$audioStreams, $guildID) {
+                $vc->playFile($file, 2)->done(function() use ($vc, &$audioStreams, $guildID) {
                     unset($audioStreams[$guildID]);
                     $vc->close();
                 });