From aeab3352ae28942cdc4163f6484873025fc2cf75 Mon Sep 17 00:00:00 2001 From: wish Date: Sat, 15 Apr 2023 11:19:19 +1000 Subject: [PATCH] rename psn command --- config.json | 4 ++-- server/channelserver/handlers_cast_binary.go | 10 +++++----- server/channelserver/sys_language.go | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config.json b/config.json index c29b0f31e..2a62a3809 100644 --- a/config.json +++ b/config.json @@ -73,9 +73,9 @@ "Enabled": true, "Prefix": "!course" }, { - "Name": "LinkPSN", + "Name": "PSN", "Enabled": true, - "Prefix": "!linkpsn" + "Prefix": "!psn" } ], "Courses": [ diff --git a/server/channelserver/handlers_cast_binary.go b/server/channelserver/handlers_cast_binary.go index 5db1e846f..7c961b5e9 100644 --- a/server/channelserver/handlers_cast_binary.go +++ b/server/channelserver/handlers_cast_binary.go @@ -82,16 +82,16 @@ func sendServerChatMessage(s *Session, message string) { } func parseChatCommand(s *Session, command string) { - if strings.HasPrefix(command, commands["LinkPSN"].Prefix) { - if commands["LinkPSN"].Enabled { + if strings.HasPrefix(command, commands["PSN"].Prefix) { + if commands["PSN"].Enabled { var id string - n, err := fmt.Sscanf(command, fmt.Sprintf("%s %%s", commands["LinkPSN"].Prefix), &id) + n, err := fmt.Sscanf(command, fmt.Sprintf("%s %%s", commands["PSN"].Prefix), &id) if err != nil || n != 1 { - sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandLinkPSNError"], commands["LinkPSN"].Prefix)) + sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandPSNError"], commands["PSN"].Prefix)) } else { _, err = s.server.db.Exec(`UPDATE users u SET psn_id=$1 WHERE u.id=(SELECT c.user_id FROM characters c WHERE c.id=$2)`, id, s.charID) if err == nil { - sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandLinkPSNSuccess"], id)) + sendServerChatMessage(s, fmt.Sprintf(s.server.dict["commandPSNSuccess"], id)) } } } diff --git a/server/channelserver/sys_language.go b/server/channelserver/sys_language.go index 4246a929a..f393c5689 100644 --- a/server/channelserver/sys_language.go +++ b/server/channelserver/sys_language.go @@ -20,8 +20,8 @@ func getLangStrings(s *Server) map[string]string { strings["commandCourseLocked"] = "%sコースはロックされています" strings["commandTeleportError"] = "テレポートコマンドエラー 構文:%s x y" strings["commandTeleportSuccess"] = "%d %dにテレポート" - strings["commandLinkPSNError"] = "PSN連携コマンドエラー 例:%s " - strings["commandLinkPSNSuccess"] = "PSN「%s」が連携されています" + strings["commandPSNError"] = "PSN連携コマンドエラー 例:%s " + strings["commandPSNSuccess"] = "PSN「%s」が連携されています" strings["commandRaviNoCommand"] = "ラヴィコマンドが指定されていません" strings["commandRaviStartSuccess"] = "大討伐を開始します" @@ -70,8 +70,8 @@ func getLangStrings(s *Server) map[string]string { strings["commandCourseLocked"] = "%s Course is locked" strings["commandTeleportError"] = "Error in command. Format: %s x y" strings["commandTeleportSuccess"] = "Teleporting to %d %d" - strings["commandLinkPSNError"] = "Error in command. Format: %s " - strings["commandLinkPSNSuccess"] = "Connected PSN ID: %s" + strings["commandPSNError"] = "Error in command. Format: %s " + strings["commandPSNSuccess"] = "Connected PSN ID: %s" strings["commandRaviNoCommand"] = "No Raviente command specified!" strings["commandRaviStartSuccess"] = "The Great Slaying will begin in a moment"