From c3b8f4e2a6a9920719d595983e13804645f5de8c Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Sun, 15 Dec 2019 02:05:17 +0100
Subject: [PATCH] Core Festo support

---
 ClanServer/Controllers/Core/Cardmng.cs    | 18 ++++++++++++++++++
 ClanServer/Controllers/Core/Facility.cs   |  8 +++++++-
 ClanServer/Controllers/Core/Message.cs    |  8 +++++++-
 ClanServer/Controllers/Core/Package.cs    |  8 +++++++-
 ClanServer/Controllers/Core/PcbEvent.cs   |  8 +++++++-
 ClanServer/Controllers/Core/PcbTracker.cs |  8 +++++++-
 ClanServer/Controllers/Core/Services.cs   | 20 +++++++++++++++++++-
 ClanServer/Routing/XrpcCallAttribute.cs   |  2 +-
 8 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/ClanServer/Controllers/Core/Cardmng.cs b/ClanServer/Controllers/Core/Cardmng.cs
index cc4372e..fb8e1a9 100644
--- a/ClanServer/Controllers/Core/Cardmng.cs
+++ b/ClanServer/Controllers/Core/Cardmng.cs
@@ -22,6 +22,12 @@ namespace ClanServer.Controllers.Core
             this.ctx = ctx;
         }
 
+        [HttpPost("{model}/cardmng/inquire")]
+        public ActionResult<EamuseXrpcData> Inquire2([FromBody] EamuseXrpcData data)
+        {
+            return Inquire(data);
+        }
+
         [HttpPost, XrpcCall("cardmng.inquire")]
         public ActionResult<EamuseXrpcData> Inquire([FromBody] EamuseXrpcData data)
         {
@@ -54,6 +60,12 @@ namespace ClanServer.Controllers.Core
             return data;
         }
 
+        [HttpPost("{model}/cardmng/authpass")]
+        public Task<ActionResult<EamuseXrpcData>> Authpass2([FromBody] EamuseXrpcData data)
+        {
+            return Authpass(data);
+        }
+
         [HttpPost, XrpcCall("cardmng.authpass")]
         public async Task<ActionResult<EamuseXrpcData>> Authpass([FromBody] EamuseXrpcData data)
         {
@@ -79,6 +91,12 @@ namespace ClanServer.Controllers.Core
             return data;
         }
 
