From f33b4378f1d469b2a95f6691258d2d510b77adc1 Mon Sep 17 00:00:00 2001
From: gsd <mamu@ebal.net>
Date: Tue, 4 Jun 2024 00:42:58 +0300
Subject: [PATCH] report hype v2

---
 .../server/ServerReportController.java        | 36 -------------------
 .../server/ServerUpdaterController.java       | 22 +++++++++++-
 2 files changed, 21 insertions(+), 37 deletions(-)
 delete mode 100644 src/main/java/app/controllers/server/ServerReportController.java

diff --git a/src/main/java/app/controllers/server/ServerReportController.java b/src/main/java/app/controllers/server/ServerReportController.java
deleted file mode 100644
index 66a0435..0000000
--- a/src/main/java/app/controllers/server/ServerReportController.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package app.controllers.server;
-
-import app.annotations.enums.AuthMethod;
-import app.annotations.interfaces.CheckWebAccess;
-import app.entities.report.ReportType;
-import app.services.ProfileService;
-import app.services.db.ReportService;
-import jakarta.servlet.http.HttpServletRequest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("api/external/report")
-public class ServerReportController {
-    private ReportService reportService;
-    private ProfileService profileService;
-
-    @Autowired
-    public ServerReportController(ReportService reportService,
-                                  ProfileService profileService) {
-        this.reportService = reportService;
-        this.profileService = profileService;
-    }
-
-    @PostMapping(value = "/{author_steam64}/{reported_steam64}")
-    @CheckWebAccess(auth_method = AuthMethod.SECRET_KEY)
-    public ResponseEntity sendReport(HttpServletRequest request,
-                                     @PathVariable(required = true) String author_steam64,
-                                     @PathVariable(required = false) String reported_steam64,
-                                     @RequestBody String text) {
-        return ResponseEntity.status(HttpStatus.OK).body(
-                reportService.createReport(ReportType.IN_GAME, profileService.GetProfile(author_steam64, "permition,steam_data"), profileService.GetProfile(reported_steam64, "permition"), text));
-    }
-}
diff --git a/src/main/java/app/controllers/server/ServerUpdaterController.java b/src/main/java/app/controllers/server/ServerUpdaterController.java
index 56171c9..54f3ae2 100644
--- a/src/main/java/app/controllers/server/ServerUpdaterController.java
+++ b/src/main/java/app/controllers/server/ServerUpdaterController.java
@@ -3,7 +3,10 @@ package app.controllers.server;
 import app.annotations.enums.AuthMethod;
 import app.annotations.interfaces.CheckWebAccess;
 import app.entities.Stats;
+import app.entities.report.ReportType;
 import app.entities.server.request.ServerRequestBody;
+import app.services.ProfileService;
+import app.services.db.ReportService;
 import app.websocket.handlers.ServersHandler;
 import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,11 +19,18 @@ import org.springframework.web.bind.annotation.*;
 public class ServerUpdaterController {
     private Stats stats;
     private ServersHandler serversHandler;
+    private ReportService reportService;
+    private ProfileService profileService;
 
     @Autowired
-    public ServerUpdaterController(Stats stats, ServersHandler serversHandler) {
+    public ServerUpdaterController(Stats stats,
+                                   ServersHandler serversHandler,
+                                   ReportService reportService,
+                                   ProfileService profileService) {
         this.stats = stats;
         this.serversHandler = serversHandler;
+        this.reportService = reportService;
+        this.profileService = profileService;
     }
 
     @PostMapping(value = "/{srv}")
@@ -40,4 +50,14 @@ public class ServerUpdaterController {
         serversHandler.pushServer(srv, stats.getServers().get(srv));
         return new ResponseEntity(HttpStatus.OK);
     }
+
+    @PostMapping(value = "/{srv}/report/{author_steam64}/{reported_steam64}")
+    @CheckWebAccess(auth_method = AuthMethod.SECRET_KEY)
+    public ResponseEntity sendReport(HttpServletRequest request,
+                                     @PathVariable(required = true) String author_steam64,
+                                     @PathVariable(required = false) String reported_steam64,
+                                     @RequestBody String text, @PathVariable String srv) {
+        return ResponseEntity.status(HttpStatus.OK).body(
+                reportService.createReport(ReportType.IN_GAME, profileService.GetProfile(author_steam64, "permition,steam_data"), profileService.GetProfile(reported_steam64, "permition"), text));
+    }
 }