shibdib / Dramiel

src/lib/eveApi.php

Doc Comments +3 added lines

@@ -440,6 +440,9 @@
  * @return mixed
  */
 ////System name to ID
+/**
+ * @return string
+ */
 function systemID($systemName)
 {
     $logger = new Logger('eveESI');

src/plugins/onMessage/sysInfo.php

Unused Use Statements -2 removed lines

@@ -1,7 +1,5 @@
 <?php
 
-use Discord\Discord;
-
 class sysInfo
 {
 	public $config;

Indentation +114 added lines, -114 removed lines

@@ -4,94 +4,94 @@ 
 
 class sysInfo
 {
-	public $config;
-	public $discord;
-	public $logger;
-	private $excludeChannel;
-	private $message;
-	private $triggers;
-
-	public function init($config, $discord, $logger)
-	{
-		$this->config = $config;
-		$this->discord = $discord;
-		$this->logger = $logger;
-		$this->excludeChannel = $this->config['bot']['restrictedChannels'];
-		$this->triggers[] = $this->config['bot']['trigger'] . 'sys';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'Sys';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'sysinfo';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'system';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'System';
-		$this->triggers[] = $this->config['bot']['trigger'] . 'Sysinfo';
-	}
-
-	public function onMessage($msgData, $message)
-	{
-		$channelID = (int) $msgData['message']['channelID'];
-
-		if(in_array($channelID, $this->excludeChannel, true))
-		{
-			return null;
-		}
-
-		$this->message = $message;
-
-		$message = $msgData['message']['message'];
-		$user = $msgData['message']['from'];
-
-		$data = command($message, $this->information()['trigger'], $this->config['bot']['trigger']);
-		if(isset($data['trigger']))
-		{
-			$messageString = strstr($data['messageString'], '@') ? str_replace('<@', '', str_replace('>', '', $data['messageString'])) : $data['messageString'];
-			if(is_numeric($messageString))
-			{
-				$messageString = dbQueryField('SELECT name FROM usersSeen WHERE id = :id', 'name', array(':id' => $messageString));
-			}
-			$cleanString = urlencode($messageString);
-			$sysID = urlencode(systemID($cleanString));
-
-			//Check if we get a system back, otherwise check for partials
-			if(empty($sysID))
-			{
-				$search = "http://tools.pandemic-legion.pl/api/search/{$cleanString}";
-				$search = json_decode(file_get_contents($search));
-				$tot = 0;
-				$res = array();
-				foreach ($search as $s){
-					if ($s->type == "system"){
-						$tot++;
-						$res[] = $s->name;
-					}
-				}
-				if ($tot == 0){
-					return $this->message->reply('**Error:** no data available');
-				}
-				if ($tot == 1){
-					$sysID = urlencode(systemID($res[0]));
-					if(empty($sysID)){
-						return $this->message->reply('**Error:** no data available');
-					}
-				}
-				if ($tot > 1){
-					$res = implode(", ",$res);
-					return $this->message->reply("**Error:** Did you mean one of these? {$res}");
-				}			
-			}
-
-			$systemDetails = systemDetails($sysID);
-			if (null === $systemDetails)
-			{
-				return $this->message->reply('**Error:** ESI is down. Try again later.');
-			}
-
-			$url = "https://zkillboard.com/api/stats/solarSystemID/{$sysID}/";
-			$json = json_decode(file_get_contents($url));
-
-			$regionID = $json->info->regionID;
-			$regionDetails = regionDetails($regionID);
-			$regionName = $regionDetails['name'];
-
-			$thisMonth = (string)date('Ym');
+    public $config;
+    public $discord;
+    public $logger;
+    private $excludeChannel;
+    private $message;
+    private $triggers;
+
+    public function init($config, $discord, $logger)
+    {
+        $this->config = $config;
+        $this->discord = $discord;
+        $this->logger = $logger;
+        $this->excludeChannel = $this->config['bot']['restrictedChannels'];
+        $this->triggers[] = $this->config['bot']['trigger'] . 'sys';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'Sys';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'sysinfo';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'system';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'System';
+        $this->triggers[] = $this->config['bot']['trigger'] . 'Sysinfo';
+    }
+
+    public function onMessage($msgData, $message)
+    {
+        $channelID = (int) $msgData['message']['channelID'];
+
+        if(in_array($channelID, $this->excludeChannel, true))
+        {
+            return null;
+        }
+
+        $this->message = $message;
+
+        $message = $msgData['message']['message'];
+        $user = $msgData['message']['from'];
+
+        $data = command($message, $this->information()['trigger'], $this->config['bot']['trigger']);
+        if(isset($data['trigger']))
+        {
+            $messageString = strstr($data['messageString'], '@') ? str_replace('<@', '', str_replace('>', '', $data['messageString'])) : $data['messageString'];
+            if(is_numeric($messageString))
+            {
+                $messageString = dbQueryField('SELECT name FROM usersSeen WHERE id = :id', 'name', array(':id' => $messageString));
+            }
+            $cleanString = urlencode($messageString);
+            $sysID = urlencode(systemID($cleanString));
+
+            //Check if we get a system back, otherwise check for partials
+            if(empty($sysID))
+            {
+                $search = "http://tools.pandemic-legion.pl/api/search/{$cleanString}";
+                $search = json_decode(file_get_contents($search));
+                $tot = 0;
+                $res = array();
+                foreach ($search as $s){
+                    if ($s->type == "system"){
+                        $tot++;
+                        $res[] = $s->name;
+                    }
+                }
+                if ($tot == 0){
+                    return $this->message->reply('**Error:** no data available');
+                }
+                if ($tot == 1){
+                    $sysID = urlencode(systemID($res[0]));
+                    if(empty($sysID)){
+                        return $this->message->reply('**Error:** no data available');
+                    }
+                }
+                if ($tot > 1){
+                    $res = implode(", ",$res);
+                    return $this->message->reply("**Error:** Did you mean one of these? {$res}");
+                }			
+            }
+
+            $systemDetails = systemDetails($sysID);
+            if (null === $systemDetails)
+            {
+                return $this->message->reply('**Error:** ESI is down. Try again later.');
+            }
+
+            $url = "https://zkillboard.com/api/stats/solarSystemID/{$sysID}/";
+            $json = json_decode(file_get_contents($url));
+
+            $regionID = $json->info->regionID;
+            $regionDetails = regionDetails($regionID);
+            $regionName = $regionDetails['name'];
+
+            $thisMonth = (string)date('Ym');
             $lastMonth = (string)date('Ym', strtotime('first day of previous month'));
 
             $thisMonthKill = $json->months->$thisMonth->shipsDestroyed;
@@ -101,21 +101,21 @@ 
             $activeKills = $activePVP->kills->count;
             $activeChars = $activePVP->characters->count;
 
-			$sysName = $systemDetails['name'];
-			$secStatus = round($systemDetails['security_status'],2);
+            $sysName = $systemDetails['name'];
+            $secStatus = round($systemDetails['security_status'],2);
 
-			$npc = "https://api.eveonline.com/map/kills.xml.aspx";
-			$npc = new SimpleXMLElement(file_get_contents($npc));
-			foreach($npc->result->rowset->row as $row){
-				if($row->attributes()->solarSystemID == $sysID){
-					$npcKills = $row->attributes()->factionKills;
-					$podKills = $row->attributes()->podKills;
-				}
-			}
+            $npc = "https://api.eveonline.com/map/kills.xml.aspx";
+            $npc = new SimpleXMLElement(file_get_contents($npc));
+            foreach($npc->result->rowset->row as $row){
+                if($row->attributes()->solarSystemID == $sysID){
+                    $npcKills = $row->attributes()->factionKills;
+                    $podKills = $row->attributes()->podKills;
+                }
+            }
 
-			$url = "https://zkillboard.com/system/{$sysID}/";
+            $url = "https://zkillboard.com/system/{$sysID}/";
 
-			$msg = "```Systeminfo
+            $msg = "```Systeminfo
 Name: {$sysName} 
 Region: {$regionName}
 Security: {$secStatus}
@@ -132,18 +132,18 @@ 
 ```
 
 More information: $url";
-			$this->logger->addInfo("sysInfo: Sending system information to {$user}");
-			$this->message->reply($msg);
-		}
-		return null;
-	}
-
-	public function information()
-	{
-		return array(
-			'name' => 'sys',
-			'trigger' => $this->triggers,
-			'information' => 'Returns information for the given system'
-			);
-	}
+            $this->logger->addInfo("sysInfo: Sending system information to {$user}");
+            $this->message->reply($msg);
+        }
+        return null;
+    }
+
+    public function information()
+    {
+        return array(
+            'name' => 'sys',
+            'trigger' => $this->triggers,
+            'information' => 'Returns information for the given system'
+            );
+    }
 }

Spacing +16 added lines, -16 removed lines

@@ -29,7 +29,7 @@ 
 	{
 		$channelID = (int) $msgData['message']['channelID'];
 
-		if(in_array($channelID, $this->excludeChannel, true))
+		if (in_array($channelID, $this->excludeChannel, true))
 		{
 			return null;
 		}
@@ -40,10 +40,10 @@ 
 		$user = $msgData['message']['from'];
 
 		$data = command($message, $this->information()['trigger'], $this->config['bot']['trigger']);
-		if(isset($data['trigger']))
+		if (isset($data['trigger']))
 		{
 			$messageString = strstr($data['messageString'], '@') ? str_replace('<@', '', str_replace('>', '', $data['messageString'])) : $data['messageString'];
-			if(is_numeric($messageString))
+			if (is_numeric($messageString))
 			{
 				$messageString = dbQueryField('SELECT name FROM usersSeen WHERE id = :id', 'name', array(':id' => $messageString));
 			}
@@ -51,29 +51,29 @@ 
 			$sysID = urlencode(systemID($cleanString));
 
 			//Check if we get a system back, otherwise check for partials
-			if(empty($sysID))
+			if (empty($sysID))
 			{
 				$search = "http://tools.pandemic-legion.pl/api/search/{$cleanString}";
 				$search = json_decode(file_get_contents($search));
 				$tot = 0;
 				$res = array();
-				foreach ($search as $s){
-					if ($s->type == "system"){
+				foreach ($search as $s) {
+					if ($s->type == "system") {
 						$tot++;
 						$res[] = $s->name;
 					}
 				}
-				if ($tot == 0){
+				if ($tot == 0) {
 					return $this->message->reply('**Error:** no data available');
 				}
-				if ($tot == 1){
+				if ($tot == 1) {
 					$sysID = urlencode(systemID($res[0]));
-					if(empty($sysID)){
+					if (empty($sysID)) {
 						return $this->message->reply('**Error:** no data available');
 					}
 				}
-				if ($tot > 1){
-					$res = implode(", ",$res);
+				if ($tot > 1) {
+					$res = implode(", ", $res);
 					return $this->message->reply("**Error:** Did you mean one of these? {$res}");
 				}			
 			}
@@ -91,8 +91,8 @@ 
 			$regionDetails = regionDetails($regionID);
 			$regionName = $regionDetails['name'];
 
-			$thisMonth = (string)date('Ym');
-            $lastMonth = (string)date('Ym', strtotime('first day of previous month'));
+			$thisMonth = (string) date('Ym');
+            $lastMonth = (string) date('Ym', strtotime('first day of previous month'));
 
             $thisMonthKill = $json->months->$thisMonth->shipsDestroyed;
             $lastMonthKill = $json->months->$lastMonth->shipsDestroyed;
@@ -102,12 +102,12 @@ 
             $activeChars = $activePVP->characters->count;
 
 			$sysName = $systemDetails['name'];
-			$secStatus = round($systemDetails['security_status'],2);
+			$secStatus = round($systemDetails['security_status'], 2);
 
 			$npc = "https://api.eveonline.com/map/kills.xml.aspx";
 			$npc = new SimpleXMLElement(file_get_contents($npc));
-			foreach($npc->result->rowset->row as $row){
-				if($row->attributes()->solarSystemID == $sysID){
+			foreach ($npc->result->rowset->row as $row) {
+				if ($row->attributes()->solarSystemID == $sysID) {
 					$npcKills = $row->attributes()->factionKills;
 					$podKills = $row->attributes()->podKills;
 				}