Fixed methods and added Rust and NAVI

Allyans3 · Feb 18, 2021 · aa5c794 · aa5c794
1 parent 77cec89
commit aa5c794
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -27,8 +27,10 @@ Games ID's
 | Game            | Game ID |
 | --------------- | ------- |
 | CS:GO           | csgo    |
+| NAVI            | navi    |
 | DotA2           | dota2   |
 | Team Fortress 2 | tf2     |
+| Rust            | rust    |
 | Life Beyond     | lb      |
 | DMarket         | dmarket |
 | Misc            | misc    |

diff --git a/src/Config/Config.php b/src/Config/Config.php
@@ -6,8 +6,10 @@ class Config
 {
     const GAME = [
         'csgo'        => 'a8db',
+        'navi'        => 'navi',
         'dota2'       => '9a92',
         'tf2'         => 'tf2',
+        'rust'        => 'rust',
         'lb'          => 'life_beyond',
         'dmarket'     => 'ab99',
         'misc'        => '1a42'

diff --git a/src/Requests/GamesList.php b/src/Requests/GamesList.php
@@ -7,11 +7,11 @@
 
 class GamesList extends Request implements RequestInterface
 {
-    const URL = 'https://trading.dmarket.com/exchange/v1/games';
+    const URL = 'https://api.dmarket.com/exchange/v1/games';
 
-    private string $method = 'GET';
+    private $method = 'GET';
 
-    public function getUrl()
+    public function getUrl(): string
     {
         return self::URL;
     }
@@ -21,7 +21,7 @@ public function call($proxy = [])
         return $this->steamHttpRequest($proxy);
     }
 
-    public function getRequestMethod()
+    public function getRequestMethod(): string
     {
         return $this->method;
     }

diff --git a/src/Requests/LastSales.php b/src/Requests/LastSales.php
@@ -8,35 +8,35 @@
 
 class LastSales extends Request implements RequestInterface
 {
-    const URL = 'https://trading.dmarket.com/marketplace-api/v1/last-sales?GameID=%s&Title=%s&Currency=%s';
+    const URL = 'https://api.dmarket.com/marketplace-api/v1/last-sales?Title=%s&GameID=%s&Currency=%s';
 
-    private string $gameId;
-    private string $title = '';
-    private string $currency = 'USD';
-    private string $method = 'GET';
+    private $gameId;
+    private $title = '';
+    private $currency = 'USD';
+    private $method = 'GET';
 
     public function __construct($gameId, $options = [])
     {
         $this->gameId = $gameId;
         $this->setOptions($options);
     }
 
-    public function getUrl()
+    public function getUrl(): string
     {
-        return sprintf(self::URL, $this->gameId, $this->title, $this->currency);
+        return sprintf(self::URL, $this->title,$this->gameId, $this->currency);
     }
 
     public function call($options = [], $proxy = [])
     {
         return $this->setOptions($options)->steamHttpRequest($proxy);
     }
 
-    public function getRequestMethod()
+    public function getRequestMethod(): string
     {
         return $this->method;
     }
 
-    private function setOptions($options)
+    private function setOptions($options): LastSales
     {
         if (isset($options['title'])) {
             $this->title = rawurlencode($options['title']);

diff --git a/src/Requests/MarketItems.php b/src/Requests/MarketItems.php
@@ -7,31 +7,31 @@
 
 class MarketItems extends Request implements RequestInterface
 {
-    const URL = 'https://trading.dmarket.com/exchange/v1/market/items?gameId=%s&title=%s&currency=%s&orderBy=%s&orderDir=%s&priceFrom=%s&priceTo=%s&treeFilters=%s&types=%s&cursor=%s&limit=%s&platform=%s&isLoggedIn=%s';
+    const URL = 'https://api.dmarket.com/exchange/v1/market/items?gameId=%s&title=%s&currency=%s&orderBy=%s&orderDir=%s&priceFrom=%s&priceTo=%s&treeFilters=%s&types=%s&cursor=%s&limit=%s&platform=%s&isLoggedIn=%s';
 
-    private string $gameId;
-    private string $title = '';
-    private string $currency = 'USD';
-    private string $orderBy = 'best_deals';
-    private string $orderDir = 'desc';
-    private int $priceFrom = 0;
-    private int $priceTo = 0;
-    private string $treeFilters = '';
-    private string $types = 'dmarket';
-    private string $cursor = '';
-    private int $limit = 100;
-    private string $platform = 'browser';
-    private bool $isLoggedIn = true;
+    private $gameId;
+    private $title = '';
+    private $currency = 'USD';
+    private $orderBy = 'best_deals';
+    private $orderDir = 'desc';
+    private $priceFrom = 0;
+    private $priceTo = 0;
+    private $treeFilters = '';
+    private $types = 'dmarket';
+    private $cursor = '';
+    private $limit = 100;
+    private $platform = 'browser';
+    private $isLoggedIn = true;
 
-    private string $method = 'GET';
+    private $method = 'GET';
 
     public function __construct($gameId, $options = [])
     {
         $this->gameId = $gameId;
         $this->setOptions($options);
     }
 
-    public function getUrl()
+    public function getUrl(): string
     {
         return sprintf(self::URL, $this->gameId, $this->title, $this->currency, $this->orderBy, $this->orderDir,
             $this->priceFrom, $this->priceTo, $this->treeFilters, $this->types, $this->cursor, $this->limit,
@@ -43,12 +43,12 @@ public function call($options = [], $proxy = [])
         return $this->setOptions($options)->steamHttpRequest($proxy);
     }
 
-    public function getRequestMethod()
+    public function getRequestMethod(): string
     {
         return $this->method;
     }
 
-    private function setOptions($options)
+    private function setOptions($options): MarketItems
     {
         $this->orderBy = $options['orderBy'] ?? $this->orderBy;
         $this->orderDir = $options['orderDir'] ?? $this->orderDir;

diff --git a/src/Requests/SalesHistory.php b/src/Requests/SalesHistory.php
@@ -8,21 +8,21 @@
 
 class SalesHistory extends Request implements RequestInterface
 {
-    const URL = 'https://trading.dmarket.com/marketplace-api/v1/sales-history?GameID=%s&Title=%s&Currency=%s&Period=%s';
+    const URL = 'https://api.dmarket.com/marketplace-api/v1/sales-history?GameID=%s&Title=%s&Currency=%s&Period=%s';
 
-    private string $gameId;
-    private string $title = '';
-    private string $currency = 'USD';
-    private string $period = '7D';
-    private string $method = 'GET';
+    private $gameId;
+    private $title = '';
+    private $currency = 'USD';
+    private $period = '7D';
+    private $method = 'GET';
 
     public function __construct($gameId, $options = [])
     {
         $this->gameId = $gameId;
         $this->setOptions($options);
     }
 
-    public function getUrl()
+    public function getUrl(): string
     {
         return sprintf(self::URL, $this->gameId, $this->title, $this->currency, $this->period);
     }
@@ -32,12 +32,12 @@ public function call($options = [], $proxy = [])
         return $this->setOptions($options)->steamHttpRequest($proxy);
     }
 
-    public function getRequestMethod()
+    public function getRequestMethod(): string
     {
         return $this->method;
     }
 
-    private function setOptions($options)
+    private function setOptions($options): SalesHistory
     {
         if (isset($options['title'])) {
             $this->title = rawurlencode($options['title']);