feat: add exclusions for Ed Sheeran and Jack Harlow in RnB playlist filter

^ Admin Favourites 🎵.NSP

@@ -4,7 +4,7 @@
   "all": [
     {"is": {"loved": true}}
   ],
-  "sort": "dateModified",
+  "sort": "dateLoved",
   "order": "desc",
   "limit": 1000
 }

^ Admin Favs - Country🎵.NSP

@@ -8,7 +8,7 @@
     {"notContains": {"genre": "Christmas Music"}},
     {"is": {"loved": true}}
   ],
-  "sort": "dateModified",
+  "sort": "dateLoved",
   "order": "desc",
   "limit": 1000
 }

^ Admin Favs - Hip Hop🎵.NSP

@@ -4,13 +4,14 @@
   "all": [
     { "any": [
       {"contains": {"genre": "hip-hop"}},
-      {"contains": {"genre": "hip hop"}}
+      {"contains": {"genre": "hip hop"}},
+      {"contains": {"genre": "Rap"}}
     ]},
     {"notContains": {"genre": "Christmas Music"}},
-    {"notContains": {"genre": "Latin"}}
+    {"notContains": {"genre": "Latin"}},
     {"is": {"loved": true}}
   ],
-  "sort": "dateModified",
+  "sort": "dateLoved",
   "order": "desc",
   "limit": 1000
 }

^ Admin Favs - Metal🎵.NSP

@@ -8,7 +8,7 @@
     {"notContains": {"genre": "Christmas Music"}},
     {"is": {"loved": true}}
   ],
-  "sort": "dateModified",
+  "sort": "dateLoved",
   "order": "desc",
   "limit": 1000
 }

^ Admin Favs - Rock🎵.NSP

@@ -8,7 +8,7 @@
     {"notContains": {"genre": "Christmas Music"}},
     {"is": {"loved": true}}
   ],
-  "sort": "dateModified",
+  "sort": "dateLoved",
   "order": "desc",
   "limit": 1000
 }

^ Jukebox A 🎵.NSP

@@ -0,0 +1,25 @@
+{
+  "title": "-Jukebox All ;)",
+  "comment": "The highest rated music on random, discounting recently played.",
+  "any": [
+    { "all": [
+      {"is": {"rating": 3}},
+      {"notInTheLast": {"lastPlayed": 90}}
+    ]},
+    { "all": [
+      {"is": {"rating": 4}},
+      {"notInTheLast": {"lastPlayed": 30}}
+    ]},
+    { "all": [
+      {"is": {"rating": 5}},
+      {"notInTheLast": {"lastPlayed": 15}}
+    ]},
+    { "all": [
+      {"is": {"loved": true}},
+      {"notInTheLast": {"lastPlayed": 10}}
+    ]}
+  ],
+  "sort": "lastPlayed",
+  "order": "asc",
+  "limit": 1000
+}

^ Jukebox P 🎵.NSP

@@ -0,0 +1,28 @@
+{
+  "title": "-Jukebox Played ;)",
+  "comment": "The highest rated music on random, discounting recently played. At least 1 play before.",
+  "any": [
+    { "all": [
+      {"is": {"rating": 3}},
+      {"notInTheLast": {"lastPlayed": 90}},
+      {"isNot": {"playcount": 0}}
+    ]},
+    { "all": [
+      {"is": {"rating": 4}},
+      {"notInTheLast": {"lastPlayed": 30}},
+      {"isNot": {"playcount": 0}}
+    ]},
+    { "all": [
+      {"is": {"rating": 5}},
+      {"notInTheLast": {"lastPlayed": 15}},
+      {"isNot": {"playcount": 0}}
+    ]},
+    { "all": [
+      {"is": {"loved": true}},
+      {"notInTheLast": {"lastPlayed": 10}}
+    ]}
+  ],
+  "sort": "lastPlayed",
+  "order": "asc",
+  "limit": 1000
+}

^ Jukebox U 🎵.NSP

@@ -0,0 +1,24 @@
+{
+  "title": "-Jukebox Unplayed;)",
+  "comment": "The highest rated unplayed music on random.",
+  "any": [
+    { "all": [
+      {"is": {"rating": 3}},
+      {"is": {"playcount": 0}}
+    ]},
+    { "all": [
+      {"is": {"rating": 4}},
+      {"is": {"playcount": 0}}
+    ]},
+    { "all": [
+      {"is": {"rating": 5}},
+      {"is": {"playcount": 0}}
+    ]},
+    { "all": [
+      {"is": {"loved": true}},
+      {"is": {"playcount": 0}}
+    ]}
+  ],
+  "sort": "random",
+  "limit": 1000
+}

^ Jukebox 🎵.NSP

@@ -1,21 +0,0 @@
-{
-  "title": "-Jukebox ;)",
-  "comment": "The highest rated music on random, discounting recently played.",
-  "any": [
-    { "all": [
-      {"is": {"rating": "3"}},
-      {"notInTheLast": {"lastPlayed": "150"}}
-    ]},
-    { "all": [
-      {"is": {"rating": "4"}},
-      {"notInTheLast": {"lastPlayed": "90"}}
-    ]},
-    { "all": [
-      {"is": {"rating": "5"}},
-      {"notInTheLast": {"lastPlayed": "40"}}
-    ]}
-  ],
-  "sort": "lastPlayed",
-  "order": "desc",
-  "limit": 1000
-}

^ Recently Added 🎵.NSP

@@ -5,9 +5,7 @@
     {"any": [
       {"inTheLast": {"dateadded": "90"}}
     ]},
