[MM-57356] Make use of go1.21 features (#26620)

server/public/model/command_autocomplete.go

@@ -8,11 +8,10 @@ import (
 	"net/url"
 	"path"
 	"reflect"
+	"slices"
 	"strings"
 
 	"github.com/pkg/errors"
-
-	"github.com/mattermost/mattermost/server/public/utils"
 )
 
 // AutocompleteArgType describes autocomplete argument type
@@ -235,7 +234,7 @@ func (ad *AutocompleteData) IsValid() error {
 		return errors.New("Command should be lowercase")
 	}
 	roles := []string{SystemAdminRoleId, SystemUserRoleId, ""}
-	if !utils.Contains(roles, ad.RoleID) {
+	if !slices.Contains(roles, ad.RoleID) {
 		return errors.New("Wrong role in the autocomplete data")
 	}
 	if len(ad.Arguments) > 0 && len(ad.SubCommands) > 0 {

server/public/model/report.go

@@ -5,10 +5,9 @@ package model
 
 import (
 	"net/http"
+	"slices"
 	"strconv"
 	"time"
-
-	pUtils "github.com/mattermost/mattermost/server/public/utils"
 )
 
 const (
@@ -137,7 +136,7 @@ func (u *UserReportOptions) IsValid() *AppError {
 	}
 
 	// Validate against the columns we allow sorting for
-	if !pUtils.Contains(UserReportSortColumns, u.SortColumn) {
+	if !slices.Contains(UserReportSortColumns, u.SortColumn) {
 		return NewAppError("UserReportOptions.IsValid", "model.user_report_options.is_valid.invalid_sort_column", nil, "", http.StatusBadRequest)
 	}
 

server/public/model/websocket_message.go

@@ -6,6 +6,7 @@ package model
 import (
 	"encoding/json"
 	"io"
+	"maps"
 	"strconv"
 )
 
@@ -272,7 +273,7 @@ func (ev *WebSocketEvent) Copy() *WebSocketEvent {
 func (ev *WebSocketEvent) DeepCopy() *WebSocketEvent {
 	evCopy := &WebSocketEvent{
 		event:           ev.event,
-		data:            copyMap(ev.data),
+		data:            maps.Clone(ev.data),
 		broadcast:       ev.broadcast.copy(),
 		sequence:        ev.sequence,
 		precomputedJSON: ev.precomputedJSON.copy(),
@@ -280,14 +281,6 @@ func (ev *WebSocketEvent) DeepCopy() *WebSocketEvent {
 	return evCopy
 }
 
-func copyMap[K comparable, V any](m map[K]V) map[K]V {
-	dataCopy := make(map[K]V, len(m))
-	for k, v := range m {
-		dataCopy[k] = v
-	}
-	return dataCopy
-}
-
 func (ev *WebSocketEvent) GetData() map[string]any {
 	return ev.data
 }