shibdib / Dramiel

Dramiel.php

Unused Use Statements -2 removed lines

@@ -28,7 +28,6 @@ 
 
 // Setup logger
 use Discord\Discord;
-use Discord\Parts\Channel\Channel;
 
 // More memory allowance
 ini_set('memory_limit', '1024M');
@@ -67,7 +66,6 @@ 
 updateCCPData($logger);
 
 // Init Discord
-use Discord\Parts\Channel\Message;
 use Discord\Parts\User\Game;
 use Discord\WebSockets\Event;
 use Discord\WebSockets\WebSocket;

Spacing +17 added lines, -17 removed lines

@@ -24,7 +24,7 @@ 
  */
 
 // Require the vendor stuff
-require_once __DIR__.'/vendor/autoload.php';
+require_once __DIR__ . '/vendor/autoload.php';
 
 // Setup logger
 use Discord\Discord;
@@ -44,7 +44,7 @@ 
 
 // create a log channel
 $logger = new Logger('Dramiel');
-$logger->pushHandler(new StreamHandler(__DIR__.'/log/dramielLog.log', Logger::DEBUG));
+$logger->pushHandler(new StreamHandler(__DIR__ . '/log/dramielLog.log', Logger::DEBUG));
 $logger->addInfo('Logger Initiated');
 
 global $logger;
@@ -58,7 +58,7 @@ 
 }
 
 // Load the library files (Probably a prettier way to do this that i haven't thought up yet)
-foreach (glob(__DIR__.'/src/lib/*.php') as $lib) {
+foreach (glob(__DIR__ . '/src/lib/*.php') as $lib) {
     require_once $lib;
 }
 
@@ -95,7 +95,7 @@ 
     }
 }
 // Number of plugins loaded
-$logger->info('Loaded: '.count($pluginsT).' background plugins');
+$logger->info('Loaded: ' . count($pluginsT) . ' background plugins');
 
 // Load chat plugins
 $pluginDirs = ['src/plugins/onMessage/*.php'];
@@ -117,47 +117,47 @@ 
 }
 
 // Number of chat plugins loaded
