From d32d741abf32c309167fe08f5f24be51f41c26d3 Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Sun, 14 Aug 2022 18:09:16 -0700 Subject: [PATCH] Limit chat display names to 30 characters. Closes #1919 --- config/constants.go | 2 ++ core/chat/events.go | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/constants.go b/config/constants.go index 5e860bf57..21c40ea42 100644 --- a/config/constants.go +++ b/config/constants.go @@ -13,6 +13,8 @@ const ( DataDirectory = "data" // EmojiDir is relative to the webroot. EmojiDir = "/img/emoji" + // MaxChatDisplayNameLength is the maximum length of a chat display name. + MaxChatDisplayNameLength = 30 ) var ( diff --git a/core/chat/events.go b/core/chat/events.go index 36467264c..6ea148248 100644 --- a/core/chat/events.go +++ b/core/chat/events.go @@ -6,6 +6,7 @@ import ( "strings" "time" + "github.com/owncast/owncast/config" "github.com/owncast/owncast/core/chat/events" "github.com/owncast/owncast/core/data" "github.com/owncast/owncast/core/user" @@ -25,6 +26,11 @@ func (s *Server) userNameChanged(eventData chatClientEvent) { // Check if name is on the blocklist blocklist := data.GetForbiddenUsernameList() + // Names have a max length + if len(proposedUsername) > config.MaxChatDisplayNameLength { + proposedUsername = proposedUsername[:config.MaxChatDisplayNameLength] + } + for _, blockedName := range blocklist { normalizedName := strings.TrimSpace(blockedName) normalizedName = strings.ToLower(normalizedName) @@ -59,7 +65,7 @@ func (s *Server) userNameChanged(eventData chatClientEvent) { oldName := savedUser.DisplayName // Save the new name - if err := user.ChangeUsername(eventData.client.User.ID, receivedEvent.NewName); err != nil { + if err := user.ChangeUsername(eventData.client.User.ID, proposedUsername); err != nil { log.Errorln("error changing username", err) } @@ -69,7 +75,7 @@ func (s *Server) userNameChanged(eventData chatClientEvent) { eventData.client.User.NameChangedAt = &now // Send chat event letting everyone about about the name change - savedUser.DisplayName = receivedEvent.NewName + savedUser.DisplayName = proposedUsername broadcastEvent := events.NameChangeBroadcast{ Oldname: oldName,