go fix for 1.26

src/authentication.go

@@ -16,7 +16,7 @@ func activatedSystemAuthentication() (err error) {
 		return
 	}
 
-	var defaults = make(map[string]interface{})
+	var defaults = make(map[string]any)
 	defaults["authentication.web"] = false
 	defaults["authentication.pms"] = false
 	defaults["authentication.xml"] = false
@@ -43,7 +43,7 @@ func createFirstUserForAuthentication(username, password string) (token string,
 	token, err = authentication.CheckTheValidityOfTheToken(token)
 	authenticationErr(err)
 
-	var userData = make(map[string]interface{})
+	var userData = make(map[string]any)
 	userData["username"] = username
 	userData["authentication.web"] = true
 	userData["authentication.pms"] = true

src/data.go

@@ -59,7 +59,7 @@ func updateServerSettings(request RequestStruct) (settings SettingsStruct, err e
 				// Leerzeichen aus den Werten entfernen und Formatierung der Uhrzeit überprüfen (0000 - 2359)
 				var newUpdateTimes = make([]string, 0)
 
-				for _, v := range value.([]interface{}) {
+				for _, v := range value.([]any) {
 
 					v = strings.Replace(v.(string), " ", "", -1)
 
@@ -282,8 +282,8 @@ func updateServerSettings(request RequestStruct) (settings SettingsStruct, err e
 // Providerdaten speichern (WebUI)
 func saveFiles(request RequestStruct, fileType string) (err error) {
 
-	var filesMap = make(map[string]interface{})
+	var filesMap = make(map[string]any)
-	var newData = make(map[string]interface{})
+	var newData = make(map[string]any)
 	var indicator string
 	var reloadData = false
 
@@ -305,7 +305,7 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
 	}
 
 	if len(filesMap) == 0 {
-		filesMap = make(map[string]interface{})
+		filesMap = make(map[string]any)
 	}
 
 	for dataID, data := range newData {
@@ -314,15 +314,15 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
 
 			// Neue Providerdatei
 			dataID = indicator + randomString(19)
-			data.(map[string]interface{})["new"] = true
+			data.(map[string]any)["new"] = true
 			filesMap[dataID] = data
 
 		} else {
 
 			// Bereits vorhandene Providerdatei
-			for key, value := range data.(map[string]interface{}) {
+			for key, value := range data.(map[string]any) {
 
-				var oldData = filesMap[dataID].(map[string]interface{})
+				var oldData = filesMap[dataID].(map[string]any)
 				oldData[key] = value
 
 			}
@@ -343,11 +343,11 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
 		}
 
 		// Neue Providerdatei
-		if _, ok := data.(map[string]interface{})["new"]; ok {
+		if _, ok := data.(map[string]any)["new"]; ok {
 
 			reloadData = true
 			err = getProviderData(fileType, dataID)
-			delete(data.(map[string]interface{}), "new")
+			delete(data.(map[string]any), "new")
 
 			if err != nil {
 				delete(filesMap, dataID)
@@ -356,7 +356,7 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
 
 		}
 
-		if _, ok := data.(map[string]interface{})["delete"]; ok {
+		if _, ok := data.(map[string]any)["delete"]; ok {
 
 			deleteLocalProviderFiles(dataID, fileType)
 			reloadData = true
@@ -389,7 +389,7 @@ func saveFiles(request RequestStruct, fileType string) (err error) {
 // Providerdaten manuell aktualisieren (WebUI)
 func updateFile(request RequestStruct, fileType string) (err error) {
 
-	var updateData = make(map[string]interface{})
+	var updateData = make(map[string]any)
 
 	switch fileType {
 
@@ -419,7 +419,7 @@ func updateFile(request RequestStruct, fileType string) (err error) {
 // Providerdaten löschen (WebUI)
 func deleteLocalProviderFiles(dataID, fileType string) {
 
-	var removeData = make(map[string]interface{})
+	var removeData = make(map[string]any)
 	var fileExtension string
 
 	switch fileType {
@@ -448,8 +448,8 @@ func deleteLocalProviderFiles(dataID, fileType string) {
 // Filtereinstellungen speichern (WebUI)
 func saveFilter(request RequestStruct) (settings SettingsStruct, err error) {
 
-	var filterMap = make(map[int64]interface{})
+	var filterMap = make(map[int64]any)
-	var newData = make(map[int64]interface{})
+	var newData = make(map[int64]any)
 	var defaultFilter FilterStruct
 	var newFilter = false
 
@@ -482,15 +482,15 @@ func saveFilter(request RequestStruct) (settings SettingsStruct, err error) {
 		}
 
 		// Filter aktualisieren / löschen
-		for key, value := range data.(map[string]interface{}) {
+		for key, value := range data.(map[string]any) {
 
 			// Filter löschen
-			if _, ok := data.(map[string]interface{})["delete"]; ok {
+			if _, ok := data.(map[string]any)["delete"]; ok {
 				delete(filterMap, dataID)
 				break
 			}
 
-			if filter, ok := data.(map[string]interface{})["filter"].(string); ok {
+			if filter, ok := data.(map[string]any)["filter"].(string); ok {
 
 				if len(filter) == 0 {
 
@@ -504,7 +504,7 @@ func saveFilter(request RequestStruct) (settings SettingsStruct, err error) {
 
 			}
 
-			if oldData, ok := filterMap[dataID].(map[string]interface{}); ok {
+			if oldData, ok := filterMap[dataID].(map[string]any); ok {
 				oldData[key] = value
 			}
 
@@ -597,7 +597,7 @@ func saveUserData(request RequestStruct) (err error) {
 
 	var userData = request.UserData
 
-	var newCredentials = func(userID string, newUserData map[string]interface{}) (err error) {
+	var newCredentials = func(userID string, newUserData map[string]any) (err error) {
 
 		var newUsername, newPassword string
 		if username, ok := newUserData["username"].(string); ok {
@@ -617,7 +617,7 @@ func saveUserData(request RequestStruct) (err error) {
 
 	for userID, newUserData := range userData {
 
-		err = newCredentials(userID, newUserData.(map[string]interface{}))
+		err = newCredentials(userID, newUserData.(map[string]any))
 		if err != nil {
 			return
 		}
@@ -627,16 +627,16 @@ func saveUserData(request RequestStruct) (err error) {
 			return
 		}
 
-		delete(newUserData.(map[string]interface{}), "password")
+		delete(newUserData.(map[string]any), "password")
-		delete(newUserData.(map[string]interface{}), "confirm")
+		delete(newUserData.(map[string]any), "confirm")
 
-		if _, ok := newUserData.(map[string]interface{})["delete"]; ok {
+		if _, ok := newUserData.(map[string]any)["delete"]; ok {
 
 			authentication.RemoveUser(userID)
 
 		} else {
 
-			err = authentication.WriteUserData(userID, newUserData.(map[string]interface{}))
+			err = authentication.WriteUserData(userID, newUserData.(map[string]any))
 			if err != nil {
 				return
 			}
@@ -686,11 +686,11 @@ func saveWizard(request RequestStruct) (nextStep int, err error) {
 
 		case "m3u", "xmltv":
 
-			var filesMap = make(map[string]interface{})
+			var filesMap = make(map[string]any)
-			var data = make(map[string]interface{})
+			var data = make(map[string]any)
 			var indicator, dataID string
 
-			filesMap = make(map[string]interface{})
+			filesMap = make(map[string]any)
 
 			data["type"] = key
 			data["new"] = true
@@ -821,9 +821,9 @@ func buildDatabaseDVR() (err error) {
 
 	System.ScanInProgress = 1
 
-	Data.Streams.All = make([]interface{}, 0, System.UnfilteredChannelLimit)
+	Data.Streams.All = make([]any, 0, System.UnfilteredChannelLimit)
-	Data.Streams.Active = make([]interface{}, 0, System.UnfilteredChannelLimit)
+	Data.Streams.Active = make([]any, 0, System.UnfilteredChannelLimit)
-	Data.Streams.Inactive = make([]interface{}, 0, System.UnfilteredChannelLimit)
+	Data.Streams.Inactive = make([]any, 0, System.UnfilteredChannelLimit)
 	Data.Playlist.M3U.Groups.Text = []string{}
 	Data.Playlist.M3U.Groups.Value = []string{}
 	Data.StreamPreviewUI.Active = []string{}
@@ -844,7 +844,7 @@ func buildDatabaseDVR() (err error) {
 
 		for n, i := range playlistFile {
 
-			var channels []interface{}
+			var channels []any
 			var groupTitle, tvgID, uuid int = 0, 0, 0
 			var keys = []string{"group-title", "tvg-id", "uuid"}
 			var compatibility = make(map[string]int)
@@ -981,7 +981,7 @@ func buildDatabaseDVR() (err error) {
 
 	if len(Data.Streams.Active) == 0 && len(Data.Streams.All) <= System.UnfilteredChannelLimit && len(Settings.Filter) == 0 {
 		Data.Streams.Active = Data.Streams.All
-		Data.Streams.Inactive = make([]interface{}, 0)
+		Data.Streams.Inactive = make([]any, 0)
 
 		Data.StreamPreviewUI.Active = Data.StreamPreviewUI.Inactive
 		Data.StreamPreviewUI.Inactive = []string{}
@@ -1015,7 +1015,7 @@ func buildDatabaseDVR() (err error) {
 func getLocalProviderFiles(fileType string) (localFiles []string) {
 
 	var fileExtension string
-	var dataMap = make(map[string]interface{})
+	var dataMap = make(map[string]any)
 
 	switch fileType {
 
@@ -1043,7 +1043,7 @@ func getLocalProviderFiles(fileType string) (localFiles []string) {
 // Providerparameter anhand von dem Key ausgeben
 func getProviderParameter(id, fileType, key string) (s string) {
 
-	var dataMap = make(map[string]interface{})
+	var dataMap = make(map[string]any)
 
 	switch fileType {
 	case "m3u":
@@ -1056,7 +1056,7 @@ func getProviderParameter(id, fileType, key string) (s string) {
 		dataMap = Settings.Files.XMLTV
 	}
 
-	if data, ok := dataMap[id].(map[string]interface{}); ok {
+	if data, ok := dataMap[id].(map[string]any); ok {
 
 		if v, ok := data[key].(string); ok {
 			s = v
@@ -1074,7 +1074,7 @@ func getProviderParameter(id, fileType, key string) (s string) {
 // Provider Statistiken Kompatibilität aktualisieren
 func setProviderCompatibility(id, fileType string, compatibility map[string]int) {
 
-	var dataMap = make(map[string]interface{})
+	var dataMap = make(map[string]any)
 
 	switch fileType {
 	case "m3u":
@@ -1087,7 +1087,7 @@ func setProviderCompatibility(id, fileType string, compatibility map[string]int)
 		dataMap = Settings.Files.XMLTV
 	}
 
-	if data, ok := dataMap[id].(map[string]interface{}); ok {
+	if data, ok := dataMap[id].(map[string]any); ok {
 
 		data["compatibility"] = compatibility
 

src/hdhr.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 )
 
-func makeInteraceFromHDHR(content []byte, playlistName, id string) (channels []interface{}, err error) {
+func makeInteraceFromHDHR(content []byte, playlistName, id string) (channels []any, err error) {
 
-	var hdhrData []interface{}
+	var hdhrData []any
 
 	err = json.Unmarshal(content, &hdhrData)
 	if err == nil {
@@ -17,7 +17,7 @@ func makeInteraceFromHDHR(content []byte, playlistName, id string) (channels []i
 		for _, d := range hdhrData {
 
 			var channel = make(map[string]string)
-			var data = d.(map[string]interface{})
+			var data = d.(map[string]any)
 
 			channel["group-title"] = playlistName
 			channel["name"] = data["GuideName"].(string)

src/html-build.go

@@ -9,6 +9,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 )
 
 var htmlFolder string
@@ -16,7 +17,7 @@ var goFile string
 var mapName string
 var packageName string
 
-var blankMap = make(map[string]interface{})
+var blankMap = make(map[string]any)
 
 // HTMLInit : Dateipfade festlegen
 // mapName = Name der zu erstellenden map
@@ -68,14 +69,14 @@ func createMapFromFiles(folder string) string {
 		checkErr(err)
 	}
 
-	var content string
+	var content strings.Builder
 
 	for key := range blankMap {
 		var newKey = key
-		content += `  ` + mapName + `["` + newKey + `"` + `] = "` + blankMap[key].(string) + `"` + "\n"
+		content.WriteString(`  ` + mapName + `["` + newKey + `"` + `] = "` + blankMap[key].(string) + `"` + "\n")
 	}
 
-	return content
+	return content.String()
 }
 
 func readFilesToMap(path string, info os.FileInfo, err error) error {

src/internal/authentication/authentication.go

@@ -27,8 +27,8 @@ var database string
 
 var databaseFile = "authentication.json"
 
-var data = make(map[string]interface{})
+var data = make(map[string]any)
-var tokens = make(map[string]interface{})
+var tokens = make(map[string]any)
 
 var initAuthentication = false
 
@@ -133,10 +133,10 @@ func Init(databasePath string, validity int) (err error) {
 	// Check if the database already exists
 	if _, err = os.Stat(database); os.IsNotExist(err) {
 		// Create an empty database
-    var defaults = make(map[string]interface{})
+		var defaults = make(map[string]any)
 		defaults["dbVersion"] = "1.0"
 		defaults["hash"] = "sha256"
-    defaults["users"] = make(map[string]interface{})
+		defaults["users"] = make(map[string]any)
 
 		if saveDatabase(defaults) != nil {
 			return
@@ -160,7 +160,7 @@ func CreateDefaultUser(username, password string) (err error) {
 		return
 	}
 
-  var users = data["users"].(map[string]interface{})
+	var users = data["users"].(map[string]any)
 	// Check if the default user exists
 	if len(users) > 0 {
 		err = createError(001)
@@ -182,7 +182,7 @@ func CreateNewUser(username, password string) (userID string, err error) {
 		return
 	}
 
-  var checkIfTheUserAlreadyExists = func(username string, userData map[string]interface{}) (err error) {
+	var checkIfTheUserAlreadyExists = func(username string, userData map[string]any) (err error) {
 		var salt = userData["_salt"].(string)
 		var loginUsername = userData["_username"].(string)
 
@@ -193,9 +193,9 @@ func CreateNewUser(username, password string) (userID string, err error) {
 		return
 	}
 
-  var users = data["users"].(map[string]interface{})
+	var users = data["users"].(map[string]any)
 	for _, userData := range users {
-    err = checkIfTheUserAlreadyExists(username, userData.(map[string]interface{}))
+		err = checkIfTheUserAlreadyExists(username, userData.(map[string]any))
 		if err != nil {
 			return
 		}
@@ -218,7 +218,7 @@ func UserAuthentication(username, password string) (token string, err error) {
 		return
 	}
 
-  var login = func(username, password string, loginData map[string]interface{}) (err error) {
+	var login = func(username, password string, loginData map[string]any) (err error) {
 		err = createError(010)
 
 		var salt = loginData["_salt"].(string)
@@ -234,9 +234,9 @@ func UserAuthentication(username, password string) (token string, err error) {
 		return
 	}
 
-  var users = data["users"].(map[string]interface{})
+	var users = data["users"].(map[string]any)
 	for id, loginData := range users {
-    err = login(username, password, loginData.(map[string]interface{}))
+		err = login(username, password, loginData.(map[string]any))
 		if err == nil {
 			token = setToken(id, "-")
 			return
@@ -257,8 +257,8 @@ func CheckTheValidityOfTheToken(token string) (newToken string, err error) {
 	err = createError(011)
 
 	if v, ok := tokens[token]; ok {
-    var expires = v.(map[string]interface{})["expires"].(time.Time)
+		var expires = v.(map[string]any)["expires"].(time.Time)
-    var userID = v.(map[string]interface{})["id"].(string)
+		var userID = v.(map[string]any)["id"].(string)
 
 		if expires.Sub(time.Now().Local()) < 0 {
 			return
@@ -286,8 +286,8 @@ func GetUserID(token string) (userID string, err error) {
 	err = createError(002)
 
 	if v, ok := tokens[token]; ok {
-    var expires = v.(map[string]interface{})["expires"].(time.Time)
+		var expires = v.(map[string]any)["expires"].(time.Time)
-    userID = v.(map[string]interface{})["id"].(string)
+		userID = v.(map[string]any)["id"].(string)
 
 		if expires.Sub(time.Now().Local()) < 0 {
 			return
@@ -300,7 +300,7 @@ func GetUserID(token string) (userID string, err error) {
 }
 
 // WriteUserData : save user date
-func WriteUserData(userID string, userData map[string]interface{}) (err error) {
+func WriteUserData(userID string, userData map[string]any) (err error) {
 
 	err = checkInit()
 	if err != nil {
@@ -309,7 +309,7 @@ func WriteUserData(userID string, userData map[string]interface{}) (err error) {
 
 	err = createError(030)
 
-  if v, ok := data["users"].(map[string]interface{})[userID].(map[string]interface{}); ok {
+	if v, ok := data["users"].(map[string]any)[userID].(map[string]any); ok {
 
 		v["data"] = userData
 		err = saveDatabase(data)
@@ -322,7 +322,7 @@ func WriteUserData(userID string, userData map[string]interface{}) (err error) {
 }
 
 // ReadUserData : load user date
-func ReadUserData(userID string) (userData map[string]interface{}, err error) {
+func ReadUserData(userID string) (userData map[string]any, err error) {
 
 	err = checkInit()
 	if err != nil {
@@ -331,8 +331,8 @@ func ReadUserData(userID string) (userData map[string]interface{}, err error) {
 
 	err = createError(031)
 
-  if v, ok := data["users"].(map[string]interface{})[userID].(map[string]interface{}); ok {
+	if v, ok := data["users"].(map[string]any)[userID].(map[string]any); ok {
-    userData = v["data"].(map[string]interface{})
+		userData = v["data"].(map[string]any)
 		err = nil
 
 		return
@@ -351,9 +351,9 @@ func RemoveUser(userID string) (err error) {
 
 	err = createError(032)
 
-  if _, ok := data["users"].(map[string]interface{})[userID]; ok {
+	if _, ok := data["users"].(map[string]any)[userID]; ok {
 
-    delete(data["users"].(map[string]interface{}), userID)
+		delete(data["users"].(map[string]any), userID)
 		err = saveDatabase(data)
 
 		return
@@ -363,13 +363,13 @@ func RemoveUser(userID string) (err error) {
 }
 
 // SetDefaultUserData : set default user data
-func SetDefaultUserData(defaults map[string]interface{}) (err error) {
+func SetDefaultUserData(defaults map[string]any) (err error) {
 
 	allUserData, err := GetAllUserData()
 
 	for _, d := range allUserData {
-    var data = d.(map[string]interface{})["data"].(map[string]interface{})
+		var data = d.(map[string]any)["data"].(map[string]any)
-    var userID = d.(map[string]interface{})["_id"].(string)
+		var userID = d.(map[string]any)["_id"].(string)
 
 		for k, v := range defaults {
 			if _, ok := data[k]; ok {
@@ -392,16 +392,16 @@ func ChangeCredentials(userID, username, password string) (err error) {
 
 	err = createError(032)
 
-  if userData, ok := data["users"].(map[string]interface{})[userID]; ok {
+	if userData, ok := data["users"].(map[string]any)[userID]; ok {
 		//var userData = tmp.(map[string]interface{})
-    var salt = userData.(map[string]interface{})["_salt"].(string)
+		var salt = userData.(map[string]any)["_salt"].(string)
 
 		if len(username) > 0 {
-      userData.(map[string]interface{})["_username"] = SHA256(username, salt)
+			userData.(map[string]any)["_username"] = SHA256(username, salt)
 		}
 
 		if len(password) > 0 {
-      userData.(map[string]interface{})["_password"] = SHA256(password, salt)
+			userData.(map[string]any)["_password"] = SHA256(password, salt)
 		}
 
 		err = saveDatabase(data)
@@ -411,7 +411,7 @@ func ChangeCredentials(userID, username, password string) (err error) {
 }
 
 // GetAllUserData : get all user data
-func GetAllUserData() (allUserData map[string]interface{}, err error) {
+func GetAllUserData() (allUserData map[string]any, err error) {
 
 	err = checkInit()
 	if err != nil {
@@ -419,15 +419,15 @@ func GetAllUserData() (allUserData map[string]interface{}, err error) {
 	}
 
 	if len(data) == 0 {
-    var defaults = make(map[string]interface{})
+		var defaults = make(map[string]any)
 		defaults["dbVersion"] = "1.0"
 		defaults["hash"] = "sha256"
-    defaults["users"] = make(map[string]interface{})
+		defaults["users"] = make(map[string]any)
 		saveDatabase(defaults)
 		data = defaults
 	}
 
-  allUserData = data["users"].(map[string]interface{})
+	allUserData = data["users"].(map[string]any)
 	return
 }
 
@@ -457,7 +457,7 @@ func checkInit() (err error) {
 	return
 }
 
-func saveDatabase(tmpMap interface{}) (err error) {
+func saveDatabase(tmpMap any) (err error) {
 
 	jsonString, err := json.MarshalIndent(tmpMap, "", "  ")
 
@@ -544,15 +544,15 @@ func createError(errCode int) (err error) {
 	return
 }
 
-func defaultsForNewUser(username, password string) map[string]interface{} {
+func defaultsForNewUser(username, password string) map[string]any {
-  var defaults = make(map[string]interface{})
+	var defaults = make(map[string]any)
 	var salt = randomString(saltLength)
 	defaults["_username"] = SHA256(username, salt)
 	defaults["_password"] = SHA256(password, salt)
 	defaults["_salt"] = salt
 	defaults["_id"] = "id-" + randomID(idLength)
 	//defaults["_one.time.token"] = randomString(tokenLength)
-  defaults["data"] = make(map[string]interface{})
+	defaults["data"] = make(map[string]any)
 
 	return defaults
 }
@@ -566,7 +566,7 @@ loopToken:
 		goto loopToken
 	}
 
-  var tmp = make(map[string]interface{})
+	var tmp = make(map[string]any)
 	tmp["id"] = id
 	tmp["expires"] = time.Now().Local().Add(time.Minute * time.Duration(tokenValidity))
 
@@ -575,7 +575,7 @@ loopToken:
 	return
 }
 
-func mapToJSON(tmpMap interface{}) string {
+func mapToJSON(tmpMap any) string {
 	jsonString, err := json.MarshalIndent(tmpMap, "", "  ")
 	if err != nil {
 		return "{}"

src/internal/m3u-parser/m3u-parser_test.go

@@ -44,7 +44,7 @@ func TestStream1(t *testing.T) {
 
 }
 
-func checkStream(streamInterface []interface{}) (err error) {
+func checkStream(streamInterface []any) (err error) {
 
 	for i, s := range streamInterface {
 

src/internal/m3u-parser/xteve_m3uParser.go

@@ -10,7 +10,7 @@ import (
 )
 
 // MakeInterfaceFromM3U :
-func MakeInterfaceFromM3U(byteStream []byte) (allChannels []interface{}, err error) {
+func MakeInterfaceFromM3U(byteStream []byte) (allChannels []any, err error) {
 
 	var content = string(byteStream)
 	var channelName string

src/internal/up2date/client/client.go

@@ -22,7 +22,7 @@ type ClientInfo struct {
 	OS     string `json:"os,required"`
 	URL    string `json:"url,required"`
 
-	Response ServerResponse `json:"response,omitempty"`
+	Response ServerResponse `json:"response"`
 }
 
 // ServerResponse : Response from server after client request

src/m3u.go

@@ -13,7 +13,7 @@ import (
 )
 
 // Playlisten parsen
-func parsePlaylist(filename, fileType string) (channels []interface{}, err error) {
+func parsePlaylist(filename, fileType string) (channels []any, err error) {
 
 	content, err := readByteFromFile(filename)
 	var id = strings.TrimSuffix(getFilenameFromPath(filename), path.Ext(getFilenameFromPath(filename)))
@@ -34,7 +34,7 @@ func parsePlaylist(filename, fileType string) (channels []interface{}, err error
 }
 
 // Streams filtern
-func filterThisStream(s interface{}) (status bool) {
+func filterThisStream(s any) (status bool) {
 
 	status = false
 	var stream = s.(map[string]string)

src/plex_api.go

@@ -202,7 +202,7 @@ func getPlexConfig() (baseURL, token string, ready bool) {
 	return baseURL, token, true
 }
 
-func discoverPlexDVRs(baseURL, token string) (dvrs []map[string]interface{}, err error) {
+func discoverPlexDVRs(baseURL, token string) (dvrs []map[string]any, err error) {
 
 	status, body, err := doPlexRequest("GET", baseURL, "/livetv/dvrs", token)
 	if err != nil {
@@ -214,13 +214,13 @@ func discoverPlexDVRs(baseURL, token string) (dvrs []map[string]interface{}, err
 		return
 	}
 
-	var payload = make(map[string]interface{})
+	var payload = make(map[string]any)
 	err = json.Unmarshal(body, &payload)
 	if err != nil {
 		return
 	}
 
-	mediaContainer, ok := payload["MediaContainer"].(map[string]interface{})
+	mediaContainer, ok := payload["MediaContainer"].(map[string]any)
 	if ok == false {
 		err = errors.New("Plex API response missing MediaContainer")
 		return
@@ -228,7 +228,7 @@ func discoverPlexDVRs(baseURL, token string) (dvrs []map[string]interface{}, err
 
 	for _, key := range []string{"Dvr", "DVR", "Directory", "Metadata"} {
 		if raw, found := mediaContainer[key]; found == true {
-			if list, ok := raw.([]interface{}); ok == true {
+			if list, ok := raw.([]any); ok == true {
 				dvrs = convertToPlexMapSlice(list)
 				if len(dvrs) > 0 {
 					return
@@ -241,12 +241,12 @@ func discoverPlexDVRs(baseURL, token string) (dvrs []map[string]interface{}, err
 	return
 }
 
-func convertToPlexMapSlice(list []interface{}) (dvrs []map[string]interface{}) {
+func convertToPlexMapSlice(list []any) (dvrs []map[string]any) {
 
-	dvrs = make([]map[string]interface{}, 0, len(list))
+	dvrs = make([]map[string]any, 0, len(list))
 
 	for _, item := range list {
-		if dvr, ok := item.(map[string]interface{}); ok == true {
+		if dvr, ok := item.(map[string]any); ok == true {
 			dvrs = append(dvrs, dvr)
 		}
 	}
@@ -254,7 +254,7 @@ func convertToPlexMapSlice(list []interface{}) (dvrs []map[string]interface{}) {
 	return
 }
 
-func getPlexReloadEndpoints(dvr map[string]interface{}) (endpoints []string) {
+func getPlexReloadEndpoints(dvr map[string]any) (endpoints []string) {
 
 	endpoints = make([]string, 0, 6)
 	added := make(map[string]bool)
@@ -291,7 +291,7 @@ func getPlexReloadEndpoints(dvr map[string]interface{}) (endpoints []string) {
 	return
 }
 
-func getPlexMapString(data map[string]interface{}, field string) string {
+func getPlexMapString(data map[string]any, field string) string {
 
 	for key, value := range data {
 		if strings.EqualFold(key, field) == false {

src/provider.go

@@ -17,13 +17,13 @@ func getProviderData(fileType, fileID string) (err error) {
 	var fileExtension, serverFileName string
 	var body = make([]byte, 0)
 	var newProvider = false
-	var dataMap = make(map[string]interface{})
+	var dataMap = make(map[string]any)
 
 	var saveDateFromProvider = func(fileSource, serverFileName, id string, body []byte) (err error) {
 
-		var data = make(map[string]interface{})
+		var data = make(map[string]any)
 
-		if value, ok := dataMap[id].(map[string]interface{}); ok {
+		if value, ok := dataMap[id].(map[string]any); ok {
 			data = value
 		} else {
 			data["id.provider"] = id
@@ -65,7 +65,7 @@ func getProviderData(fileType, fileID string) (err error) {
 					}
 
 				case "compatibility":
-					data[key] = make(map[string]interface{})
+					data[key] = make(map[string]any)
 
 				case "counter.download":
 					data[key] = 0.0
@@ -142,7 +142,7 @@ func getProviderData(fileType, fileID string) (err error) {
 
 	for dataID, d := range dataMap {
 
-		var data = d.(map[string]interface{})
+		var data = d.(map[string]any)
 		var fileSource = data["file.source"].(string)
 		newProvider = false
 
@@ -220,8 +220,8 @@ func getProviderData(fileType, fileID string) (err error) {
 				}
 
 				// Fehler Counter um 1 erhöhen
-				var data = make(map[string]interface{})
+				var data = make(map[string]any)
-				if value, ok := dataMap[dataID].(map[string]interface{}); ok {
+				if value, ok := dataMap[dataID].(map[string]any); ok {
 
 					data = value
 					data["counter.error"] = data["counter.error"].(float64) + 1
@@ -238,9 +238,9 @@ func getProviderData(fileType, fileID string) (err error) {
 		// Berechnen der Fehlerquote
 		if newProvider == false {
 
-			if value, ok := dataMap[dataID].(map[string]interface{}); ok {
+			if value, ok := dataMap[dataID].(map[string]any); ok {
 
-				var data = make(map[string]interface{})
+				var data = make(map[string]any)
 				data = value
 
 				if data["counter.error"].(float64) == 0 {

src/struct-hdhr.go

@@ -47,11 +47,7 @@ type LineupStatus struct {
 }
 
 // Lineup : HDHR Lineup /lineup.json
-type Lineup []interface {
+type Lineup []any
-	//GuideName string `json:"GuideName"`
-	//GuideNumber string `json:"GuideNumber"`
-	//URL         string `json:"URL"`
-}
 
 // LineupStream : HDHR einzelner Stream im Lineup
 type LineupStream struct {

src/struct-system.go

@@ -149,18 +149,18 @@ type DataStruct struct {
 	}
 
 	Streams struct {
-		Active   []interface{}
+		Active   []any
-		All      []interface{}
+		All      []any
-		Inactive []interface{}
+		Inactive []any
 	}
 
 	XMLTV struct {
 		Files   []string
-		Mapping map[string]interface{}
+		Mapping map[string]any
 	}
 
 	XEPG struct {
-		Channels  map[string]interface{}
+		Channels  map[string]any
 		XEPGCount int64
 	}
 }
@@ -278,13 +278,13 @@ type SettingsStruct struct {
 	FileXMLTV         []string `json:"xmltv,omitempty"` // Altes Speichersystem der Provider XML Datei Slice (Wird für die Umwandlung auf das neue benötigt)
 
 	Files struct {
-		HDHR  map[string]interface{} `json:"hdhr"`
+		HDHR  map[string]any `json:"hdhr"`
-		M3U   map[string]interface{} `json:"m3u"`
+		M3U   map[string]any `json:"m3u"`
-		XMLTV map[string]interface{} `json:"xmltv"`
+		XMLTV map[string]any `json:"xmltv"`
 	} `json:"files"`
 
 	FilesUpdate               bool          `json:"files.update"`
-	Filter                    map[int64]interface{} `json:"filter"`
+	Filter                    map[int64]any `json:"filter"`
 	Key                       string        `json:"key,omitempty"`
 	Language                  string        `json:"language"`
 	LogEntriesRAM             int           `json:"log.entries.ram"`

src/struct-webserver.go

@@ -7,10 +7,10 @@ type RequestStruct struct {
 
 	// Benutzer
 	DeleteUser bool           `json:"deleteUser,omitempty"`
-	UserData   map[string]interface{} `json:"userData,omitempty"`
+	UserData   map[string]any `json:"userData,omitempty"`
 
 	// Mapping
-	EpgMapping map[string]interface{} `json:"epgMapping,omitempty"`
+	EpgMapping map[string]any `json:"epgMapping,omitempty"`
 
 	// Restore
 	Base64 string `json:"base64,omitempty"`
@@ -47,20 +47,20 @@ type RequestStruct struct {
 		XteveAutoUpdate          *bool     `json:"xteveAutoUpdate,omitempty"`
 		SchemeM3U                *string   `json:"scheme.m3u,omitempty"`
 		SchemeXML                *string   `json:"scheme.xml,omitempty"`
-	} `json:"settings,omitempty"`
+	} `json:"settings"`
 
 	// Upload Logo
 	Filename string `json:"filename,omitempty"`
 
 	// Filter
-	Filter map[int64]interface{} `json:"filter,omitempty"`
+	Filter map[int64]any `json:"filter,omitempty"`
 
 	// Dateien (M3U, HDHR, XMLTV)
 	Files struct {
-		HDHR  map[string]interface{} `json:"hdhr,omitempty"`
+		HDHR  map[string]any `json:"hdhr,omitempty"`
-		M3U   map[string]interface{} `json:"m3u,omitempty"`
+		M3U   map[string]any `json:"m3u,omitempty"`
-		XMLTV map[string]interface{} `json:"xmltv,omitempty"`
+		XMLTV map[string]any `json:"xmltv,omitempty"`
-	} `json:"files,omitempty"`
+	} `json:"files"`
 
 	// Wizard
 	Wizard struct {
@@ -68,7 +68,7 @@ type RequestStruct struct {
 		M3U       *string `json:"m3u,omitempty"`
 		Tuner     *int    `json:"tuner,omitempty"`
 		XMLTV     *string `json:"xmltv,omitempty"`
-	} `json:"wizard,omitempty"`
+	} `json:"wizard"`
 }
 
 // ResponseStruct : Antworten an den Client (WEB)
@@ -87,7 +87,7 @@ type ResponseStruct struct {
 		Warnings  int    `json:"warnings"`
 		XEPGCount int64  `json:"xepg"`
 		XML       string `json:"xepg-url,required"`
-	} `json:"clientInfo,omitempty"`
+	} `json:"clientInfo"`
 
 	Data struct {
 		Playlist struct {
@@ -116,9 +116,9 @@ type ResponseStruct struct {
 	Settings            SettingsStruct     `json:"settings,required"`
 	Status              bool               `json:"status,required"`
 	Token               string             `json:"token,omitempty"`
-	Users               map[string]interface{} `json:"users,omitempty"`
+	Users               map[string]any     `json:"users,omitempty"`
 	Wizard              int                `json:"wizard,omitempty"`
-	XEPG                map[string]interface{} `json:"xepg,required"`
+	XEPG                map[string]any     `json:"xepg,required"`
 
 	Notification map[string]Notification `json:"notification,omitempty"`
 }

src/system.go

@@ -59,7 +59,7 @@ func createSystemFiles() (err error) {
 		err = checkFile(filename)
 		if err != nil {
 			// Datei existiert nicht, wird jetzt erstellt
-			err = saveMapToJSONFile(filename, make(map[string]interface{}))
+			err = saveMapToJSONFile(filename, make(map[string]any))
 			if err != nil {
 				return
 			}
@@ -98,12 +98,12 @@ func loadSettings() (settings SettingsStruct, err error) {
 	}
 
 	// Deafult Werte setzten
-	var defaults = make(map[string]interface{})
+	var defaults = make(map[string]any)
-	var dataMap = make(map[string]interface{})
+	var dataMap = make(map[string]any)
 
-	dataMap["xmltv"] = make(map[string]interface{})
+	dataMap["xmltv"] = make(map[string]any)
-	dataMap["m3u"] = make(map[string]interface{})
+	dataMap["m3u"] = make(map[string]any)
-	dataMap["hdhr"] = make(map[string]interface{})
+	dataMap["hdhr"] = make(map[string]any)
 
 	defaultFFmpegPath := ""
 	if len(os.Getenv("XTEVE_CONFIG")) > 0 {
@@ -134,7 +134,7 @@ func loadSettings() (settings SettingsStruct, err error) {
 	defaults["vlc.options"] = System.VLC.DefaultOptions
 	defaults["files"] = dataMap
 	defaults["files.update"] = true
-	defaults["filter"] = make(map[string]interface{})
+	defaults["filter"] = make(map[string]any)
 	defaults["git.branch"] = System.Branch
 	defaults["language"] = "en"
 	defaults["log.entries.ram"] = 500

src/toolchain.go

@@ -159,7 +159,6 @@ func searchFileInOS(file string) (path string) {
 	return
 }
 
-//
 func removeChildItems(dir string) error {
 
 	files, err := filepath.Glob(filepath.Join(dir, "*"))
@@ -180,7 +179,7 @@ func removeChildItems(dir string) error {
 }
 
 // JSON
-func mapToJSON(tmpMap interface{}) string {
+func mapToJSON(tmpMap any) string {
 
 	jsonString, err := json.MarshalIndent(tmpMap, "", "  ")
 	if err != nil {
@@ -190,30 +189,30 @@ func mapToJSON(tmpMap interface{}) string {
 	return string(jsonString)
 }
 
-func jsonToMap(content string) map[string]interface{} {
+func jsonToMap(content string) map[string]any {
 
-	var tmpMap = make(map[string]interface{})
+	var tmpMap = make(map[string]any)
 	json.Unmarshal([]byte(content), &tmpMap)
 
 	return (tmpMap)
 }
 
-func jsonToMapInt64(content string) map[int64]interface{} {
+func jsonToMapInt64(content string) map[int64]any {
 
-	var tmpMap = make(map[int64]interface{})
+	var tmpMap = make(map[int64]any)
 	json.Unmarshal([]byte(content), &tmpMap)
 
 	return (tmpMap)
 }
 
-func jsonToInterface(content string) (tmpMap interface{}, err error) {
+func jsonToInterface(content string) (tmpMap any, err error) {
 
 	err = json.Unmarshal([]byte(content), &tmpMap)
 	return
 
 }
 
-func saveMapToJSONFile(file string, tmpMap interface{}) error {
+func saveMapToJSONFile(file string, tmpMap any) error {
 
 	var filename = getPlatformFile(file)
 	jsonString, err := json.MarshalIndent(tmpMap, "", "  ")
@@ -230,7 +229,7 @@ func saveMapToJSONFile(file string, tmpMap interface{}) error {
 	return nil
 }
 
-func loadJSONFileToMap(file string) (tmpMap map[string]interface{}, err error) {
+func loadJSONFileToMap(file string) (tmpMap map[string]any, err error) {
 
 	f, err := os.Open(getPlatformFile(file))
 	defer f.Close()
@@ -360,7 +359,7 @@ func randomString(n int) string {
 	return string(bytes)
 }
 
-func parseTemplate(content string, tmpMap map[string]interface{}) (result string) {
+func parseTemplate(content string, tmpMap map[string]any) (result string) {
 
 	t := template.Must(template.New("template").Parse(content))
 

src/update.go

@@ -192,7 +192,7 @@ checkVersion:
 			}
 
 			// Neuer Filter (WebUI). Alte Filtereinstellungen werden konvertiert
-			if oldFilter, ok := settingsMap["filter"].([]interface{}); ok {
+			if oldFilter, ok := settingsMap["filter"].([]any); ok {
 				var newFilterMap = convertToNewFilter(oldFilter)
 				settingsMap["filter"] = newFilterMap
 
@@ -252,11 +252,11 @@ checkVersion:
 	return
 }
 
-func convertToNewFilter(oldFilter []interface{}) (newFilterMap map[int]interface{}) {
+func convertToNewFilter(oldFilter []any) (newFilterMap map[int]any) {
 
-	newFilterMap = make(map[int]interface{})
+	newFilterMap = make(map[int]any)
 
-	switch reflect.TypeOf(oldFilter).Kind() {
+	switch reflect.TypeFor[[]interface{}]().Kind() {
 
 	case reflect.Slice:
 		s := reflect.ValueOf(oldFilter)
@@ -285,7 +285,7 @@ func setValueForUUID() (err error) {
 
 	for _, c := range xepg {
 
-		var xepgChannel = c.(map[string]interface{})
+		var xepgChannel = c.(map[string]any)
 
 		if uuidKey, ok := xepgChannel["_uuid.key"].(string); ok {
 

src/webUI.go

@@ -1,6 +1,6 @@
 package src
 
-var webUI = make(map[string]interface{})
+var webUI = make(map[string]any)
 
 func loadHTMLMap() {
 	webUI["html/configuration.html"] = "PCFkb2N0eXBlIGh0bWw+CjxodG1sPgogIDxoZWFkPgogICAgPG1ldGEgY2hhcnNldD0idXRmLTgiPgogICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0xLjAiIC8+IAogICAgPHRpdGxlPnhUZVZlPC90aXRsZT4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iY3NzL3NjcmVlbi5jc3MiIHR5cGU9InRleHQvY3NzIj4KICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iY3NzL2Jhc2UuY3NzIiB0eXBlPSJ0ZXh0L2NzcyI+CiAgICA8c2NyaXB0IGxhbmd1YWdlPSJqYXZhc2NyaXB0IiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0ianMvY29uZmlndXJhdGlvbl90cy5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IGxhbmd1YWdlPSJqYXZhc2NyaXB0IiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0ianMvbmV0d29ya190cy5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IGxhbmd1YWdlPSJqYXZhc2NyaXB0IiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0ianMvbWVudV90cy5qcyI+PC9zY3JpcHQ+CiAgICA8c2NyaXB0IGxhbmd1YWdlPSJqYXZhc2NyaXB0IiB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0ianMvc2V0dGluZ3NfdHMuanMiPjwvc2NyaXB0PgogICAgPHNjcmlwdCBsYW5ndWFnZT0iamF2YXNjcmlwdCIgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9ImpzL2Jhc2VfdHMuanMiPjwvc2NyaXB0PgogIDwvaGVhZD4KCiAgICA8Ym9keSBjbGFzcz0iYXV0aC1zY3JlZW4gd2l6YXJkLXNjcmVlbiIgb25sb2FkPSJqYXZhc2NyaXB0OiByZWFkeUZvckNvbmZpZ3VyYXRpb24oMCk7Ij4KICAgICAgICAgIAogICAgICA8ZGl2IGlkPSJsb2FkaW5nIiBjbGFzcz0iYmxvY2siPgogICAgICAgIDxkaXYgY2xhc3M9ImxvYWRlciI+PC9kaXY+CiAgICAgIDwvZGl2PgoKICAgICAgPGRpdiBpZD0iaGVhZGVyIiBjbGFzcz0iaW1nQ2VudGVyIj48L2Rpdj4KICAgICAgPGRpdiBpZD0iYm94Ij4KICAgICAgICAKICAgICAgICA8dGFibGUgaWQ9ImNsaWVudEluZm8iIGNsYXNzPSJ2aXNpYmxlIj4KICAgICAgICAgIDx0cj4KICAgICAgICAgICAgPHRkIGNsYXNzPSJ0ZEtleSI+VmVyc2lvbjo8L3RkPgogICAgICAgICAgICA8dGQgaWQ9InZlcnNpb24iIGNsYXNzPSJ0ZFZhbCI+Jm5ic3A7PC90ZD4KICAgICAgICAgICAgPHRkIGNsYXNzPSJ0ZEtleSI+T1M6PC90ZD4KICAgICAgICAgICAgPHRkIGlkPSJvcyIgY2xhc3M9InRkVmFsIj4mbmJzcDs8L3RkPgogICAgICAgICAgPC90cj4KICAgICAgICAgIDx0cj4KICAgICAgICAgICAgPHRkIGNsYXNzPSJ0ZEtleSI+VVVJRDo8L3RkPgogICAgICAgICAgICA8dGQgaWQ9InV1aWQiIGNsYXNzPSJ0ZFZhbCI+Jm5ic3A7PC90ZD4KICAgICAgICAgICAgPHRkIGNsYXNzPSJ0ZEtleSI+QXJjaDo8L3RkPgogICAgICAgICAgICA8dGQgaWQ9ImFyY2giIGNsYXNzPSJ0ZFZhbCI+Jm5ic3A7PC90ZD4KICAgICAgICAgIDwvdHI+CiAgICAgICAgICA8dHI+CiAgICAgICAgICAgIDx0ZCBjbGFzcz0idGRLZXkiPlN0cmVhbXM6PC90ZD4KICAgICAgICAgICAgPHRkIGlkPSJzdHJlYW1zIiBjbGFzcz0idGRWYWwiPiZuYnNwOzwvdGQ+CiAgICAgICAgICAgIDx0ZCBjbGFzcz0idGRLZXkiPkRWUjo8L3RkPgogICAgICAgICAgICA8dGQgaWQ9IkRWUiIgY2xhc3M9InRkVmFsIj4mbmJzcDs8L3RkPgogICAgICAgICAgPC90cj4KICAgICAgICA8L3RhYmxlPgogICAgICAgIAogICAgICAgIDxkaXYgaWQ9ImhlYWRsaW5lIj4KICAgICAgICAgIDxoMSBpZD0iaGVhZC10ZXh0IiBjbGFzcz0iY2VudGVyIj5Db25maWd1cmF0aW9uPC9oMT4gICAgICAKICAgICAgICA8L2Rpdj4KICAgICAgICA8cCBpZD0iZXJyIiBjbGFzcz0iZXJyb3JNc2cgY2VudGVyIj48L3A+ICAgCiAgICAgICAgPGRpdiBpZD0iY29udGVudCI+CiAgICAgICAgICAgIAogICAgICAgIDwvZGl2PgogICAgICAgIDxkaXYgaWQ9ImJveC1mb290ZXIiPgogICAgICAgICAgPGlucHV0IGlkPSJuZXh0IiBjbGFzcz0iIiB0eXBlPSJidXR0b24iIG5hbWU9Im5leHQiIHZhbHVlPSJOZXh0IiBvbmNsaWNrPSJqYXZhc2NyaXB0OiBzYXZlV2l6YXJkKCk7Ij4KICAgICAgICA8L2Rpdj4KICAgICAgPC9kaXY+CiAgICA8L2JvZHk+CjwvaHRtbD4K"

src/webserver.go

@@ -558,7 +558,7 @@ func WS(w http.ResponseWriter, r *http.Request) {
 		default:
 			fmt.Println("+ + + + + + + + + + +", request.Cmd)
 
-			var requestMap = make(map[string]interface{}) // Debug
+			var requestMap = make(map[string]any) // Debug
 			_ = requestMap
 			if System.Dev == true {
 				fmt.Println(mapToJSON(requestMap))
@@ -591,7 +591,7 @@ func WS(w http.ResponseWriter, r *http.Request) {
 // Web : Web Server /web/
 func Web(w http.ResponseWriter, r *http.Request) {
 
-	var lang = make(map[string]interface{})
+	var lang = make(map[string]any)
 	var err error
 
 	var requestFile = strings.Replace(r.URL.Path, "/web", "html", -1)
@@ -1028,7 +1028,7 @@ func setDefaultResponseData(response ResponseStruct, data bool) (defaults Respon
 
 			defaults.ClientInfo.XEPGCount = Data.XEPG.XEPGCount
 
-			var XEPG = make(map[string]interface{})
+			var XEPG = make(map[string]any)
 
 			if len(Data.Streams.Active) > 0 {
 
@@ -1037,8 +1037,8 @@ func setDefaultResponseData(response ResponseStruct, data bool) (defaults Respon
 
 			} else {
 
-				XEPG["epgMapping"] = make(map[string]interface{})
+				XEPG["epgMapping"] = make(map[string]any)
-				XEPG["xmltvMap"] = make(map[string]interface{})
+				XEPG["xmltvMap"] = make(map[string]any)
 
 			}
 

src/xepg.go

@@ -212,9 +212,9 @@ func updateXEPG(background bool) {
 func createXEPGMapping() {
 
 	Data.XMLTV.Files = getLocalProviderFiles("xmltv")
-	Data.XMLTV.Mapping = make(map[string]interface{})
+	Data.XMLTV.Mapping = make(map[string]any)
 
-	var tmpMap = make(map[string]interface{})
+	var tmpMap = make(map[string]any)
 
 	var friendlyDisplayName = func(channel Channel) (displayName string) {
 		var dn = channel.DisplayName
@@ -255,10 +255,10 @@ func createXEPGMapping() {
 			if err == nil {
 
 				// Daten aus der XML Datei in eine temporäre Map schreiben
-				var xmltvMap = make(map[string]interface{})
+				var xmltvMap = make(map[string]any)
 
 				for _, c := range xmltv.Channel {
-					var channel = make(map[string]interface{})
+					var channel = make(map[string]any)
 
 					channel["id"] = c.ID
 					channel["display-name"] = friendlyDisplayName(*c)
@@ -276,7 +276,7 @@ func createXEPGMapping() {
 		}
 
 		Data.XMLTV.Mapping = tmpMap
-		tmpMap = make(map[string]interface{})
+		tmpMap = make(map[string]any)
 
 	} else {
 
@@ -287,7 +287,7 @@ func createXEPGMapping() {
 	}
 
 	// Auswahl für den Dummy erstellen
-	var dummy = make(map[string]interface{})
+	var dummy = make(map[string]any)
 	var times = []string{"30", "60", "90", "120", "180", "240", "360"}
 
 	for _, i := range times {
@@ -311,7 +311,7 @@ func createXEPGDatabase() (err error) {
 
 	var allChannelNumbers = make([]float64, 0, System.UnfilteredChannelLimit)
 	Data.Cache.Streams.Active = make([]string, 0, System.UnfilteredChannelLimit)
-	Data.XEPG.Channels = make(map[string]interface{}, System.UnfilteredChannelLimit)
+	Data.XEPG.Channels = make(map[string]any, System.UnfilteredChannelLimit)
 
 	Data.XEPG.Channels, err = loadJSONFileToMap(System.File.XEPG)
 	if err != nil {
@@ -554,16 +554,16 @@ func mapping() (err error) {
 
 				for file, xmltvChannels := range Data.XMLTV.Mapping {
 
-					if channel, ok := xmltvChannels.(map[string]interface{})[tvgID]; ok {
+					if channel, ok := xmltvChannels.(map[string]any)[tvgID]; ok {
 
-						if channelID, ok := channel.(map[string]interface{})["id"].(string); ok {
+						if channelID, ok := channel.(map[string]any)["id"].(string); ok {
 
 							xepgChannel.XmltvFile = file
 							xepgChannel.XMapping = channelID
 							xepgChannel.XActive = true
 
 							// Falls in der XMLTV Datei ein Logo existiert, wird dieses verwendet. Falls nicht, dann das Logo aus der M3U Datei
-							if icon, ok := channel.(map[string]interface{})["icon"].(string); ok {
+							if icon, ok := channel.(map[string]any)["icon"].(string); ok {
 								if len(icon) > 0 {
 									xepgChannel.TvgLogo = icon
 								}
@@ -590,9 +590,9 @@ func mapping() (err error) {
 
 			if file != "xTeVe Dummy" {
 
-				if value, ok := Data.XMLTV.Mapping[file].(map[string]interface{}); ok {
+				if value, ok := Data.XMLTV.Mapping[file].(map[string]any); ok {
 
-					if channel, ok := value[mapping].(map[string]interface{}); ok {
+					if channel, ok := value[mapping].(map[string]any); ok {
 
 						// Kanallogo aktualisieren
 						if logo, ok := channel["icon"].(string); ok {
@@ -672,7 +672,7 @@ func createXMLTVFile() (err error) {
 	}
 
 	if len(Data.XMLTV.Files) == 0 && len(Data.Streams.Active) == 0 {
-		Data.XEPG.Channels = make(map[string]interface{})
+		Data.XEPG.Channels = make(map[string]any)
 		return
 	}
 
@@ -844,7 +844,7 @@ func createDummyProgram(xepgChannel XEPGChannelStruct) (dummyXMLTV XMLTV) {
 		return
 	}
 
-	for d := 0; d < 4; d++ {
+	for d := range 4 {
 
 		var epgStartTime = startTime.Add(time.Hour * time.Duration(d*24))