combine /search into /chats

Author: rfresh2

README.md

@@ -10,7 +10,7 @@ Invite link: [bot.2b2t.vc](https://bot.2b2t.vc)
 * `/liveconnections` -> Configures a live join/leave feed channel in your server
 * `/queue` -> Shows 2b2t's current queue lengths and ETA
 * `/seen` -> When a player was last and first seen on 2b2t
-* `/chats` -> Prints a player's chat history 
+* `/chats` -> Searches chats with filters for player, word, and date
 * `/connections` -> Prints a player's join/leave history 
 * `/deaths` -> Prints a player's death history
 * `/deathsmonth` -> Leaderboard for top deaths in the last 30 days
@@ -24,6 +24,5 @@ Invite link: [bot.2b2t.vc](https://bot.2b2t.vc)
 * `/priodata` -> Dumps a JSON list of all players who currently have priority queue (probably)
 * `/stats` -> Prints a player's stats on 2b2t
 * `/wordcount` -> Counts how many times a word has been seen in chat
-* `/search` -> Searches for chats containing a specific word
 * `/watch` -> DM Notifications on player joins, leaves, deaths, or kills
 * `/watch-guild` -> Discord server channel notifications on player joins, leaves, deaths, or kills

openapi/api.2b2t.vc.openapi.json

@@ -927,12 +927,11 @@
         "operationId": "chats",
         "parameters": [
           {
-            "name": "uuid",
+            "name": "word",
             "in": "query",
             "required": false,
             "schema": {
-              "type": "string",
-              "format": "uuid"
+              "type": "string"
             }
           },
           {
@@ -943,6 +942,15 @@
               "type": "string"
             }
           },
+          {
+            "name": "uuid",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "format": "uuid"
+            }
+          },
           {
             "name": "startDate",
             "in": "query",
@@ -961,6 +969,18 @@
               "format": "date"
             }
           },
+          {
+            "name": "sort",
+            "in": "query",
+            "required": false,
+            "schema": {
+              "type": "string",
+              "enum": [
+                "asc",
+                "desc"
+              ]
+            }
+          },
           {
             "name": "pageSize",
             "in": "query",
@@ -982,20 +1002,20 @@
         ],
         "responses": {
           "200": {
-            "description": "Chat history for given player",
+            "description": "Search for chat messages with optional filters",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ChatsResponse"
+                  "$ref": "#/components/schemas/ChatSearchResponse"
                 }
               }
             }
           },
           "204": {
-            "description": "No data for player"
+            "description": "No data"
           },
           "400": {
-            "description": "Bad request. Either uuid or playerName must be provided."
+            "description": "Bad request.\n\nIf word is provided, it must be between 3 and 50 valid chat characters.\n\nIf uuid or playerName is provided, it must be for a valid and existing account.\n\nIf pageSize is provided, it must be between 1 and 100.\n\nIf startDate and endDate are provided, they must be valid dates in ISO 8601 format, example: \"2022-10-31\".\n"
           }
         }
       }
@@ -1109,90 +1129,6 @@
         }
       }
     },
-    "/chats/search": {
-      "get": {
-        "tags": [
-          "Chats"
-        ],
-        "operationId": "chatSearch",
-        "parameters": [
-          {
-            "name": "word",
-            "in": "query",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "startDate",
-            "in": "query",
-            "required": false,
-            "schema": {
-              "type": "string",
-              "format": "date"
-            }
-          },
-          {
-            "name": "endDate",
-            "in": "query",
-            "required": false,
-            "schema": {
-              "type": "string",
-              "format": "date"
-            }
-          },
-          {
-            "name": "sort",
-            "in": "query",
-            "required": false,
-            "schema": {
-              "type": "string",
-              "enum": [
-                "asc",
-                "desc"
-              ]
-            }
-          },
-          {
-            "name": "pageSize",
-            "in": "query",
-            "required": false,
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            }
-          },
-          {
-            "name": "page",
-            "in": "query",
-            "required": false,
-            "schema": {
-              "type": "integer",
-              "format": "int32"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Find chat messages containing a specific word",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ChatSearchResponse"
-                }
-              }
-            }
-          },
-          "204": {
-            "description": "No data"
-          },
-          "400": {
-            "description": "Bad request."
-          }
-        }
-      }
-    },
     "/bots/month": {
       "get": {
         "tags": [
@@ -1748,25 +1684,13 @@
           }
         }
       },
-      "Chat": {
-        "type": "object",
-        "properties": {
-          "time": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "chat": {
-            "type": "string"
-          }
-        }
-      },
-      "ChatsResponse": {
+      "ChatSearchResponse": {
         "type": "object",
         "properties": {
           "chats": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/Chat"
+              "$ref": "#/components/schemas/PlayerChat"
             }
           },
           "total": {
@@ -1779,26 +1703,6 @@
           }
         }
       },
-      "WordCount": {
-        "type": "object",
-        "properties": {
-          "count": {
-            "type": "integer",
-            "format": "int32"
-          }
-        }
-      },
-      "ChatWindowResponse": {
-        "type": "object",
-        "properties": {
-          "chats": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/PlayerChat"
-            }
-          }
-        }
-      },
       "PlayerChat": {
         "type": "object",
         "properties": {
@@ -1818,22 +1722,23 @@
           }
         }
       },
-      "ChatSearchResponse": {
+      "WordCount": {
+        "type": "object",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "ChatWindowResponse": {
         "type": "object",
         "properties": {
           "chats": {
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/PlayerChat"
             }
-          },
-          "total": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "pageCount": {
-            "type": "integer",
-            "format": "int32"
           }
         }
       },