-$logger->addInfo('Loaded: '.count($plugins).' chat plugins');
+$logger->addInfo('Loaded: ' . count($plugins) . ' chat plugins');
 
 $ws = new WebSocket($discord);
 
 $ws->on(
     'ready',
-    function ($discord) use ($ws, $logger, $config, $plugins, $pluginsT) {
+    function($discord) use ($ws, $logger, $config, $plugins, $pluginsT) {
         // In here we can access any of the WebSocket events.
         //
         // There is a list of event constants that you can
         // find here: https://teamreflex.github.io/DiscordPHP/classes/Discord.WebSockets.Event.html
         //
         // We will echo to the console that the WebSocket is ready.
-        $logger->addInfo('Discord WebSocket is ready!'.PHP_EOL);
+        $logger->addInfo('Discord WebSocket is ready!' . PHP_EOL);
         $game = new Game(['name' => $config['bot']['game'], 'url' => null, 'type' => null], true);
         $ws->updatePresence($game, false);
         // $ws->setNickname($config["bot"]["name"]); //not in yet
 
         // Database check
-        $ws->loop->addPeriodicTimer(86400, function () use ($logger) {
+        $ws->loop->addPeriodicTimer(86400, function() use ($logger) {
             updateDramielDB($logger);
             updateCCPData($logger);
         });
 
         // Run the Tick plugins
-        $ws->loop->addPeriodicTimer(1, function () use ($pluginsT) {
+        $ws->loop->addPeriodicTimer(1, function() use ($pluginsT) {
             foreach ($pluginsT as $plugin) {
                 $plugin->tick();
             }
         });
 
         // Mem cleanup every 30 minutes
-        $ws->loop->addPeriodicTimer(1800, function () use ($logger) {
-            $logger->addInfo('Memory in use: '.memory_get_usage() / 1024 / 1024 .'MB');
+        $ws->loop->addPeriodicTimer(1800, function() use ($logger) {
+            $logger->addInfo('Memory in use: ' . memory_get_usage() / 1024 / 1024 . 'MB');
             gc_collect_cycles(); // Collect garbage
-            $logger->addInfo('Memory in use after garbage collection: '.memory_get_usage() / 1024 / 1024 .'MB');
+            $logger->addInfo('Memory in use after garbage collection: ' . memory_get_usage() / 1024 / 1024 . 'MB');
         });
 
         $ws->on(
             Event::MESSAGE_CREATE,
-            function ($message, $discord, $newdiscord) use ($logger, $config, $plugins) {
+            function($message, $discord, $newdiscord) use ($logger, $config, $plugins) {
                 $msgData = [
                     'message' => [
                         'timestamp'         => $message->timestamp,
@@ -186,7 +186,7 @@ 
                             try {
                                 $plugin->onMessage($msgData, $message);
                             } catch (Exception $e) {
-                                $logger->addError('Error: '.$e->getMessage());
+                                $logger->addError('Error: ' . $e->getMessage());
                             }
                         }
                     }
@@ -197,19 +197,19 @@ 
 );
 $ws->on(
     'error',
-    function ($error, $ws) use ($logger) {
+    function($error, $ws) use ($logger) {
         $logger->addError($error);
         exit(1);
     }
 );
 $ws->on(
     'reconnecting',
-    function () use ($logger) {
+    function() use ($logger) {
         $logger->addInfo('Websocket is reconnecting..');
     });
 $ws->on(
     'reconnected',
-    function () use ($logger) {
+    function() use ($logger) {
         $logger->addInfo('Websocket was reconnected..');
     });
 // Now we will run the ReactPHP Event Loop!

src/plugins/onTick/authCheck.php

Unused Use Statements -3 removed lines

@@ -22,10 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-use Discord\Discord;
 use Discord\Parts\Channel\Channel;
-use Discord\Parts\User\User;
-use Discord\WebSockets\Event;
 
 /**
  * Class fileAuthCheck.

Spacing +4 added lines, -4 removed lines

@@ -136,11 +136,11 @@ 
                                 }
 
                                 // Send the info to the channel
-                                $msg = $discordName.' roles have been removed via the auth.';
+                                $msg = $discordName . ' roles have been removed via the auth.';
                                 $channelID = $toDiscordChannel;
                                 $channel = Channel::find($channelID);
                                 $channel->sendMessage($msg, false);
-                                $this->logger->addInfo($discordName." roles ({$role}) have been removed via the auth.");
+                                $this->logger->addInfo($discordName . " roles ({$role}) have been removed via the auth.");
 
                                 $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'";
                                 $conn->query($sql);
@@ -164,11 +164,11 @@ 
                             }
 
                             // Send the info to the channel
-                            $msg = $discordName.' roles have been removed because their name no longer matches their ingame name.';
+                            $msg = $discordName . ' roles have been removed because their name no longer matches their ingame name.';
                             $channelID = $toDiscordChannel;
                             $channel = Channel::find($channelID);
                             $channel->sendMessage($msg, false);
-                            $this->logger->addInfo($discordName.' roles have been removed because their name no longer matches their ingame name.');
+                            $this->logger->addInfo($discordName . ' roles have been removed because their name no longer matches their ingame name.');
 
                             $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'";
                             $conn->query($sql);

config/config.new.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
     ],
 ];
 
-$config['enabledPlugins'] = [ // remove the slashes for the plugins you want
+$config['enabledPlugins'] = [// remove the slashes for the plugins you want
     'about', //info on the bot
     'auth', //sso based auth system
     'authCheck', // checks if users have left corp or alliance

src/plugins/onTick/evemails.php

Spacing +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
                 $sentBy = $mail['senderName'];
                 $title = $mail['title'];
                 $sentDate = $mail['sentDate'];
-                $url = "https://api.eveonline.com/char/MailBodies.xml.aspx?keyID={$keyID}&vCode={$vCode}&characterID={$characterID}&ids=".$mail['messageID'];
+                $url = "https://api.eveonline.com/char/MailBodies.xml.aspx?keyID={$keyID}&vCode={$vCode}&characterID={$characterID}&ids=" . $mail['messageID'];
                 $content = strip_tags(str_replace('<br>', "\n", json_decode(json_encode(simplexml_load_string(downloadData($url), 'SimpleXMLElement', LIBXML_NOCDATA)))->result->rowset->row));
 
                 // Blank Content Check

src/plugins/onTick/twitterOutput.php

Spacing +4 added lines, -4 removed lines

@@ -105,9 +105,9 @@ 
 
                     $this->maxID = max($id, $this->maxID);
 
-                    $url = 'https://twitter.com/'.$screenName[0].'/status/'.$id;
-                    $message = ['message' => $text[0], 'postedAt' => $createdAt[0], 'postedBy' => $postedBy[0], 'screenName' => $screenName[0], 'url' => $url.$id[0]];
-                    $msg = '**@'.$screenName[0].'** ('.$message['postedBy'].') / '.htmlspecialchars_decode($message['message']);
+                    $url = 'https://twitter.com/' . $screenName[0] . '/status/' . $id;
+                    $message = ['message' => $text[0], 'postedAt' => $createdAt[0], 'postedBy' => $postedBy[0], 'screenName' => $screenName[0], 'url' => $url . $id[0]];
+                    $msg = '**@' . $screenName[0] . '** (' . $message['postedBy'] . ') / ' . htmlspecialchars_decode($message['message']);
                     $messages[$id] = $msg;
 
                     $continue = true;
@@ -142,7 +142,7 @@ 
      */
     public function shortenUrl($url)
     {
-        return file_get_contents('http://is.gd/api.php?longurl='.$url);
+        return file_get_contents('http://is.gd/api.php?longurl=' . $url);
     }
 
     /**

src/plugins/onTick/fileReader.php

Spacing +3 added lines, -3 removed lines

@@ -98,7 +98,7 @@ 
                         continue;
                     }
 
-                    $message .= $row.' | ';
+                    $message .= $row . ' | ';
                     usleep(300000);
                 }
 
@@ -107,10 +107,10 @@ 
 
                 foreach ($this->channelConfig as $chanName => $chanConfig) {
                     if ($chanConfig['searchString'] == false) { // If no match was found, and searchString is false, just use that
-                        $message = $chanConfig['textStringPrepend'].' '.$message.' '.$chanConfig['textStringAppend'];
+                        $message = $chanConfig['textStringPrepend'] . ' ' . $message . ' ' . $chanConfig['textStringAppend'];
                         $channelID = $chanConfig['channelID'];
                     } elseif (stristr($message, $chanConfig['searchString'])) {
-                        $message = $chanConfig['textStringPrepend'].' '.$message.' '.$chanConfig['textStringAppend'];
+                        $message = $chanConfig['textStringPrepend'] . ' ' . $message . ' ' . $chanConfig['textStringAppend'];
                         $channelID = $chanConfig['channelID'];
                     }
                 }

src/plugins/onTick/notifications.php

Spacing +2 added lines, -2 removed lines

@@ -432,7 +432,7 @@ 
 
             $this->logger->addInfo("Next Notification Check At: {$cacheTimer} EVE Time");
         } catch (Exception $e) {
-            $this->logger->addInfo('Notification Error: '.$e->getMessage());
+            $this->logger->addInfo('Notification Error: ' . $e->getMessage());
         }
     }
 
@@ -480,7 +480,7 @@ 
                 break;
         }
 
-        return json_decode(downloadData($downloadFrom.$typeID.'/'), true);
+        return json_decode(downloadData($downloadFrom . $typeID . '/'), true);
     }
 
     /**

src/plugins/onMessage/about.php

Spacing +5 added lines, -5 removed lines

@@ -99,14 +99,14 @@ 
             $msg = '```
 Developer: Shibdib (In-game Name: Mr Twinkie)
 
-Current Version: '.$gitRevision['short'].'
-Current Branch: '.$gitBranch."
+Current Version: '.$gitRevision['short'] . '
+Current Branch: '.$gitBranch . "
 Github Repo: https://github.com/shibdib/Dramiel
 
 Statistics:
 Currently on {$this->info['guilds']} different discord servers.
-Up-time: ".$interval->y.' Year(s), '.$interval->m.' Month(s), '.$interval->d.' Days, '.$interval->h.' Hours, '.$interval->i.' Minutes, '.$interval->s.' seconds.
-Memory Usage: ~'.round(memory_get_usage() / 1024 / 1024, 3).'MB```';
+Up-time: " . $interval->y . ' Year(s), ' . $interval->m . ' Month(s), ' . $interval->d . ' Days, ' . $interval->h . ' Hours, ' . $interval->i . ' Minutes, ' . $interval->s . ' seconds.
+Memory Usage: ~'.round(memory_get_usage() / 1024 / 1024, 3) . 'MB```';
             $this->logger->addInfo("Sending about info to {$user}");
             $this->message->reply($msg);
         }
@@ -119,7 +119,7 @@ 
     {
         return [
             'name'        => 'about',
-            'trigger'     => [$this->config['bot']['trigger'].'about'],
+            'trigger'     => [$this->config['bot']['trigger'] . 'about'],
             'information' => "Shows information on the bot, who created it, what library it's using, revision, and other stats. Example: !about",
         ];
     }

src/plugins/onMessage/time.php

Spacing +1 added lines, -1 removed lines

@@ -103,7 +103,7 @@
     {
         return [
             'name'        => 'time',
-            'trigger'     => [$this->config['bot']['trigger'].'time'],
+            'trigger'     => [$this->config['bot']['trigger'] . 'time'],
             'information' => 'This shows the time for various timezones compared to EVE Time. To use simply type <!time>',
         ];
     }