LogalDeveloper/owncast
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/develop' into webv2

Browse Source
This commit is contained in:
Gabe Kangas
2022-08-15 23:25:08 -07:00
parent 0765f9cfcc 0e470d205a
commit dac42a2da8
7 changed files with 178 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/chat/events.go
View File

@@ -26,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)
@@ -60,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)
}
@@ -70,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,