-    {"notContains": {"genre": "Podcasts"}},
-    {"isNot": {"artist": "Graham Cluley & Carole Theriault"}},
-    {"isNot": {"artist": "freeCodeCamp Podcast"}}
+    {"notContains": {"genre": "Podcasts"}}
   ],
   "sort": "dateadded",
   "order": "desc",

^ Top 2000s Music.NSP

@@ -0,0 +1,13 @@
+{
+  "title": "-Top 2000s Music ;)",
+  "comment": "Top rated songs from the 2000's by the admin.",
+  "all": [
+    { "any": [
+      { "is": { "loved": true } },
+      { "gt": { "rating": 2 } }]
+    },
+    { "inTheRange": { "year": [2001, 2011] } }
+  ],
+  "sort": "-year,-rating,title",
+  "limit": 1000
+}

^ Top 2010s Music.NSP

@@ -0,0 +1,13 @@
+{
+  "title": "-Top 2010s Music ;)",
+  "comment": "Top rated songs from the 2010's by the admin.",
+  "all": [
+    { "any": [
+      { "is": { "loved": true } },
+      { "gt": { "rating": 2 } }]
+    },
+    { "inTheRange": { "year": [2011, 2021] } }
+  ],
+  "sort": "-year,-rating,title",
+  "limit": 1000
+}

^ Top 70s Music.NSP

@@ -0,0 +1,13 @@
+{
+  "title": "-Top 70s Music ;)",
+  "comment": "Top rated songs from the 1970's by the admin.",
+  "all": [
+    { "any": [
+      { "is": { "loved": true } },
+      { "gt": { "rating": 2 } }]
+    },
+    { "inTheRange": { "year": [1971, 1980] } }
+  ],
+  "sort": "-year,-rating,title",
+  "limit": 1000
+}

^ Top 80s Music.NSP

@@ -0,0 +1,13 @@
+{
+  "title": "-Top 80s Music ;)",
+  "comment": "Top rated songs from the 1980's by the admin.",
+  "all": [
+    { "any": [
+      { "is": { "loved": true } },
+      { "gt": { "rating": 2 } }]
+    },
+    { "inTheRange": { "year": [1981, 1990] } }
+  ],
+  "sort": "-year,-rating,title",
+  "limit": 1000
+}

^ Top 90s Music.NSP

@@ -0,0 +1,13 @@
+{
+  "title": "-Top 90s Music ;)",
+  "comment": "Top rated songs from the 1990's by the admin.",
+  "all": [
+    { "any": [
+      { "is": { "loved": true } },
+      { "gt": { "rating": 2 } }]
+    },
+    { "inTheRange": { "year": [1991, 2000] } }
+  ],
+  "sort": "-year,-rating,title",
+  "limit": 1000
+}

^ Top Emo 📈.NSP

@@ -7,6 +7,7 @@
     {"notContains": {"genre": "Christmas Music"}},
     {"notContains": {"genre": "Latin"}},
     {"isNot": {"artist": "BTS"}},
+    {"isNot": {"artist": "Melanie Martinez"}},
     {"isNot": {"artist": "Postmodern Jukebox"}}
   ],
   "sort": "dateModified",

^ Top Folk 📈.NSP

@@ -8,7 +8,10 @@
     {"notContains": {"genre": "Folk Pop"}},
     {"notContains": {"genre": "Folk Rock"}},
     {"notContains": {"genre": "Latin"}},
-    {"isNot": {"artist": "Creed"}}
+    {"isNot": {"artist": "Billie Eilish"}},
+    {"isNot": {"artist": "Creed"}},
+    {"isNot": {"artist": "Lana Del Ray"}},
+    {"isNot": {"artist": "Taylor Swift"}}
   ],
   "sort": "dateModified",
   "order": "desc",

^ Top Hip Hop and Rap 📈.NSP

@@ -77,6 +77,7 @@
     {"isNot": {"artist": "Katy Perry"}},
     {"isNot": {"artist": "Keri Hilson"}},
     {"isNot": {"artist": "Kero Kero Bonito"}},
+    {"isNot": {"artist": "Keyshia Cole"}},
     {"isNot": {"artist": "Khalid"}},
     {"isNot": {"artist": "Kid Rock"}},
     {"isNot": {"artist": "KIDS SEE GHOSTS"}},
@@ -152,7 +153,7 @@
     {"notContains": {"album": "Despicable Me 4"}},
     {"notContains": {"album": "instrumental"}},
     {"notContains": {"album": "Hollywood's Bleeding"}},
-    {"isNot": {"album": "iris"}}
+    {"isNot": {"album": "iris"}},
     {"isNot": {"album": "Tempo"}}
   ],
   "sort": "dateModified",

^ Top RnB 📈.NSP

@@ -4,9 +4,11 @@
   "all": [
     { "any": [
       {"contains": {"genre": "R&B"}},
-      {"contains": {"genre": "R & B"}}
+      {"contains": {"genre": "R & B"}},
+      {"contains": {"genre": "Rhythm And Blues"}}
     ]},
     {"gt": {"rating": 3}},
+    {"notContains": {"genre": "Alternative R&B"}},
     {"notContains": {"genre": "Blues"}},
     {"notContains": {"genre": "Christmas Music"}},
     {"notContains": {"genre": "Electropop"}},
@@ -14,6 +16,8 @@
     {"notContains": {"genre": "Latin"}},
     {"notContains": {"genre": "Pop Rap"}},
     {"isNot": {"artist": "Coldplay"}},
+    {"isNot": {"artist": "Ed Sheeran"}},
+    {"isNot": {"artist": "Jack Harlow"}},
     {"isNot": {"artist": "Justin Bieber"}},
     {"isNot": {"artist": "P!nk"}},
     {"notContains": {"album": "Black Panther: The Album"}}