Merge pull request #305 from Lacyway/implement-voice-change

Add voice change route & fix abstract class
project-fika · Jan 9, 2025 · bf34634 · bf34634
2 parents a13f00a + ce2c571
commit bf34634
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 14 deletions.
diff --git a/Fuyu.Backend.BSG/Models/Requests/GameProfileVoiceChangeRequest.cs b/Fuyu.Backend.BSG/Models/Requests/GameProfileVoiceChangeRequest.cs
@@ -0,0 +1,10 @@
+using System.Runtime.Serialization;
+
+namespace Fuyu.Backend.BSG.Models.Requests;
+
+[DataContract]
+public class GameProfileVoiceChangeRequest
+{
+    [DataMember(Name = "voice")]
+    public string Voice { get; set; }
+}
diff --git a/Fuyu.Backend.EFT/Controllers/GetNextFreeSlotController.cs b/Fuyu.Backend.EFT/Controllers/GetNextFreeSlotController.cs
@@ -23,7 +23,7 @@ public class GetNextFreeSlotRequest
 
 // TODO: Delete later
 // -- nexus4880, 2024-11-26
-public class GetNextFreeSlotController : EftHttpController<GetNextFreeSlotRequest>
+public class GetNextFreeSlotController : AbstractEftHttpController<GetNextFreeSlotRequest>
 {
     private readonly EftOrm _eftOrm;
 

diff --git a/Fuyu.Backend.EFT/Controllers/Http/ClientInsuranceItemsListCostController.cs b/Fuyu.Backend.EFT/Controllers/Http/ClientInsuranceItemsListCostController.cs
@@ -11,7 +11,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class ClientInsuranceItemsListCostController : EftHttpController<InsuranceCostRequest>
+public class ClientInsuranceItemsListCostController : AbstractEftHttpController<InsuranceCostRequest>
 {
     private readonly EftOrm _eftOrm;
 

diff --git a/Fuyu.Backend.EFT/Controllers/Http/FuyuGameLoginController.cs b/Fuyu.Backend.EFT/Controllers/Http/FuyuGameLoginController.cs
@@ -7,7 +7,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class FuyuGameLoginController : EftHttpController<FuyuGameLoginRequest>
+public class FuyuGameLoginController : AbstractEftHttpController<FuyuGameLoginRequest>
 {
     private readonly AccountService _accountService;
 

diff --git a/Fuyu.Backend.EFT/Controllers/Http/FuyuGameRegisterController.cs b/Fuyu.Backend.EFT/Controllers/Http/FuyuGameRegisterController.cs
@@ -7,7 +7,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class FuyuGameRegisterController : EftHttpController<FuyuGameRegisterRequest>
+public class FuyuGameRegisterController : AbstractEftHttpController<FuyuGameRegisterRequest>
 {
     private readonly AccountService _accountService;
 

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameBotGenerateController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameBotGenerateController.cs
@@ -8,7 +8,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class GameBotGenerateController : EftHttpController<GameBotGenerateRequest>
+public class GameBotGenerateController : AbstractEftHttpController<GameBotGenerateRequest>
 {
     private readonly BotService _botService;
 

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameModeController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameModeController.cs
@@ -7,7 +7,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class GameModeController : EftHttpController<ClientGameModeRequest>
+public class GameModeController : AbstractEftHttpController<ClientGameModeRequest>
 {
     private readonly EftOrm _eftOrm;
 

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameProfileCreateController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameProfileCreateController.cs
@@ -10,7 +10,7 @@ namespace Fuyu.Backend.EFT.Controllers.Http;
 // TODO:
 // * move code into TemplateTable and ProfileService
 // -- seionmoya, 2024/09/02
-public class GameProfileCreateController : EftHttpController<GameProfileCreateRequest>
+public class GameProfileCreateController : AbstractEftHttpController<GameProfileCreateRequest>
 {
     private readonly EftOrm _eftOrm;
     private readonly ProfileService _profileService;

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameProfileItemsMovingController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameProfileItemsMovingController.cs
@@ -9,7 +9,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class GameProfileItemsMovingController : EftHttpController<JObject>
+public class GameProfileItemsMovingController : AbstractEftHttpController<JObject>
 {
     public ItemEventRouter ItemEventRouter { get; } = new ItemEventRouter();
     private readonly EftOrm _eftOrm;

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameProfileNicknameValidateController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameProfileNicknameValidateController.cs
@@ -6,7 +6,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class GameProfileNicknameValidateController : EftHttpController<GameProfileNicknameValidateRequest>
+public class GameProfileNicknameValidateController : AbstractEftHttpController<GameProfileNicknameValidateRequest>
 {
     public GameProfileNicknameValidateController() : base("/client/game/profile/nickname/validate")
     {

diff --git a/Fuyu.Backend.EFT/Controllers/Http/GameProfileVoiceChangeController.cs b/Fuyu.Backend.EFT/Controllers/Http/GameProfileVoiceChangeController.cs
@@ -0,0 +1,34 @@
+using System.Threading.Tasks;
+using Fuyu.Backend.BSG.Models.Requests;
+using Fuyu.Backend.BSG.Models.Responses;
+using Fuyu.Backend.EFT.Networking;
+using Fuyu.Common.Serialization;
+
+namespace Fuyu.Backend.EFT.Controllers.Http;
+
+public class GameProfileVoiceChangeController : AbstractEftHttpController<GameProfileVoiceChangeRequest>
+{
+    private readonly EftOrm _eftOrm;
+
+    public GameProfileVoiceChangeController() : base("/client/game/profile/voice/change")
+    {
+        _eftOrm = EftOrm.Instance;
+    }
+
+    public override Task RunAsync(EftHttpContext context, GameProfileVoiceChangeRequest body)
+    {
+        var profile = _eftOrm.GetActiveProfile(context.GetSessionId());
+
+        profile.Pmc.Info.Voice = body.Voice;
+
+        // TODO: Save profile
+
+        var response = new ResponseBody<object>()
+        {
+            data = null
+        };
+
+        var text = Json.Stringify(response);
+        return context.SendJsonAsync(text, true, true);
+    }
+}
diff --git a/Fuyu.Backend.EFT/Controllers/Http/MatchLocalEndController.cs b/Fuyu.Backend.EFT/Controllers/Http/MatchLocalEndController.cs
@@ -7,7 +7,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class MatchLocalEndController : EftHttpController<MatchLocalEndRequest>
+public class MatchLocalEndController : AbstractEftHttpController<MatchLocalEndRequest>
 {
     private readonly EftOrm _eftOrm;
 

diff --git a/Fuyu.Backend.EFT/Controllers/Http/MatchLocalStartController.cs b/Fuyu.Backend.EFT/Controllers/Http/MatchLocalStartController.cs
@@ -5,7 +5,7 @@
 
 namespace Fuyu.Backend.EFT.Controllers.Http;
 
-public class MatchLocalStartController : EftHttpController<MatchLocalStartRequest>
+public class MatchLocalStartController : AbstractEftHttpController<MatchLocalStartRequest>
 {
     public MatchLocalStartController() : base("/client/match/local/start")
     {

diff --git a/Fuyu.Backend.EFT/Networking/AbstractEftHttpController.cs b/Fuyu.Backend.EFT/Networking/AbstractEftHttpController.cs
@@ -26,14 +26,14 @@ public override Task RunAsync(HttpContext context)
     public abstract Task RunAsync(EftHttpContext context);
 }
 
-public abstract class EftHttpController<TRequest> : AbstractEftHttpController where TRequest : class
+public abstract class AbstractEftHttpController<TRequest> : AbstractEftHttpController where TRequest : class
 {
-    protected EftHttpController(Regex pattern) : base(pattern)
+    protected AbstractEftHttpController(Regex pattern) : base(pattern)
     {
         // match dynamic paths
     }
 
-    protected EftHttpController(string path) : base(path)
+    protected AbstractEftHttpController(string path) : base(path)
     {
         // match static paths
     }