merge 2.2.4 into private fork

.github/dependabot.yml

@@ -0,0 +1,17 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "composer"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "gulp-imagemin*"

.gitignore

@@ -50,7 +50,6 @@ Temporary Items
 .usage
 *.gz
 composer-dev.lock
-package-lock.json
 /conf/
 /node_modules/
 /public/js/vX.X.X/

README.md

@@ -1,8 +1,11 @@
 # ![Pathfinder logo](favicon/favicon-32x32.png "Logo") *PATHFINDER*
+
 #### Mapping tool for [*EVE ONLINE*](https://www.eveonline.com)
 
 This Pathfinder Fork is an attempt to make a community supported fork in the absence of [Exodus4d](https://github.com/exodus4d) that will include bug fixes and be upgraded for any changes to the Eve Online universe.
 
+**For installation please see our [Docker-compose solution](https://github.com/goryn-clade/pathfinder-containers) that includes a detailed guide on how to get up and running.**
+
 If you wish to contribute please join the [Pathfinder Slack](https://join.slack.com/t/pathfinder-eve-online/shared_invite/enQtMzMyOTkyMjczMTA3LWI2NGE1OTY5ODBmNDZlMDY3MDIzYjk5ZTljM2JjZjIwNDRkNzMyMTEwMDUzOGQwM2E3ZjE1NGEwNThlMzYzY2Y).
 
 - Project URL [https://www.pathfinder-w.space](https://www.pathfinder-w.space)

app/Controller/Api/Rest/SystemThera.php

@@ -3,6 +3,7 @@
 
 namespace Exodus4D\Pathfinder\Controller\Api\Rest;
 
+use Exodus4D\Pathfinder\Controller\Ccp\Universe;
 use Exodus4D\Pathfinder\Lib\Config;
 
 class SystemThera extends AbstractRestController {
@@ -35,7 +36,6 @@ public function get(\Base $f3){
      */
     protected function getEveScoutTheraConnections() : array {
         $connectionsData = [];
-
         /**
          * map system data from eveScout response to Pathfinder´s 'system' format
          * @param string $key
@@ -44,17 +44,19 @@ protected function getEveScoutTheraConnections() : array {
          */
         $enrichWithSystemData = function(string $key, array $eveScoutConnection, array &$connectionData) : void {
             $eveScoutSystem = (array)$eveScoutConnection[$key];
+            $universe = new Universe();
+            $staticData = $universe->getSystemData($eveScoutSystem['id']);
+
             $systemData = [
-                'id' => (int)$eveScoutSystem['id'],
-                'name' => (string)$eveScoutSystem['name'],
-                'trueSec' => round((float)$eveScoutSystem['security'], 4)
+                'id' => (int)$staticData->id,
+                'name' => (string)$staticData->name,
+                'system_class' => round((float)$staticData->trueSec, 4),
+                'constellation' => ['id' => (int)$staticData->constellation->id],
+                'region' => [
+                    'id' => (int)$staticData->constellation->region->id,
+                    'name' => (string)$staticData->constellation->region->name
+                ]
             ];
-            if(!empty($eveScoutSystem['constellationID'])){
-                $systemData['constellation'] = ['id' => (int)$eveScoutSystem['constellationID']];
-            }
-            if(!empty($region = (array)$eveScoutSystem['region']) && !empty($region['id'])){
-                $systemData['region'] = ['id' => (int)$region['id'], 'name' => (string)$region['name']];
-            }
             $connectionData[$key] = $systemData;
         };
 
@@ -66,10 +68,14 @@ protected function getEveScoutTheraConnections() : array {
         $enrichWithSignatureData = function(string $key, array $eveScoutConnection, array &$connectionData) : void {
             $eveScoutSignature = (array)$eveScoutConnection[$key];
             $signatureData = [
-                'name' => $eveScoutSignature['name'] ? : null
+                'name' => $eveScoutSignature['name'] ? : null,
+                'short_name' => str_split($eveScoutSignature['name'],3)[0] ? : null
             ];
-            if(!empty($sigType = (array)$eveScoutSignature['type']) && !empty($sigType['name'])){
-                $signatureData['type'] = ['name' => strtoupper((string)$sigType['name'])];
+            if($key == 'sourceSignature' && $eveScoutConnection['wh_exits_outward']) {
+                $signatureData['type'] = ['name' => strtoupper((string)$eveScoutConnection['wh_type'])];
+            }
+            if($key == 'targetSignature' && !$eveScoutConnection['wh_exits_outware']) {
+                $signatureData['type'] = ['name' => strtoupper((string)$eveScoutConnection['wh_type'])];
             }
             $connectionData[$key] = $signatureData;
         };
@@ -81,17 +87,31 @@ protected function getEveScoutTheraConnections() : array {
          */
         $enrichWithWormholeData = function(array $wormholeData, array &$connectionsData) : void {
             $type = [];
-            if($wormholeData['mass'] === 'reduced'){
-                $type[] = 'wh_reduced';
-            }else if($wormholeData['mass'] === 'critical'){
-                $type[] = 'wh_critical';
-            }else{
-                $type[] = 'wh_fresh';
-            }
+            $type[] = 'wh_fresh';
 
-            if($wormholeData['eol'] === 'critical'){
+            if($wormholeData['estimatedEol'] <= 4){
                 $type[] = 'wh_eol';
             }
+            switch($wormholeData['jumpMass']) {
+                case "capital":
+                    $type[] = 'wh_jump_mass_xl';
+                    break;
+                case "xlarge":
+                    $type[] = 'wh_jump_mass_xl';
+                    break;
+                case "large":
+                    $type[] = 'wh_jump_mass_l';
+                    break;
+                case "medium":
+                    $type[] = 'wh_jump_mass_m';
+                    break;
+                case "small":
+                    $type[] = 'wh_jump_mass_s';
+                    break;
+                default:
+                    break;
+            }
+
             $connectionsData['type'] = $type;
             $connectionsData['estimatedEol'] = $wormholeData['estimatedEol'];
         };
@@ -101,7 +121,8 @@ protected function getEveScoutTheraConnections() : array {
             foreach((array)$eveScoutResponse['connections'] as $eveScoutConnection){
                 if(
                     $eveScoutConnection['type'] === 'wormhole' &&
-                    isset($eveScoutConnection['source']) && isset($eveScoutConnection['target'])
+                    isset($eveScoutConnection['source']) && isset($eveScoutConnection['target']) &&
+                    $eveScoutConnection['source']['id'] === 31000005 // Check it's thera and not a turnur connection
                 ){
                     try{
                         $data = [

app/Controller/Api/Setup.php

@@ -338,7 +338,7 @@ protected function setupSystemJumpTable(int $offset = 0, int $length = 0) : arra
                           `system` `sys_inner` ON
                             `sys_inner`.`id` = `stargate`.`destinationSystemId`
                         WHERE
-                          `stargate`.`systemId` = `system`.`id`  
+                          `stargate`.`systemId` = `system`.`id`
                       ) `jumpNodes`
                     FROM
                       `system` INNER JOIN
@@ -350,10 +350,11 @@ protected function setupSystemJumpTable(int $offset = 0, int $length = 0) : arra
                       `constellation`.`regionId` != :regionIdJove3 AND
                       (
                           `system`.`security` = :ns OR
-                          `system`.`security` = :ls OR 
-                          `system`.`security` = :hs
+                          `system`.`security` = :ls OR
+                          `system`.`security` = :hs OR
+                          `system`.`security` = :ts
                       )
-                    HAVING 
+                    HAVING
                         `jumpNodes` IS NOT NULL
                     ";
 
@@ -364,7 +365,7 @@ protected function setupSystemJumpTable(int $offset = 0, int $length = 0) : arra
             ':ns' => '0.0',
             ':ls' => 'L',
             ':hs' => 'H',
-            ':tr' => 'T'
+            ':ts' => 'T'
         ];
 
         if($length){
@@ -423,4 +424,4 @@ protected function setupSystemJumpTable(int $offset = 0, int $length = 0) : arra
         return $info;
     }
 
-}
+}

app/Controller/Api/Universe.php

@@ -25,13 +25,14 @@ public function search(\Base $f3, $params){
         $postData = (array)$f3->get('POST');
         $categories = (array)$postData['categories'];
         $universeNameData = [];
+        $activeCharacter = $this->getCharacter();
 
         if(
             array_key_exists('arg1', $params) &&
             !empty($search = strtolower($params['arg1'])) &&
             !empty($categories)
         ){
-            $universeNameData = Ccp\Universe::searchUniverseNameData($categories, $search);
+            $universeNameData = Ccp\Universe::searchUniverseNameData($categories, $search, $activeCharacter->_id, $activeCharacter->getAccessToken());
         }
 
         echo json_encode($universeNameData);