+        [HttpPost("{model}/cardmng/getrefid")]
+        public Task<ActionResult<EamuseXrpcData>> GetRefId2([FromBody] EamuseXrpcData data)
+        {
+            return GetRefId(data);
+        }
+
         [HttpPost, XrpcCall("cardmng.getrefid")]
         public async Task<ActionResult<EamuseXrpcData>> GetRefId([FromBody] EamuseXrpcData data)
         {
diff --git a/ClanServer/Controllers/Core/Facility.cs b/ClanServer/Controllers/Core/Facility.cs
index 723ee4c..e769726 100644
--- a/ClanServer/Controllers/Core/Facility.cs
+++ b/ClanServer/Controllers/Core/Facility.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -15,6 +15,12 @@ namespace ClanServer.Controllers.Core
     [ApiController, Route("core")]
     public class FacilityController : ControllerBase
     {
+        [HttpPost("{model}/facility/get")]
+        public ActionResult<EamuseXrpcData> Get2([FromBody] EamuseXrpcData data)
+        {
+            return Get(data);
+        }
+
         [HttpPost, XrpcCall("facility.get")]
         public ActionResult<EamuseXrpcData> Get([FromBody] EamuseXrpcData data)
         {
diff --git a/ClanServer/Controllers/Core/Message.cs b/ClanServer/Controllers/Core/Message.cs
index ac8eb4f..854e205 100644
--- a/ClanServer/Controllers/Core/Message.cs
+++ b/ClanServer/Controllers/Core/Message.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,6 +13,12 @@ namespace ClanServer.Controllers.Core
     [ApiController, Route("core")]
     public class MessageController : ControllerBase
     {
+        [HttpPost("{model}/message/get")]
+        public ActionResult<EamuseXrpcData> Get2([FromBody] EamuseXrpcData data)
+        {
+            return Get(data);
+        }
+
         [HttpPost, XrpcCall("message.get")]
         public ActionResult<EamuseXrpcData> Get([FromBody] EamuseXrpcData data)
         {
diff --git a/ClanServer/Controllers/Core/Package.cs b/ClanServer/Controllers/Core/Package.cs
index 2e71a1b..6ddeb03 100644
--- a/ClanServer/Controllers/Core/Package.cs
+++ b/ClanServer/Controllers/Core/Package.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,6 +13,12 @@ namespace ClanServer.Controllers.Core
     [ApiController, Route("core")]
     public class PackageController : ControllerBase
     {
+        [HttpPost("{model}/package/list")]
+        public ActionResult<EamuseXrpcData> List2([FromBody] EamuseXrpcData data)
+        {
+            return List(data);
+        }
+
         [HttpPost, XrpcCall("package.list")]
         public ActionResult<EamuseXrpcData> List([FromBody] EamuseXrpcData data)
         {
diff --git a/ClanServer/Controllers/Core/PcbEvent.cs b/ClanServer/Controllers/Core/PcbEvent.cs
index 6b31201..d9eca73 100644
--- a/ClanServer/Controllers/Core/PcbEvent.cs
+++ b/ClanServer/Controllers/Core/PcbEvent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,6 +13,12 @@ namespace ClanServer.Controllers.Core
     [ApiController, Route("core")]
     public class PcbEventController : ControllerBase
     {
+        [HttpPost("{model}/pcbevent/put")]
+        public ActionResult<EamuseXrpcData> Put2([FromBody] EamuseXrpcData data)
+        {
+            return Put(data);
+        }
+
         [HttpPost, XrpcCall("pcbevent.put")]
         public ActionResult<EamuseXrpcData> Put([FromBody] EamuseXrpcData data)
         {
diff --git a/ClanServer/Controllers/Core/PcbTracker.cs b/ClanServer/Controllers/Core/PcbTracker.cs
index 2f33e19..597d89b 100644
--- a/ClanServer/Controllers/Core/PcbTracker.cs
+++ b/ClanServer/Controllers/Core/PcbTracker.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,6 +13,12 @@ namespace ClanServer.Controllers.Core
     [ApiController, Route("core")]
     public class PcbTrackerController : ControllerBase
     {
+        [HttpPost("{model}/pcbtracker/alive")]
+        public ActionResult<EamuseXrpcData> Alive2([FromBody] EamuseXrpcData data, string model)
+        {
+            return Alive(data, model);
+        }
+
         [HttpPost, XrpcCall("pcbtracker.alive")]
         public ActionResult<EamuseXrpcData> Alive([FromBody] EamuseXrpcData data, [FromQuery] string model)
         {
diff --git a/ClanServer/Controllers/Core/Services.cs b/ClanServer/Controllers/Core/Services.cs
index 83271ae..85cc83a 100644
--- a/ClanServer/Controllers/Core/Services.cs
+++ b/ClanServer/Controllers/Core/Services.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,6 +13,12 @@ namespace ClanServer.Controllers.Core
     [ApiController, Route("core")]
     public class ServicesController : ControllerBase
     {
+        [HttpPost("{model}/services/get")]
+        public ActionResult<EamuseXrpcData> Get2([FromBody] EamuseXrpcData data, string model)
+        {
+            return Get(data, model);
+        }
+
         [HttpPost, XrpcCall("services.get")]
         public ActionResult<EamuseXrpcData> Get([FromBody] EamuseXrpcData data, [FromQuery] string model)
         {
@@ -49,6 +55,18 @@ namespace ClanServer.Controllers.Core
 
                 modelUrl = url + "/L44/8";
             }
+            else if (model.StartsWith("L44:J:B:A:2018"))
+            {
+                modelItems = new[]
+                {
+                    "local",
+                    "local2",
+                    "lobby",
+                    "lobby2"
+                };
+
+                modelUrl = url + "/L44/9";
+            }
             else
             {
                 return NotFound();
diff --git a/ClanServer/Routing/XrpcCallAttribute.cs b/ClanServer/Routing/XrpcCallAttribute.cs
index e227b6e..a854ede 100644
--- a/ClanServer/Routing/XrpcCallAttribute.cs
+++ b/ClanServer/Routing/XrpcCallAttribute.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;