Merge pull request #73 from rubdos/event-compat

ion232 · Oct 14, 2024 · 46dc5ba · 46dc5ba
2 parents d213d8d + 470153f
commit 46dc5ba
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/src/model/board/stream/events.rs b/src/model/board/stream/events.rs
@@ -22,10 +22,18 @@ impl Default for GetRequest {
 
 // Response structs.
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Event {
+    #[serde(flatten)]
+    pub event: EventData,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub compat: Option<Compat>,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(tag = "type")]
 #[serde(rename_all = "camelCase")]
-pub enum Event {
+pub enum EventData {
     Challenge { challenge: ChallengeJson },
     ChallengeCanceled { challenge: ChallengeJson },
     ChallengeDeclined { challenge: ChallengeJson },

diff --git a/src/model/challenges/mod.rs b/src/model/challenges/mod.rs
@@ -102,7 +102,6 @@ pub struct ChallengeJsonBase {
     /// The api docs suggest this is non-nullable,
     /// this is true only if the user does not accept anonymous challengers.
     pub challenger: Option<ChallengeUser>,
-    pub compat: Option<Compat>,
     pub dest_user: Option<ChallengeUser>,
     pub perf: Perf,
     pub rated: bool,

diff --git a/tests/data/response/challenge.json b/tests/data/response/challenge.json
@@ -4,10 +4,6 @@
         "id": "7pGLxJ4F",
         "url": "https://lichess.org/VU0nyvsW",
         "status": "created",
-        "compat": {
-            "bot": false,
-            "board": true
-        },
         "challenger": {
             "id": "lovlas",
             "name": "Lovlas",
@@ -43,5 +39,9 @@
             "icon": "#",
             "name": "Rapid"
         }
+    },
+    "compat": {
+        "bot": false,
+        "board": true
     }
 }
diff --git a/tests/data/response/challenge_anonymous.json b/tests/data/response/challenge_anonymous.json
@@ -4,10 +4,6 @@
     "id": "7pGLxJ4F",
     "url": "https://lichess.org/VU0nyvsW",
     "status": "created",
-    "compat": {
-      "bot": false,
-      "board": true
-    },
     "destUser": {
       "id": "thibot",
       "name": "thibot",

diff --git a/tests/data/response/challenge_canceled.json b/tests/data/response/challenge_canceled.json
@@ -4,10 +4,6 @@
         "id": "7pGLxJ4F",
         "url": "https://lichess.org/VU0nyvsW",
         "status": "created",
-        "compat": {
-            "bot": false,
-            "board": true
-        },
         "challenger": {
             "id": "lovlas",
             "name": "Lovlas",

diff --git a/tests/data/response/challenge_declined.json b/tests/data/response/challenge_declined.json
@@ -4,10 +4,6 @@
         "id": "7pGLxJ4F",
         "url": "https://lichess.org/VU0nyvsW",
         "status": "created",
-        "compat": {
-            "bot": false,
-            "board": true
-        },
         "challenger": {
             "id": "lovlas",
             "name": "Lovlas",