Remove set_name it was already moved to RconAPI as set_server_name

MarechJ · May 22, 2024 · 1c32221 · 1c32221
1 parent 8f42a99
commit 1c32221
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 29 deletions.
diff --git a/rcon/api_commands.py b/rcon/api_commands.py
@@ -371,7 +371,7 @@ def set_server_name(self, name: str):
         # TODO: server name won't change until map change
         # but the cache also needs to be cleared, but can't
         # immediately clear or it will just refresh but we
-        # can use a timer
+        # can use a timer or clear the cache on match start
 
         gtx = GTXFtp.from_config()
         gtx.change_server_name(new_name=name)

diff --git a/rcongui/src/components/RconSettings/serverName.js b/rcongui/src/components/RconSettings/serverName.js
@@ -18,10 +18,10 @@ const ServerName = ({ classes }) => {
   }, []);
 
   const save = () => {
-    postData(`${process.env.REACT_APP_API_URL}set_name`, {
+    postData(`${process.env.REACT_APP_API_URL}set_server_name`, {
       name: name,
     })
-      .then((res) => showResponse(res, "set_name", true))
+      .then((res) => showResponse(res, "set_server_name", true))
       .catch(handle_http_errors);
   };
 

diff --git a/rconweb/api/views.py b/rconweb/api/views.py
@@ -21,7 +21,6 @@
 from rcon.api_commands import get_rcon_api
 from rcon.commands import CommandFailedError
 from rcon.discord import send_to_discord_audit
-from rcon.gtx import GTXFtp
 from rcon.types import (
     PublicInfoMapType,
     PublicInfoNameType,
@@ -78,30 +77,6 @@ def set_temp_msg(request, func, name):
     return api_response(failed=failed, error=error, result=None, command=name)
 
 
-@csrf_exempt
-@login_required()
-@permission_required("api.can_change_server_name", raise_exception=True)
-@record_audit
-@require_http_methods(["POST"])
-@require_content_type()
-def set_name(request):
-    data = _get_data(request)
-    failed = False
-    error = None
-    try:
-        # TODO: server name won't change until map change
-        # but the cache also needs to be cleared, but can't
-        # immediately clear or it will just refresh
-        gtx = GTXFtp.from_config()
-        gtx.change_server_name(data["name"])
-    except Exception as e:
-        failed = True
-        error = repr(e)
-    return api_response(
-        failed=failed, error=error, result=None, command="set_server_name"
-    )
-
-
 @csrf_exempt
 @require_http_methods(["GET"])
 def get_version(request):
@@ -846,7 +821,6 @@ def run_raw_command(request):
     ("get_version", get_version),
     ("get_connection_info", get_connection_info),
     ("get_public_info", get_public_info),
-    ("set_name", set_name),
     ("run_raw_command", run_raw_command),
 ]