mirrors/owncast
1
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-11-24 21:59:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Limit chat display names to 30 characters. Closes #1919

Browse source
This commit is contained in:
Gabe Kangas 2022-08-14 18:09:16 -07:00
parent c93d4fca08
commit d32d741abf
No known key found for this signature in database
GPG key ID: 9A56337728BC81EA
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/constants.go
View file

@ -13,6 +13,8 @@ const (
DataDirectory = "data" DataDirectory = "data"
// EmojiDir is relative to the webroot. // EmojiDir is relative to the webroot.
EmojiDir = "/img/emoji" EmojiDir = "/img/emoji"
// MaxChatDisplayNameLength is the maximum length of a chat display name.
MaxChatDisplayNameLength = 30
) )
var ( var (

10
core/chat/events.go
View file

@ -6,6 +6,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/owncast/owncast/config"
"github.com/owncast/owncast/core/chat/events" "github.com/owncast/owncast/core/chat/events"
"github.com/owncast/owncast/core/data" "github.com/owncast/owncast/core/data"
"github.com/owncast/owncast/core/user" "github.com/owncast/owncast/core/user"
@ -25,6 +26,11 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
// Check if name is on the blocklist // Check if name is on the blocklist
blocklist := data.GetForbiddenUsernameList() blocklist := data.GetForbiddenUsernameList()
// Names have a max length
if len(proposedUsername) > config.MaxChatDisplayNameLength {
proposedUsername = proposedUsername[:config.MaxChatDisplayNameLength]
}
for _, blockedName := range blocklist { for _, blockedName := range blocklist {
normalizedName := strings.TrimSpace(blockedName) normalizedName := strings.TrimSpace(blockedName)
normalizedName = strings.ToLower(normalizedName) normalizedName = strings.ToLower(normalizedName)
@ -59,7 +65,7 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
oldName := savedUser.DisplayName oldName := savedUser.DisplayName
// Save the new name // 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) log.Errorln("error changing username", err)
} }
@ -69,7 +75,7 @@ func (s *Server) userNameChanged(eventData chatClientEvent) {
eventData.client.User.NameChangedAt = &now eventData.client.User.NameChangedAt = &now
// Send chat event letting everyone about about the name change // Send chat event letting everyone about about the name change
savedUser.DisplayName = receivedEvent.NewName savedUser.DisplayName = proposedUsername
broadcastEvent := events.NameChangeBroadcast{ broadcastEvent := events.NameChangeBroadcast{
Oldname: oldName, Oldname: oldName,