feat(b): kick/ban will try uid&steam64

zaigie · Feb 27, 2024 · 7d95b6c · 7d95b6c
1 parent 53d6212
commit 7d95b6c
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 3 deletions.
diff --git a/api/player.go b/api/player.go
@@ -127,15 +127,35 @@ func getPlayer(c *gin.Context) {
 //	@Success		200			{object}	SuccessResponse
 //	@Failure		400			{object}	ErrorResponse
 //	@Failure		401			{object}	ErrorResponse
+//	@Failure		404			{object}	ErrorResponse
 //	@Router			/api/player/{player_uid}/kick [post]
 func kickPlayer(c *gin.Context) {
 	playerUid := c.Param("player_uid")
-	if err := tool.KickPlayer(playerUid); err != nil {
+	player, err := service.GetPlayer(database.GetDB(), playerUid)
+	if err != nil {
+		if err == service.ErrNoRecord {
+			c.JSON(http.StatusNotFound, gin.H{"error": "Player not found"})
+			return
+		}
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
+	err = tool.KickPlayer(playerUid)
+	if err != nil {
+		if player.SteamId == "" {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+		err = tool.KickPlayer(player.SteamId)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		} else {
+			c.JSON(http.StatusOK, gin.H{"success": true})
+			return
+		}
+	}
 	c.JSON(http.StatusOK, gin.H{"success": true})
-
 }
 
 // banPlayer godoc
@@ -151,13 +171,34 @@ func kickPlayer(c *gin.Context) {
 //	@Success		200			{object}	SuccessResponse
 //	@Failure		400			{object}	ErrorResponse
 //	@Failure		401			{object}	ErrorResponse
+//	@Failure		404			{object}	ErrorResponse
 //	@Router			/api/player/{player_uid}/ban [post]
 func banPlayer(c *gin.Context) {
 	playerUid := c.Param("player_uid")
-	if err := tool.BanPlayer(playerUid); err != nil {
+	player, err := service.GetPlayer(database.GetDB(), playerUid)
+	if err != nil {
+		if err == service.ErrNoRecord {
+			c.JSON(http.StatusNotFound, gin.H{"error": "Player not found"})
+			return
+		}
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
+	err = tool.BanPlayer(playerUid)
+	if err != nil {
+		if player.SteamId == "" {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+		err = tool.BanPlayer(player.SteamId)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		} else {
+			c.JSON(http.StatusOK, gin.H{"success": true})
+			return
+		}
+	}
 	c.JSON(http.StatusOK, gin.H{"success": true})
 }
 

diff --git a/docs/docs.go b/docs/docs.go
@@ -384,6 +384,12 @@ const docTemplate = `{
                         "schema": {
                             "$ref": "#/definitions/api.ErrorResponse"
                         }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/api.ErrorResponse"
+                        }
                     }
                 }
             }
@@ -433,6 +439,12 @@ const docTemplate = `{
                         "schema": {
                             "$ref": "#/definitions/api.ErrorResponse"
                         }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/api.ErrorResponse"
+                        }
                     }
                 }
             }

diff --git a/docs/swagger.json b/docs/swagger.json
@@ -373,6 +373,12 @@
                         "schema": {
                             "$ref": "#/definitions/api.ErrorResponse"
                         }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/api.ErrorResponse"
+                        }
                     }
                 }
             }
@@ -422,6 +428,12 @@
                         "schema": {
                             "$ref": "#/definitions/api.ErrorResponse"
                         }
+                    },
+                    "404": {
+                        "description": "Not Found",
+                        "schema": {
+                            "$ref": "#/definitions/api.ErrorResponse"
+                        }
                     }
                 }
             }

diff --git a/docs/swagger.yaml b/docs/swagger.yaml
@@ -441,6 +441,10 @@ paths:
           description: Unauthorized
           schema:
             $ref: '#/definitions/api.ErrorResponse'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/api.ErrorResponse'
       security:
       - ApiKeyAuth: []
       summary: Ban Player
@@ -472,6 +476,10 @@ paths:
           description: Unauthorized
           schema:
             $ref: '#/definitions/api.ErrorResponse'
+        "404":
+          description: Not Found
+          schema:
+            $ref: '#/definitions/api.ErrorResponse'
       security:
       - ApiKeyAuth: []
       summary: Kick Player