diff --git a/model/criteria/operators.go b/model/criteria/operators.go index cb239539d..c41d9f692 100644 --- a/model/criteria/operators.go +++ b/model/criteria/operators.go @@ -1,7 +1,5 @@ package criteria -import "github.com/navidrome/navidrome/log" - // Conjunctions need to implement this interface, to allow Criteria to extract child playlist IDs recursively type conjunction interface { ChildPlaylistIds() []string @@ -192,17 +190,9 @@ func extractPlaylistField(inputRule any, field string) (values []string) { for _, rules := range rule { values = append(values, extractPlaylistField(rules, field)...) } - case InPlaylist: - if value, ok := rule[field].(string); ok { + case InPlaylist, NotInPlaylist: + if value, ok := rule.(Expression).fields()[field].(string); ok { values = append(values, value) - } else { - log.Warn("Playlist field not a string", field) - } - case NotInPlaylist: - if value, ok := rule[field].(string); ok { - values = append(values, value) - } else { - log.Warn("Playlist field not a string", field) } } return