Configurable messages (#34)

* make hardcoded messages configurable * flip Disconnect/Connect SimpleMessage example * replace if statement with switch
rumblefrog · Apr 15, 2020 · 088dcc3 · 088dcc3
1 parent 848b19a
commit 088dcc3
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 2 deletions.
diff --git a/server/config.toml.example b/server/config.toml.example
@@ -50,3 +50,23 @@ Enabled = false
 
 # The port to run the UI web server on
 Port = 8080
+
+[Messages]
+
+# Format for all events if SimpleMessage is enabled
+EventFormatSimple = "%event%: %data%"
+
+# Map start format if SimpleMessage is enabled
+EventFormatSimpleMapStart = "Map Start: %data%"
+
+# Map end format if SimpleMessage is enabled
+EventFormatSimpleMapEnd = "Map Ended: %data%"
+
+# Player connect format if SimpleMessage is enabled
+EventFormatSimplePlayerConnect = "Player Connected: %data%"
+
+# Player disconnect format if SimpleMessage is enabled
+EventFormatSimplePlayerDisconnect = "Player Disconnected: %data%"
+
+# Player chat format if SimpleMessage is enabled
+EventFormatSimplePlayerChat = "%username%: %message%"
diff --git a/server/config/struct.go b/server/config/struct.go
@@ -25,9 +25,19 @@ type UIConfig struct {
 	Port    int  `toml:"Port"`
 }
 
+type MsgConfig struct {
+	EventFormatSimple                 string `toml:"EventFormatSimple"`
+	EventFormatSimpleMapStart         string `toml:"EventFormatSimpleMapStart"`
+	EventFormatSimpleMapEnd           string `toml:"EventFormatSimpleMapEnd"`
+	EventFormatSimplePlayerConnect    string `toml:"EventFormatSimplePlayerConnect"`
+	EventFormatSimplePlayerDisconnect string `toml:"EventFormatSimplePlayerDisconnect"`
+	EventFormatSimplePlayerChat       string `toml:"EventFormatSimplePlayerChat"`
+}
+
 type Config_t struct {
 	General  GeneralConfig
 	Bot      BotConfig
 	Database DatabaseConfig
 	UI       UIConfig
+	Messages MsgConfig
 }
diff --git a/server/protocol/chat.go b/server/protocol/chat.go
@@ -4,9 +4,11 @@ import (
 	"encoding/binary"
 	"fmt"
 	"time"
+	"strings"
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/rumblefrog/source-chat-relay/server/packet"
+	"github.com/rumblefrog/source-chat-relay/server/config"
 )
 
 type IdentificationType uint8
@@ -83,7 +85,7 @@ func (m *ChatMessage) Marshal() []byte {
 }
 
 func (m *ChatMessage) Plain() string {
-	return m.Username + ": " + m.Message
+	return strings.ReplaceAll(strings.ReplaceAll(config.Config.Messages.EventFormatSimplePlayerChat, "%username%", m.Username), "%message%", m.Message)
 }
 
 func (m *ChatMessage) Embed() *discordgo.MessageEmbed {

diff --git a/server/protocol/event.go b/server/protocol/event.go
@@ -2,9 +2,11 @@ package protocol
 
 import (
 	"time"
+	"strings"
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/rumblefrog/source-chat-relay/server/packet"
+	"github.com/rumblefrog/source-chat-relay/server/config"
 )
 
 type EventMessage struct {
@@ -58,7 +60,20 @@ func (m *EventMessage) Marshal() []byte {
 }
 
 func (m *EventMessage) Plain() string {
-	return m.Event + ": " + m.Data
+
+	switch m.Event {
+	case "Map Start":
+		return strings.ReplaceAll(config.Config.Messages.EventFormatSimpleMapStart, "%data%", m.Data)
+	case "Map Ended":
+		return strings.ReplaceAll(config.Config.Messages.EventFormatSimpleMapEnd, "%data%", m.Data)
+	case "Player Connected":
+		return strings.ReplaceAll(config.Config.Messages.EventFormatSimplePlayerConnect, "%data%", m.Data)
+	case "Player Disconnected":
+		return strings.ReplaceAll(config.Config.Messages.EventFormatSimplePlayerDisconnect, "%data%", m.Data)
+	default:
+		return strings.ReplaceAll(strings.ReplaceAll(config.Config.Messages.EventFormatSimple, "%data%", m.Data), "%event%", m.Event)
+	}
+
 }
 
 func (m *EventMessage) Embed() *discordgo.MessageEmbed {