Merge pull request #156 from universome/fix/xsporta-check-offer

Делаем реальную ставку в check_offer на 1xsporta
universome · Dec 25, 2016 · 2d8b8ee · 2d8b8ee
2 parents 78fa4b8 + f3381bf
commit 2d8b8ee
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 49 deletions.
diff --git a/src/gamblers/cybbet.rs b/src/gamblers/cybbet.rs
@@ -186,7 +186,13 @@ impl Gambler for CybBet {
 
     fn check_offer(&self, offer: &Offer, outcome: &Outcome, stake: Currency) -> Result<bool> {
         let response = try!(self.try_place_bet("/games/checkbet", &offer, &outcome, stake));
-        Ok(response == r#"{"errorExpress":[],"errorSingle":[],"warning":""}"#)
+        let ok = response == r#"{"errorExpress":[],"errorSingle":[],"warning":""}"#;
+
+        if !ok {
+            warn!("Unexpected response in check_offer: {:?}", response);
+        }
+
+        Ok(ok)
     }
 }
 

diff --git a/src/gamblers/vitalbet.rs b/src/gamblers/vitalbet.rs
@@ -216,7 +216,7 @@ impl Gambler for VitalBet {
         let response = try!(self.try_place_bet(event, outcome, Currency(1)));
 
         match response.ErrorMessage {
-            Some(m) => {
+            Some(ref m) => {
                 if m.contains("Minimum allowed stake") {
                     let min_stake = try!(m.as_str()
                         .trim_left_matches("Bet not accepted. Reason: Minimum allowed stake is '$")
@@ -225,6 +225,7 @@ impl Gambler for VitalBet {
 
                     Ok(stake >= Currency::from(min_stake))
                 } else {
+                    warn!("Unexpected response in check_offer: {:?}", response);
                     Ok(false)
                 }
             },

diff --git a/src/gamblers/xsporta.rs b/src/gamblers/xsporta.rs
@@ -25,6 +25,36 @@ impl XBet {
             session: Session::new("1xsporta.space")
         }
     }
+
+    fn try_place_bet(&self, offer: &Offer, outcome: &Outcome, stake: Currency) -> Result<PlaceBetResponse> {
+        let stake: f64 = stake.into();
+        let hash = self.session.get_cookie("uhash").unwrap();
+        let user_id = self.session.get_cookie("ua").unwrap();
+
+        let result = match offer.outcomes.iter().position(|o| o == outcome).unwrap() {
+            0 => 1,
+            1 => 3,
+            2 => 2,
+            _ => return Err(Error::from("Outcome not found in offer"))
+        };
+
+        let path = "/en/dataLineLive/put_bets_common.php";
+        let request_data = PlaceBetRequest {
+            Events: vec![
+                PlaceBetRequestEvent {
+                    GameId: offer.oid as u32,
+                    Coef: outcome.1,
+                    Kind: 3,
+                    Type: result
+                }
+            ],
+            Summ: stake.to_string(),
+            UserId: user_id,
+            hash: hash
+        };
+
+        self.session.request(&path).post(request_data)
+    }
 }
 
 impl Gambler for XBet {
@@ -101,33 +131,7 @@ impl Gambler for XBet {
     }
 
     fn place_bet(&self, offer: Offer, outcome: Outcome, stake: Currency) -> Result<()> {
-        let stake: f64 = stake.into();
-        let hash = self.session.get_cookie("uhash").unwrap();
-        let user_id = self.session.get_cookie("ua").unwrap();
-
-        let result = match offer.outcomes.iter().position(|o| o == &outcome).unwrap() {
-            0 => 1,
-            1 => 3,
-            2 => 2,
-            _ => return Err(Error::from("Outcome not found in offer"))
-        };
-
-        let path = "/en/dataLineLive/put_bets_common.php";
-        let request_data = PlaceBetRequest {
-            Events: vec![
-                PlaceBetRequestEvent {
-                    GameId: offer.oid as u32,
-                    Coef: outcome.1,
-                    Kind: 3,
-                    Type: result
-                }
-            ],
-            Summ: stake.to_string(),
-            UserId: user_id,
-            hash: hash
-        };
-
-        let response: PlaceBetResponse = try!(self.session.request(&path).post(request_data));
+        let response = try!(self.try_place_bet(&offer, &outcome, stake));
 
         if !response.Success {
             return Err(From::from(response.Error));
@@ -136,21 +140,17 @@ impl Gambler for XBet {
         Ok(())
     }
 
-    fn check_offer(&self, offer: &Offer, _: &Outcome, _: Currency) -> Result<bool> {
-        let path = format!("/LineFeed/GetGame?id={}&count=50&cnt=10&lng=en", offer.oid);
-        let message = try!(self.session.request(&path).get::<GetGameResponse>());
+    fn check_offer(&self, offer: &Offer, outcome: &Outcome, stake: Currency) -> Result<bool> {
+        let response = try!(self.try_place_bet(offer, outcome, Currency(1)));
 
-        if !message.Success || message.Value.is_none() {
-            if message.Error.contains("not found") {
-                return Ok(false);
-            } else {
-                return Err(Error::from(message.Error));
-            }
-        }
+        if response.Error.contains("The minimum stake is") {
+            let min_stake = try!(response.Error.as_str()
+                .trim_left_matches("The minimum stake is ")
+                .parse::<f64>());
 
-        if let Some(recent) = grab_offer(message.Value.unwrap()) {
-            Ok(&recent == offer)
+            Ok(stake >= Currency::from(min_stake))
         } else {
+            warn!("Unexpected response in check_offer: {:?}", response);
             Ok(false)
         }
     }
@@ -163,13 +163,6 @@ struct Get1x2Response {
     Value: Vec<Info>
 }
 
-#[derive(Deserialize)]
-struct GetGameResponse {
-    Error: String,
-    Success: bool,
-    Value: Option<Info>
-}
-
 #[derive(Deserialize)]
 struct Info {
     Id: u32,
@@ -204,7 +197,7 @@ struct PlaceBetRequestEvent {
     Type: u32
 }
 
-#[derive(Deserialize)]
+#[derive(Debug, Deserialize)]
 struct PlaceBetResponse {
     Error: String,
     Success: bool