From b97df8b90eb95afc30845989aa0b3d2bebfa0d38 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <free.arhey@gmail.com>
Date: Sun, 22 Aug 2021 16:02:18 +0300
Subject: [PATCH] Update filter.js

---
 scripts/filter.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/filter.js b/scripts/filter.js
index da0d30b7f..3ca71d927 100644
--- a/scripts/filter.js
+++ b/scripts/filter.js
@@ -19,13 +19,14 @@ async function main() {
   log.finish()
 }
 
-async function removeBlacklisted(playlist) {
+function removeBlacklisted(playlist) {
   const channels = playlist.channels.filter(channel => {
+    const channelName = normalizeName(channel.name)
     return !blacklist.find(item => {
       const hasSameName =
-        item.name.toLowerCase() === channel.name.toLowerCase() ||
-        item.aliases.map(alias => alias.toLowerCase()).includes(channel.name.toLowerCase())
-      const fromSameCountry = channel.countries.find(c => c.code === item.country)
+        normalizeName(item.name) === channelName ||
+        item.aliases.map(alias => normalizeName(alias)).includes(channelName)
+      const fromSameCountry = playlist.country.code === item.country
 
       return hasSameName && fromSameCountry
     })
@@ -40,4 +41,8 @@ async function removeBlacklisted(playlist) {
   return playlist
 }
 
+function normalizeName(str) {
+  return str.replace(/[^a-zA-Z0-9 ]/gi, '').toLowerCase()
+}
+
 main()