Merge branch 'master' of https://github.com/AntiPontifex/database

.github/ISSUE_TEMPLATE/__channels_edit.yml

@@ -16,7 +16,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        What exactly needs to be changed?
+        Please specify exactly what should be changed. To delete an existing value without replacement use the `~` symbol.
 
   - type: input
     id: name

data/channels.csv

@@ -120,7 +120,7 @@ id,name,alt_names,network,owners,country,subdivision,city,broadcast_area,languag
 360TuneBox.nl,360TuneBox,,,,NL,,,c/NL,eng,music,FALSE,,,,http://www.360tunebox.com/,https://i.imgur.com/1Fyezng.png
 360TV.ar,360 TV,,,,AR,AR-C,,s/AR-C,spa,,FALSE,,2020-11-01,,,https://i.imgur.com/4V3NJBk.png
 363TV.tr,363 TV,,,,TR,,,c/TR,tur,,FALSE,,,,,https://i.imgur.com/Jdu5L7P.png
-365daysTV.ru,365 days TV,365 дней ТВ,,,RU,,,c/RU,rus,,FALSE,,,,https://www.365days.ru/,https://cdn.red-media.ru/wp-content/uploads/2019/12/365days(1).png
+365daysTV.ru,365 days TV,365 дней ТВ,,Gazprom Media,RU,,Moscow,c/RU,rus,documentary,FALSE,2006-01-17,,,https://www.365days.ru/,https://i.imgur.com/NfnAiTR.png
 365TV.tr,365 TV,,,,TR,,,c/TR,tur,,FALSE,,,,,https://i.imgur.com/xdxke6m.png
 366TV.ua,36.6 TV,,,,UA,,,c/UA;c/RU,ukr,,FALSE,,,,https://36i6.tv/,https://i.imgur.com/oaSLffU.png
 38TV.cl,38TV,,,,CL,CL-RM,Santiago,s/CL-RM,spa,general,FALSE,,,,http://www.38tv.cl/,https://i.imgur.com/mwlQ9xZ.png
@@ -357,7 +357,10 @@ ABCTVTAS.au,ABC TV TAS,,ABC Television,Australian Government,AU,,,c/AU,eng,,FALS
 ABCTVVIC.au,ABC TV VIC,,ABC Television,Australian Government,AU,,,c/AU,eng,,FALSE,,,,https://iview.abc.net.au/channel/abc1,https://i.imgur.com/Ekjb7w8.png
 ABCTVWA.au,ABC TV WA,,ABC Television,Australian Government,AU,,,c/AU,eng,,FALSE,,,,https://iview.abc.net.au/channel/abc1,https://i.imgur.com/Ekjb7w8.png
 ABCWest.us,ABC West,,,,US,,,c/US,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/ABC-2021-LOGO.svg/512px-ABC-2021-LOGO.svg.png
+ABEMADrama.jp,ABEMA Drama,,,,JP,,Shibuya-ku,c/JP,jpn,entertainment,FALSE,2016-04-11,,,https://abema.tv/now-on-air/drama?lang=en,https://selectra.jp/sites/selectra.jp/files/styles/provider_hero/public/images/abema_tv_4.72against14_0.png?itok=FHSFrT-W
 ABEMAGold.jp,ABEMA Gold,,,,JP,,Shibuya-ku,c/JP,jpn,general,FALSE,2016-04-11,,,,https://pics.prcm.jp/d8fdeda7d8d79/85853361/png/85853361_480x480.png
+ABEMAKoreanChinese.jp,ABEMA Korean Chinese,,,,JP,,Shibuya-ku,c/JP,jpn;zho;kor,entertainment;movies,FALSE,2016-12-05,,,https://abema.tv/,https://sumahosupportline.com/wp-content/uploads/2017/02/2ad238a5491ebc8ea169811ba53ce6d3.png
+ABEMAKWorld.jp,ABEMA K World,,,,JP,,Shibuya-ku,c/JP,jpn;kor,music,FALSE,2017-06-18,,,https://abema.tv/now-on-air/k-world?lang=en,https://image.p-c2-x.abema-tv.com/image/channels/k-world/logo.png?height=96&quality=75&version=20200413&width=256
 ABEMANews.jp,ABEMA News,,,,JP,,Shibuya-ku,c/JP,jpn,news,FALSE,2016-03-01,,,https://abema.tv/,"https://images.crunchbase.com/image/upload/c_lpad,f_auto,q_auto:eco,dpr_1/fnmxjhzj2dzjogwgjjha"
 ABEMASpecial.jp,ABEMA Special,,,,JP,,Shibuya-ku,c/JP,jpn,entertainment,FALSE,2016-03-01,,,https://abema.tv/,https://image.p-c2-x.abema-tv.com/image/channels/abema-special/logo.png?height=96&quality=75&version=20200413&width=256
 ABEMASpecial2.jp,ABEMA Special 2,,,,JP,,Shibuya-ku,c/JP,jpn,entertainment,FALSE,2016-04-11,,,https://abema.tv/now-on-air/special-plus?lang=en,https://image.p-c2-x.abema-tv.com/image/channels/special-plus/logo.png?height=96&quality=75&version=20200413&width=256
@@ -1004,6 +1007,7 @@ AlSahraaTV.sa,Al Sahraa TV,,,,SA,,,c/SA,ara,,FALSE,,,,http://www.alsahraa.tv/ind
 AlSalamTV.iq,Al Salam TV,,,,IQ,,,c/IQ,ara,,FALSE,,,,,https://i.imgur.com/d59OY8J.png
 Alsat.mk,Alsat,,,,MK,,,c/MK,mkd,,FALSE,2006-03-01,,,http://alsat-m.tv,https://i.imgur.com/SIM5Jhm.png
 AlSaudiya.sa,Al Saudiya,السعودية;Saudi TV Channel 1;KSA 1,Saudi TV,Saudi Broadcasting Authority,SA,,,c/SA,ara,general,FALSE,1965-07-07,,,https://saudiatv.sa/,https://i.imgur.com/GRQTndk.png
+AlSaudiyaAlaan.sa,Al Saudiya Alaan,السعودية الآن,,,SA,,,c/SA,ara,,FALSE,,,,https://www.aloula.sa/live/ksa-now,https://i.imgur.com/sEOjApe.png
 AlSehaWalJamalTV.eg,Al Seha Wal Jamal TV,,,,EG,,,c/EG,ara,,FALSE,,,,,https://i.imgur.com/X6EqtgR.png
 AlshaaerTV.iq,Alshaaer TV,,,,IQ,,,c/IQ,ara,,FALSE,,,,,https://i.imgur.com/WZqTPgo.png
 AlshahedTV.kw,Alshahed TV,,,,KW,,,c/KW,ara,,FALSE,,,,https://alshahed.tv/,https://i.imgur.com/aiK384O.png
@@ -1463,7 +1467,7 @@ Arriadia.mr,Arriadia,,,,MR,,,c/MR,ara,,FALSE,,,,,https://i.imgur.com/e4Kskca.png
 Arroyo.us,Arroyo,,,,US,US-CA,Pasadena,s/US-CA,eng,general,FALSE,,,,https://www.pasadenamedia.org/arroyo/,https://i.imgur.com/tNFhlrH.png
 ArroyoGrandeChannel20.us,Arroyo Grande Channel 20,,,,US,US-CA,Arroyo Grande,s/US-CA,eng,,FALSE,,,,https://slo-span.org/channels/arroyo-grande-channel-20,https://i.imgur.com/ZTaEFWY.png
 Arryadia.ma,Arryadia,قناة الرياضية,,SNRT,MA,,,c/MA,ara,sports,FALSE,2006-09-16,,,https://arryadia.snrt.ma/,https://i.imgur.com/XjzK3gZ.png
-Arsenal.ru,Arsenal,Арсенал,,,RU,,,c/RU,rus,,FALSE,,,,https://arsenal-tv.tv/,https://i.imgur.com/DBpVeb0.png
+Arsenal.ru,Arsenal,Арсенал,,First TVCH,RU,,,c/RU,rus,documentary,FALSE,2020-01-01,,,https://arsenal-tv.tv/,https://i.imgur.com/DBpVeb0.png
 ARTAflam1.sa,ART Aflam 1,,,,SA,,,c/SA,ara,,FALSE,,,,https://www.artonline.tv/,https://i.imgur.com/aeY4ax8.png
 ARTAflam2.sa,ART Aflam 2,,,,SA,,,c/SA,ara,,FALSE,,,,https://www.artonline.tv/,https://i.imgur.com/icE2WOw.png
 ARTAmerica.sa,ART America,,,,SA,,,c/SA,ara,,FALSE,,,,https://www.artonline.tv/,https://i.imgur.com/QFBzdMv.png
@@ -4215,7 +4219,7 @@ Channel7Kazakhstan.kz,Channel 7 Kazakhstan,Жетінші арна;Седьмо
 Channel7Kyrgyzstan.kg,Channel 7 Kyrgyzstan,7-канал,,,KG,,,c/KG,kir,,FALSE,,,,https://7tv.kg/,https://i.imgur.com/mwajD2X.png
 Channel7TV.uk,Channel 7 TV,,,,UK,,,c/UK,eng,,FALSE,,,,http://mychannel7tv.co.uk/,https://i.imgur.com/ArgIjyL.png
 Channel7Ukraine.ua,Channel 7 Ukraine,7 канал,,,UA,,,c/UA;c/RU,ukr,,FALSE,,,,https://7kanal.com.ua/,https://i.imgur.com/9Ll0BIo.png
-Channel8.ru,Channel 8,8 канал,,,RU,,,c/RU,rus,,FALSE,,,,http://8tv.ru/,https://i.imgur.com/tCTJQBW.png
+Channel8.ru,Channel 8,8 канал;Восьмой канал,,Prime Cinema-TV,RU,,Moscow,c/RU,rus,entertainment,FALSE,2010-07-05,,,http://8tv.ru/,https://i.imgur.com/nUSx1jF.png
 Channel8.sg,Channel 8,8頻道,,,SG,,,c/SG,zho,,FALSE,1963-11-23,,,http://tv.mewatch.sg/zh/channel8,https://i.imgur.com/6YPZc24.png
 Channel8.th,Channel 8,,,,TH,,,c/TH,tha,,FALSE,2011-01-05,,,https://www.thaich8.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/2/20/Ch_8_2016.svg/512px-Ch_8_2016.svg.png
 Channel82.bm,Channel 82,,,,BM,,,c/BM,eng,entertainment,FALSE,,,,https://www.channel82.bm/,https://i.imgur.com/8Ff5b3e.png
@@ -6144,7 +6148,7 @@ DocTV.ir,Doc TV,,,,IR,,,c/IR,fas,,FALSE,,,,,https://i.imgur.com/Fav1tXp.png
 DocTV.us,Doc TV,,,,US,,,c/US,eng,series,FALSE,,,,,https://i.imgur.com/fGioE7e.png
 DocuBayTV.in,DocuBay TV,,,,IN,,,c/IN,hin,entertainment,FALSE,,,,,https://i.imgur.com/OGyeLLR.png
 DocuBox.nl,DocuBox,,,,NL,,,r/INT,eng,documentary,FALSE,,,,https://www.docuboxlive.com/,https://i.imgur.com/pX4U9OG.png
-DocuChina.cn,Docu China,,,,CN,,,c/CN,zho,,FALSE,,,,,https://i.imgur.com/BSa6IC2.png
+DocuboxRussia.ru,Docubox Russia,,,Orion Express,RU,,Krasnogorsk,c/RU,rus,documentary,FALSE,2017-01-01,,,https://www.orion-express.ru/,https://i.imgur.com/pX4U9OG.png
 DocuCrime.uk,Docu Crime,,,,UK,,,c/UK,eng,documentary,FALSE,,,,https://www.mimyuni.com/,https://i.imgur.com/RrtVpuR.png
 DocuHistory.uk,Docu History,,,,UK,,,c/UK,eng,documentary,FALSE,,,,https://www.mimyuni.com/,https://i.imgur.com/cbdfwMo.png
 DocuKids.uk,Docu Kids,,,,UK,,,c/UK,eng,documentary;kids,FALSE,,,,https://www.mimyuni.com/,https://i.imgur.com/0ZCrCd8.png
@@ -6446,10 +6450,10 @@ EcuadorTV.ec,Ecuador TV,,,Comunica EP,EC,,,c/EC,spa,,FALSE,2007-10-24,,,https://
 Ecuavisa.ec,Ecuavisa,,,Grupo Alvarado Roca,EC,,,c/EC,spa,,FALSE,1967-03-01,,,https://www.ecuavisa.com/,https://i.imgur.com/Hl5wowk.png
 EcuavisaInternacional.ec,Ecuavisa Internacional,,,,EC,,,r/HISPAM,spa,,FALSE,,,,https://www.ecuavisa.com/internacional,https://i.imgur.com/1HQc7oa.png
 ECWATV.ng,ECWA TV,,,,NG,,,c/NG,eng,,FALSE,,,,http://www.ecwatv.org/,https://i.imgur.com/ZRbXCQv.png
-Eda.ru,Eda,Еда,,,RU,,,c/RU,rus,cooking,FALSE,,,,https://www.tveda.ru/,https://i.imgur.com/htmbgOX.png
+Eda.ru,Eda,Еда,,First TVCH,RU,,Saint Petersburg,c/RU,rus,cooking,FALSE,2012-07-01,,,https://www.tveda.ru/,https://i.imgur.com/htmbgOX.png
 EdailyTV.kr,Edaily TV,이데일리TV,,,KR,,,c/KR,kor,,FALSE,,,,http://tv.edaily.co.kr/,https://i.imgur.com/3E72tK9.png
 EDAN.fr,EDAN,,,,FR,,,c/FR,fra,,FALSE,,,,,https://i.imgur.com/YzyFhBL.png
-EdaPremium.ru,Eda Premium,Еда Премиум,,,RU,,,c/RU,rus,cooking,FALSE,,,,https://www.tveda.ru/,https://i.imgur.com/Gqihpn2.png
+EdaPremium.ru,Eda Premium,Еда Премиум,,First TVCH,RU,,Saint Petersburg,c/RU,rus,cooking,FALSE,2017-08-09,2022-11-01,FoodTime.ru,https://premium.tveda.ru/,https://i.imgur.com/Gqihpn2.png
 eden.nz,eden,,,Warner Bros. Discovery Inc.,NZ,,,c/NZ,eng,,FALSE,2022-03-21,,,https://www.threenow.co.nz/search?genre=eden,https://i.imgur.com/Aynl8eW.png
 Eden.uk,Eden,,,,UK,,,c/UK,eng,,FALSE,,,,https://eden.uktv.co.uk/,https://i.imgur.com/fXiU7nV.png
 edenPlus1.nz,eden +1,,,Warner Bros. Discovery Inc.,NZ,,,c/NZ,eng,,FALSE,2022-03-21,,,https://www.threenow.co.nz/search?genre=eden,https://i.imgur.com/S4XWeH5.png
@@ -6688,6 +6692,7 @@ EnergieTV.ml,Energie TV,,,,ML,,,c/ML,fra,,FALSE,,,,,https://i.imgur.com/Jrke8m1.
 Energy.es,Energy,,,,ES,,,c/ES,spa,,FALSE,,,,http://www.telecinco.es/energy/,https://i.imgur.com/tfvpeaS.png
 eNewsChannelAfrica.za,eNews Channel Africa,,,eMedia Holdings,ZA,,,c/ZA,eng,news,FALSE,,,,https://www.enca.com/,https://i.imgur.com/iE7bNr0.png
 EnfoqueDigitalTV.cl,Enfoque Digital TV,,,,CL,CL-AT,Vallenar,c/CL,spa,,FALSE,,,,https://enfoquedigital.cl/,https://i.imgur.com/GaJzjt5.png
+EnglishClass.ru,English Class,English Club TV Russia,,,RU,,,c/RU,eng,education,FALSE,2008-08-01,,,http://english-club.tv/ru/,https://i.imgur.com/gst7wW7.png
 EnglishClubTV.uk,English Club TV,,,,UK,,,c/UK,eng;rus,,FALSE,2008-08-01,,,http://english-club.tv/,https://i.imgur.com/9FMvaRK.png
 EngueraTV.es,Enguera TV,,,,ES,ES-VC,,s/ES-VC,spa,general,FALSE,,,,https://www.enguera.es/content/enguera-tv,https://i.imgur.com/GShs6DO.png
 Enisey.ru,Enisey,Енисей,,,RU,,,c/RU,rus,,FALSE,,,,https://www.enisey.tv/,https://i.imgur.com/57deE7f.png
@@ -7200,7 +7205,7 @@ FamilyTies.us,Family Ties,,,,US,,,c/US,eng,series,FALSE,,,,https://pluto.tv/en/l
 FamilyTime.us,FamilyTime,,,,US,,,c/US,spa,,FALSE,,,,https://www.familytime.tv/,https://i.imgur.com/TCKJT2x.png
 FamilyTV.ke,Family TV,,,,KE,,,c/KE,eng,family,FALSE,,,,http://familymedia.tv/,https://i.imgur.com/mNSl2NM.png
 FamousTV.gh,Famous TV,,,,GH,,,c/GH,eng,,FALSE,,,,,https://i.imgur.com/G4HvIPM.png
-FAN.ru,FAN,,,VGTRK,RU,,,c/RU,rus,animation,FALSE,,,,,https://i.imgur.com/mDeTbaF.png
+FAN.ru,FAN,,,Signal Media,RU,,,c/RU,rus,animation;movies,FALSE,2018-01-01,,,http://signalomedia.ru/,https://i.imgur.com/mDeTbaF.png
 FanaTV.et,Fana TV,,,Fana Broadcasting Corporate,ET,,,c/ET,amh,,FALSE,2017-07-01,,,https://www.fanabc.com/%e1%8d%8b%e1%8a%93-%e1%89%b2%e1%89%aa/,https://i.imgur.com/EmHAxYX.png
 FanDuelRacing.us,FanDuel Racing,,,,US,,,c/US,eng,sports,FALSE,2022-09-01,,,https://www.tvg.com/,https://static.wikia.nocookie.net/logopedia/images/3/37/FanDuel_Racing.png
 FanDuelTV.us,FanDuel TV,,,,US,,,c/US,eng,sports,FALSE,2022-09-01,,,https://www.tvg.com/,https://upload.wikimedia.org/wikipedia/en/2/22/FanDuel_TV_logo.png
@@ -7313,9 +7318,9 @@ FehervarTV.hu,Fehervar TV,Fehérvár TV,,,HU,,,c/HU,hun,,FALSE,,,,https://www.fe
 FEM.no,FEM,,,,NO,,,c/NO,nor,,FALSE,,,,http://www.fem.no/,https://i.imgur.com/8WHxcei.png
 FEM3.hu,FEM3,,,TV2 Group,HU,,,c/HU,hun,,FALSE,,,,https://tv2play.hu/fem3,https://i.imgur.com/KloyDdk.png
 FenerbahceTV.tr,Fenerbahce TV,Fenerbahçe TV,,Fenerbahçe SK,TR,,,c/TR,tur,,FALSE,,,,http://www.fenerbahce.org/fbtv,https://i.imgur.com/rt3Mmrm.png
-FenFolk.bg,Fen Folk,,,,BG,,,c/BG,bul,,FALSE,,,,https://fenfolktv.bg/,https://i.imgur.com/Xb0WSn4.png
+FenFolkTV.bg,Fen Folk TV,Фен Фолк ТВ,,,BG,,,c/BG,bul,music,FALSE,,,,https://fenfolktv.bg/,https://i.imgur.com/pq7wX0V.png
-FengshangShoppingChannel.cn,Fengshang Shopping Channel,风尚购物,,,CN,,Nanchang,c/CN,zho,shop,FALSE,2009-09-28,,,http://www.jxntv.cn/live/jxtv9.shtml,https://www.tvchinese.net/uploads/tv/jxtv9.jpg
+FengshangShoppingChannel.cn,Fengshang Shopping Channel,风尚购物,,,CN,,Nanchang,c/CN,zho,shop,FALSE,2009-09-28,,,http://www.jxntv.cn/live/jxtv9.shtml,https://i.imgur.com/WNhfnUR.png
-FeniksplusKino.ru,Feniks plus Kino,Феникс плюс Кино,,,RU,,,c/RU,rus,movies,FALSE,,,,http://www.fenixplus.tv/,https://i.imgur.com/JH3byQL.png
+FeniksplusKino.ru,Feniks plus Kino,Феникс плюс кино,,Feniks-Tver,RU,,Moscow,c/RU,rus,movies,FALSE,2007-09-17,,,http://www.fenixplus.tv/,https://i.imgur.com/S9OPMLE.png
 FenixTV.ar,Fenix TV,,,,AR,AR-F,La Rioja,c/AR,spa,,FALSE,,,,http://fenix951.com.ar/nuevo_2013/ustream.html,https://i.imgur.com/wQ33T78.png
 FenTV.bg,Fen TV,,,Fen TV Ltd.,BG,,,c/BG,bul,,FALSE,2003-11-12,,,http://www.fentv.bg/,https://i.imgur.com/nbv21kE.png
 FernandinaBeachChannel.us,Fernandina Beach Channel,,,,US,US-FL,Fernandina Beach,s/US-FL,eng,legislative,FALSE,,,,https://www.fbfl.us/815/City-Meeting-Videos,https://i.imgur.com/9UfyekJ.png
@@ -7527,6 +7532,7 @@ FoodNetworkRussia.us,Food Network Russia,,Food Network,,US,,,c/US,eng,cooking,FA
 FoodNetworkUK.uk,Food Network UK,,Food Network,,UK,,,c/UK,eng,cooking,FALSE,,,,http://www.foodnetwork.co.uk/,https://upload.wikimedia.org/wikipedia/commons/thumb/f/f9/Food_Network_New_Logo.png/512px-Food_Network_New_Logo.png
 FoodNetworkUKPlus1.uk,Food Network UK +1,,Food Network,,UK,,,c/UK,eng,cooking,FALSE,,,,http://www.foodnetwork.co.uk/,https://i.imgur.com/ZNWSXOu.png
 FoodNetworkWest.us,Food Network West,,Food Network,,US,,,c/US,eng,cooking,FALSE,,,,http://www.foodnetwork.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/f/f9/Food_Network_New_Logo.png/512px-Food_Network_New_Logo.png
+FoodTime.ru,FoodTime,,,First TVCH,RU,,Saint Petersburg,c/RU,rus,cooking,FALSE,2022-11-01,,,https://www.tveda.ru/tv/,https://i.imgur.com/gxCYAwH.png
 FoodTV.kr,Food TV,푸드TV,,,KR,,,c/KR,kor,cooking,FALSE,,,,http://www.myfoodtv.co.kr/,https://i.imgur.com/E0W1M4H.png
 FoodTV.us,Food TV,,,,US,,,c/US,eng,cooking,FALSE,,,,https://pluto.tv/en/live-tv/food-tv,https://i.imgur.com/WGUPTnL.png
 Foodxp.uk,Foodxp,,,,UK,,,c/UK,hin,cooking,FALSE,,,,https://www.foodxp.com/,https://i.imgur.com/zOWog5j.png
@@ -9278,7 +9284,7 @@ IlamTV.ir,Ilam TV,,,,IR,,,c/IR,fas,,FALSE,,,,http://ilam.irib.ir/tv,https://i.im
 IlBancodeiPugniItaly.it,Il Banco dei Pugni Italy,,,,IT,,,c/IT,ita,entertainment,FALSE,,,,https://pluto.tv/en/live-tv/il-banco-dei-pugni-it,https://i.imgur.com/NZDUlME.png
 ILCECanal13InnovaConocimiento.mx,ILCE Canal 13 Innova Conocimiento,,,,MX,,,c/MX,spa,,FALSE,,,,http://www.ilce.edu.mx/index.php/canal-13,https://i.imgur.com/F7rmgaB.png
 ILCECanal15SummaSaberes.mx,ILCE Canal 15 Summa Saberes,,,,MX,,,c/MX,spa,,FALSE,,,,https://www.ilce.edu.mx/index.php/radio-y-tv,https://i.imgur.com/r7czgOc.png
-IllusionPlus.ru,Illusion+,Иллюзион+,,,RU,,,c/RU,rus,movies,FALSE,,,,http://illusionplus.tv/,https://i.imgur.com/9GvuHQ5.png
+IllusionPlus.ru,Illusion+,Иллюзион+,,Stream,RU,,,c/RU,rus,movies,FALSE,2006-12-15,,,http://illusionplus.tv/,https://i.imgur.com/9GvuHQ5.png
 ILove.in,ILove,,,,IN,,,c/IN,hin,music,FALSE,,,,,https://i.imgur.com/KhIQVlU.png
 ILTV.fr,ILTV,,,,FR,,,c/FR,fra,,FALSE,,,,,https://i.imgur.com/fVhrJHK.png
 ImageChannel.np,Image Channel,,,Image Channel Pvt. Ltd,NP,,,c/NP,nep,,FALSE,2003-01-01,,,https://imagechannel.com.np/,https://i.imgur.com/xctHWUv.png
@@ -12251,6 +12257,7 @@ Kinohit.ru,Kinohit,Кинохит,,Gazprom Media,RU,,,c/RU,rus,movies,FALSE,,,,h
 KinoJam1.ru,KinoJam 1,,,MTS Media,RU,,,c/RU,rus,movies,FALSE,,,,,https://i.imgur.com/6HQFM4m.png
 KinoJam2.ru,KinoJam 2,,,MTS Media,RU,,,c/RU,rus,movies,FALSE,,,,,https://i.imgur.com/4oWsuJn.png
 Kinokomedija.ru,Kinokomedija,Кинокомедия;Kinokomedia,,Gazprom Media,RU,,,c/RU,rus,comedy,FALSE,,,,https://www.nastroykino.ru/kinokomedija/,https://i.imgur.com/dVjtth0.png
+Kinoman.ru,Kinoman,Киноман,,KinoClub,RU,,,c/RU,rus,movies,FALSE,2017-01-01,,,https://contact-agency.ru/channels/kinoman/,https://i.imgur.com/38yMv7L.png
 Kinomix.ru,Kinomix,Kinomiks;Киномикс,,Gazprom Media,RU,,,c/RU,rus,movies,FALSE,,,,https://www.nastroykino.ru/kinomiks/,https://i.imgur.com/D4q2XUT.png
 KinoNova.bg,Kino Nova,Кино Нова,,,BG,,,c/BG,bul,movies,FALSE,,,,http://kinonova.bg/,https://i.imgur.com/hMqEY0J.png
 Kinopokaz.ru,Kinopokaz,Кинопоказ,,,RU,,,c/RU,rus,movies,FALSE,,,,http://www.kinopokaz.tv/,https://i.imgur.com/nNjMyAq.png
@@ -12266,7 +12273,7 @@ Kinosvidanie.ru,Kinosvidanie,Киносвидание,,Gazprom Media,RU,,,c/RU,r
 Kinoteatr.uz,Kinoteatr,,,,UZ,,,c/UZ,uzb,movies,FALSE,,,,https://www.mtrk.uz/uz/tv/kinoteatr/,https://i.imgur.com/emH1BgC.png
 KinoTV.hr,Kino TV,,,,HR,,,c/HR,hrv,movies,FALSE,,,,http://www.kinotv.hr/,https://i.imgur.com/pyzd7Dz.png
 KinoTV.pl,Kino TV,,,,PL,,,c/PL,pol,movies,FALSE,,,,https://spiintl.com/channels/kinotv,https://i.imgur.com/sqjuXUO.png
-KinoTV.ru,KinoTV,КиноТВ,,,RU,,,c/RU,rus,movies,FALSE,,,,https://kinotoday.ru/,https://i.imgur.com/L01RjKe.png
+KinoTV.ru,KinoTV,Кино ТВ,,Signal Media,RU,,,c/RU,rus,movies,FALSE,2012-01-01,,,https://kinotoday.ru/,https://i.imgur.com/sMpamNO.png
 KinoUHD.ru,Kino UHD,Кино UHD,,,RU,,,c/RU,rus,movies,FALSE,,,,https://www.tricolor.tv/channels/kino-uhd/,https://i.imgur.com/kC4HixZ.png
 Kinouzhas.ru,Kinouzhas,Киноужас,,Gazprom Media,RU,,,c/RU,rus,movies,FALSE,,,,https://www.nastroykino.ru/kinouzhas/,https://i.imgur.com/mAcAAQF.png
 KinoweltTV.de,KinoweltTV,,,AMC Networks Inc.,DE,,,c/DE,deu,movies,FALSE,2004-05-12,,,https://www.kinowelt.tv/,https://upload.wikimedia.org/wikipedia/commons/thumb/0/0d/Kinowelt_TV_Logo_2020.svg/512px-Kinowelt_TV_Logo_2020.svg.png
@@ -14124,7 +14131,7 @@ KTNVDT4.us,KTNV-DT4,,Court TV,,US,US-NV,Las Vegas,s/US-NV,eng,,FALSE,,,,,https:/
 KTNWDT1.us,KTNW-DT1,,PBS,,US,US-WA,Tri-Cities,s/US-WA,eng,,FALSE,,,,http://www.ktnw.org/,https://upload.wikimedia.org/wikipedia/en/thumb/3/33/PBS_logo.svg/512px-PBS_logo.svg.png
 KTNWDT2.us,KTNW-DT2,,Create,,US,US-WA,Tri-Cities,s/US-WA,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/7/71/Create_TV_network_logo.svg/512px-Create_TV_network_logo.svg.png
 KTO.fr,KTO,,,,FR,,,c/FR;c/UK;c/PT;c/ES;c/DK;c/NL;c/BE;c/CH,fra,,FALSE,,,,https://www.ktotv.com/,https://i.imgur.com/EY6TsdV.png
-Ktoestkto.ru,Kto est kto,Кто есть кто,,,RU,,,c/RU,rus,,FALSE,,,,http://www.kto-is-kto.ru/,https://i.imgur.com/jAsj6yl.png
+Ktoestkto.ru,Kto est kto,Кто есть кто,,Karavan,RU,,Moscow,c/RU,rus,education,FALSE,2007-11-17,,,http://www.kto-is-kto.ru/,https://i.imgur.com/PmD17UQ.png
 KTOODT1.us,KTOO-DT1,,Alaska Public Media,,US,US-AK,Juneau,s/US-AK,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/en/thumb/3/33/PBS_logo.svg/512px-PBS_logo.svg.png
 KTOODT2.us,KTOO-DT2,,Create,,US,US-AK,Juneau,s/US-AK,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/7/71/Create_TV_network_logo.svg/512px-Create_TV_network_logo.svg.png
 KTOODT3.us,KTOO-DT3,,PBS,,US,US-AK,Juneau,s/US-AK,eng,education,FALSE,,,,https://www.ktoo.org/360tv/#page=schedule&day=20221009&provider=Broadcast,https://i.imgur.com/ppn5oJy.png
@@ -14691,7 +14698,7 @@ KVMEDT1.us,KVME-DT1,,Jewelry Television,,US,US-CA,Bishop,s/US-CA,eng,,FALSE,,,,h
 KVMEDT2.us,KVME-DT2,,H&I,,US,US-CA,Bishop,s/US-CA,eng,,FALSE,,,,https://www.handitv.com/,https://upload.wikimedia.org/wikipedia/en/thumb/9/9e/Heroes_%26_Icons_logo.svg/512px-Heroes_%26_Icons_logo.svg.png
 KVMMCD2.us,KVMM-CD2,,Infomercials,,US,US-CA,Santa Barbara,s/US-CA,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/f/f6/As_seen_on_TV.svg/512px-As_seen_on_TV.svg.png
 KVMYDT1.us,KVMY-DT1,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/JKjDl3M.png
-KVNTV.ru,KVN TV,КВН ТВ,,,RU,,,c/RU,rus,comedy,FALSE,,,,https://kvn.ru/,https://i.imgur.com/Xm0zRj2.png
+KVNTV.ru,KVN TV,КВН ТВ,,Red Media,RU,,,c/RU,rus,entertainment,FALSE,2016-06-01,,,https://kvn.ru/,https://i.imgur.com/Vw3LFLX.png
 KVOADT1.us,KVOA-DT1,,NBC,,US,US-AZ,Tucson,s/US-AZ,eng,,FALSE,,,,http://www.kvoa.com/,https://upload.wikimedia.org/wikipedia/commons/thumb/7/7a/NBC_logo_2022_%28vertical%29.svg/512px-NBC_logo_2022_%28vertical%29.svg.png
 KVOADT2.us,KVOA-DT2,,Cozi TV,,US,US-AZ,Tucson,s/US-AZ,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/f/f4/Cozi_TV_logo.svg/512px-Cozi_TV_logo.svg.png
 KVOADT3.us,KVOA-DT3,,Ion Mystery,,US,US-AZ,Tucson,s/US-AZ,eng,,FALSE,,,,,https://upload.wikimedia.org/wikipedia/commons/thumb/f/fb/ION_Mystery_logo.svg/512px-ION_Mystery_logo.svg.png
@@ -16924,7 +16931,7 @@ Mult.ru,Mult,Мульт,,VGTRK,RU,,,c/RU,rus;kaz,kids,FALSE,,,,http://mult-chann
 MulticanalCatamayo.ec,Multicanal Catamayo,,,,EC,EC-L,,s/EC-L,spa,,FALSE,,,,https://tv.multicanalcatamayo.com/,https://i.imgur.com/IHKBGmu.png
 MulticanalTelevision.co,Multicanal Television,Multicanal Televisión,,,CO,CO-CUN,Bogotá,s/CO-CUN;s/CO-CAU,spa,,FALSE,,,,https://multicanaltvcali.com/,https://i.imgur.com/hPxt2OK.png
 Multideporte.es,Multideporte,,,,ES,,,c/ES,spa,,FALSE,,,,http://www.plus.es/canal/multideporte/cpev,https://i.imgur.com/fGXiboW.png
-Multik.ru,Multik,Мультик,,,RU,,,c/RU,rus,kids,FALSE,2017-02-01,2020-01-01,,http://multikhd.tv/,https://i.imgur.com/d944b2Q.png
+Multik.ru,Multik,Мультик,,First TVCH,RU,,,c/RU,rus,kids,FALSE,2017-02-01,2020-01-01,Arsenal.ru,http://multikhd.tv/,https://i.imgur.com/d944b2Q.png
 Multilandia.ru,Multilandia,Мультиландия,,,RU,,,c/RU,rus,kids,FALSE,,,,https://multilandia.tv/,https://i.imgur.com/DKd38TF.png
 Multimania.ru,Multimania,,,ООО Теледистрибьюция,RU,,,c/RU;c/EE;c/LV,rus,animation;kids,FALSE,2015-04-30,,,http://www.multimania.lv,https://i.imgur.com/abh8ZBA.png
 MultimediosBajio.mx,Multimedios Bajio,Multimedios Bajío,,,MX,,,c/MX,spa,,FALSE,,,,https://www.multimedios.com/video/bajio-tv-en-vivo/v17351,https://i.imgur.com/4IGzNdq.png
@@ -17227,7 +17234,8 @@ NanningCityLifestyleChannel.cn,Nanning City & Lifestyle Channel,都市生活频
 NanningComprehensiveNewsChannel.cn,Nanning Comprehensive News Channel,新闻综合频道,,,CN,,Nanning,c/CN,zho,news,FALSE,,,,http://www.nntv.cn/live/nntv_xw/,https://www.tvchinese.net/uploads/tv/nnxwzh.jpg
 NanningMovieEntertainmentChannel.cn,Nanning Movie & Entertainment Channel,影视娱乐频道,,,CN,,Nanning,c/CN,zho,movies,FALSE,,,,http://www.nntv.cn/live/nntv_ys/,https://www.tvchinese.net/uploads/tv/nlysyl.jpg
 NanningPublicChannel.cn,Nanning Public Channel,公共频道,,,CN,,Nanning,c/CN,zho,general,FALSE,,,,http://www.nntv.cn/live/nntv_gg/,https://www.tvchinese.net/uploads/tv/nnggpd.jpg
-NanoTV.ru,Nano TV,Нано ТВ,,,RU,,,c/RU,rus,,FALSE,,,,https://tv-nano.ru/,https://i.imgur.com/0eEjt0F.png
+Nano.ru,Nano,Нано,,Nano,RU,,Moscow,c/RU,rus,documentary,FALSE,2011-04-01,,,https://tv-nano.ru/,https://i.imgur.com/dYj3XDa.png
+NanoHD.ru,Nano HD,,,Nano,RU,,,c/RU,rus,documentary,FALSE,2018-04-01,,,http://nanohd.tv/,https://i.imgur.com/8xdU3Ry.png
 NANTV.bd,NAN TV,,,,BD,,,c/BD,ben,general,FALSE,,,,,https://www.jagobd.com/wp-content/uploads/2019/11/NAN-TV-Logo-02.png
 NanyangComprehensiveNewsChannel.cn,Nanyang Comprehensive News Channel,新闻综合频道,,,CN,,Nanyang,c/CN,zho,news,FALSE,,,,,https://www.tvchinese.net/uploads/tv/nyxwzhpd.jpg
 NanyangGraphicInformationChannel.cn,Nanyang Graphic & Information Channel,图文信息频道,,,CN,,Nanyang,c/CN,zho,general,FALSE,,,,,https://www.tvchinese.net/uploads/tv/nytwxx.jpg
@@ -18286,7 +18294,7 @@ NTVBaltic.ru,NTV-Baltic,НТВ-Baltic,,,RU,,,c/RU,rus,,FALSE,,,,http://www.ntvmi
 NTVBelarus.by,NTV-Belarus,НТВ-Беларусь,,,BY,,,c/BY,bel,general,FALSE,2006-07-04,,,http://tvr.by/rus/ntv.asp,https://i.imgur.com/QLuUIeB.png
 NTVEurope.bd,NTV Europe,,,,BD,,,c/UK,ben,general,FALSE,,,,https://europentv.ntvbd.com/,https://europentv.ntvbd.com/sites/all/themes/sloth/logo.png
 ntvEvent.de,n-tv Event,,,,DE,,,c/DE,deu,,FALSE,,,,,https://i.imgur.com/9FPXcFY.jpg
-NTVHit.ru,NTV-Hit,НТВ-Хит,,,RU,,,c/RU,rus,series,FALSE,,,,https://www.ntv.ru/,https://i.imgur.com/5RFslxi.png
+NTVHit.ru,NTV-Hit,НТВ-Хит,,Gazprom Media,RU,,Moscow,c/RU,rus,series,FALSE,2018-01-01,,,https://www.ntv.ru/air/ntvhit/,https://i.imgur.com/FfKBvz5.png
 NTVIC.ba,NTV IC,,,,BA,,,c/BA,bos,,FALSE,,,,http://www.ntvic.ba/,https://i.imgur.com/NDoqc3X.png
 NTVICKakanj.ba,NTV IC Kakanj,,,,BA,,,c/BA,bos,,FALSE,,,,http://www.ntvic.ba/,https://i.imgur.com/EtaHm2P.png
 NTVItahari.np,NTV Itahari,,,,NP,,,c/NP,nep,,FALSE,,,,https://nepaltvonline.com/,https://i.imgur.com/lxQAb3k.png
@@ -18299,7 +18307,7 @@ NTVNews24.jp,NTV News 24,,,,JP,,,c/JP,jpn,news,FALSE,,,,http://www.news24.jp/,ht
 NTVPlus.np,NTV Plus,,,,NP,,,c/NP,nep,,FALSE,1996-09-01,,,https://nepaltvonline.com/,https://i.imgur.com/aKcUVJ2.png
 NTVSeries.ru,NTV Series,НТВ Сериал,,,RU,,,c/RU,rus,series,FALSE,,,,https://www.ntv.ru/air/ntvseries/,https://i.imgur.com/QdVa8tl.png
 NTVSpor.tr,NTV Spor,,,Doğuş Media Group,TR,,,c/TR,tur,sports,FALSE,2008-03-17,2018-03-17,DMAXTurkey.tr,http://www.ntvspor.net/,https://i.imgur.com/5pvsIsL.png
-NTVStyle.ru,NTV Style,НТВ Стиль,,,RU,,,c/RU,rus,lifestyle,FALSE,,,,https://www.ntv.ru/air/ntvstyle/,https://i.imgur.com/rX6K6qT.png
+NTVStyle.ru,NTV Style,НТВ Стиль,,Gazprom Media,RU,,,c/RU,rus,lifestyle,FALSE,2016-10-24,,,https://www.ntv.ru/air/ntvstyle/,https://i.imgur.com/rX6K6qT.png
 NTVTelugu.in,NTV Telugu,,,,IN,,,c/IN,tel,,FALSE,,,,https://www.ntvtelugu.com/,https://i.imgur.com/WqTIoWS.png
 NTVUganda.ug,NTV Uganda,,,,UG,,,c/UG,eng,,FALSE,,,,https://www.ntv.co.ug/,https://i.imgur.com/ej5A6RZ.png
 NuartTV.ru,Nuart TV,,,,RU,,,c/RU,rus,xxx,TRUE,,,,http://nuart.tv/,https://i.imgur.com/2ScRtyd.png
@@ -18701,7 +18709,7 @@ ORTCTV.km,ORTC TV,,,,KM,,,c/KM,fra,,FALSE,,,,https://www.ortc.fr/,https://i.imgu
 ORTM1.ml,ORTM 1,,,,ML,,,c/ML,fra,,FALSE,,,,https://www.ortm.ml/ortm1,https://i.imgur.com/eKUpcls.png
 ORTM2.ml,ORTM 2,,,,ML,,,c/ML,fra,,FALSE,,,,https://www.ortm.ml/ortm2,https://i.imgur.com/GQ4fHsv.png
 ORTSTV.nl,ORTS TV,,,,NL,,,c/NL,nld,,FALSE,,,,https://orts.nl/,https://i.imgur.com/RZM4Myo.png
-Oruzhie.ru,Oruzhie,Оружие,,,RU,,,c/RU,rus,,FALSE,,,,http://www.oruzhie.tv/,https://i.imgur.com/lfJQJqa.png
+Oruzhie.ru,Oruzhie,Оружие,,Feniks-Tver,RU,,Moscow,c/RU,rus,,FALSE,2010-09-01,,,http://www.oruzhie.tv/,https://i.imgur.com/lfJQJqa.png
 OSBCTV.ng,OSBC TV,,,,NG,,,c/NG,eng,,FALSE,,,,https://osbcng.org/,https://i.imgur.com/lj9WEq8.png
 OscarMoviesBhojpuri.in,Oscar Movies Bhojpuri,,,OSM Network,IN,,,c/IN,bho,movies,FALSE,,,,http://www.oscarmoviesbhojpuri.tv/,https://upload.wikimedia.org/wikipedia/en/e/e7/Oscar-Movies_Bhojpuri.jpg
 OscarsporMovistarPlus.es,Oscars por Movistar+,,,,ES,,,c/ES,spa,entertainment,FALSE,2022-01-22,,,,https://i.imgur.com/HxkZ7Pa.png
@@ -21364,9 +21372,10 @@ RussianExtreme.ru,Russian Extreme,,,,RU,,,c/RU,rus,sports,FALSE,,,,https://www.e
 RussianExtremeRetro.ru,Russian Extreme Retro,Русский Экстрим,,,RU,,,c/RU,rus,sports,FALSE,,,,https://www.extremtv.ru/retro/,https://i.imgur.com/vjquXks.png
 RussianExtremeUltra.ru,Russian Extreme Ultra,,,,RU,,,c/RU,rus,sports,FALSE,,,,https://www.extremtv.ru/russian-extreme-ultra/,https://i.imgur.com/Dk8VbAc.png
 RussianNight.ru,Russian Night,Русская Ночь,,,RU,,,c/RU,rus,xxx,TRUE,,,,https://www.rusnight.ru/,https://i.imgur.com/gppionM.png
-RusskiyBestseller.ru,Russkiy Bestseller,Русский Бестселлер,,,RU,,,c/RU,rus,movies,FALSE,,,,https://bestrussia.tv/,https://i.imgur.com/8ey32hB.png
+RusskiyBestseller.ru,Russkiy Bestseller,Русский бестселлер,,VGTRK,RU,,Moscow,c/RU,rus,movies,FALSE,2012-10-01,,,https://bestrussia.tv/,https://i.imgur.com/w0ZE9QJ.png
-RusskiyDetektiv.ru,Russkiy Detektiv,Русский Детектив,,VGTRK,RU,,,c/RU,rus,movies,FALSE,,,,https://rudetective.tv/,https://i.imgur.com/H3qhN8S.png
+RusskiyDetektiv.ru,Russkiy Detektiv,Русский детектив,,VGTRK,RU,,Moscow,c/RU,rus,movies,FALSE,2014-04-04,,,https://rudetective.tv/,https://i.imgur.com/H3qhN8S.png
-RusskiyIllusion.ru,Russkiy Illusion,Русский Иллюзион,,,RU,,,c/RU,rus,,FALSE,,,,http://russkiyillusion.ru/,https://i.imgur.com/RlsqFN8.png
+RusskiyIllusion.ru,Russkiy Illusion,Русский Иллюзион,,Stream,RU,,,c/RU,rus,movies,FALSE,2004-07-01,,,http://russkiyillusion.ru/,https://i.imgur.com/RlsqFN8.png
+RusskiyIllusionInternationalversion.ru,Russkiy Illusion. International version,Русский иллюзион. Международная версия,,Stream,RU,,,r/CIS,rus,movies,FALSE,2015-01-01,,,https://tv-stream.ru/,https://i.imgur.com/fcEUDPA.png
 RusskiyMir.ru,Russkiy Mir,Русский мир,,,RU,,,c/RU,rus,,FALSE,,,,https://tv.russkiymir.ru/,https://i.imgur.com/zKAusgn.png
 RusskiyRoman.ru,Russkiy Roman,Русский Роман,,VGTRK,RU,,,c/RU,rus,movies,FALSE,,,,https://rusroman.ru/,https://i.imgur.com/cQN0P2B.png
 RusskiySever.ru,Russkiy Sever,Русский Север,,,RU,,Vologda,c/RU,rus,,FALSE,,,,https://rusevertv.ru/,https://i.imgur.com/BxAyQTx.png
@@ -21528,7 +21537,7 @@ SanMarinoRTV.sm,San Marino RTV,,,,SM,,,c/SM;c/IT,ita,,FALSE,,,,https://www.sanma
 SanMarinoRTVSport.sm,San Marino RTV Sport,,,,SM,,,c/SM;c/IT,ita,sports,FALSE,,,,,https://i.imgur.com/PGm944g.png
 SanookTV.th,Sanook TV,,,,TH,,,c/TH,tha,,FALSE,,,,https://www.mvtv.co.th/channel/sanook-tv,https://i.imgur.com/TtVltHi.png
 SanPedroTV.ar,San Pedro TV,,,,AR,AR-B,San Pedro,s/AR-B,spa,,FALSE,,,,https://www.sanpedrotv.com.ar/,https://i.imgur.com/UkpXogr.png
-SanPorto.ru,San Porto,,,,RU,,,c/RU,rus,,FALSE,2020-06-01,,,https://sanporto.tv/ru/,https://i.imgur.com/EhMheMC.png
+SanPorto.ru,San Porto,,,San Porto TV,RU,,,c/RU,rus,entertainment,FALSE,2020-06-01,,,https://sanporto.tv/ru/,https://i.imgur.com/EhMheMC.png
 SansadTV.in,Sansad TV,,,Government of India,IN,,New Delhi,c/IN,hin;eng,legislative,FALSE,2021-09-15,,,https://sansadtv.nic.in/,https://i.imgur.com/TWSZC2H.png
 SanshaTV.cn,Sansha TV,,,,CN,,,c/CN,zho,,FALSE,,,,,https://i.imgur.com/u80SRzi.png
 SanskarTV.in,Sanskar TV,संस्कार,Sanskar Info TV Private Ltd,Baba Ramdev,IN,,Noida,c/IN,hin,religious;culture,FALSE,2000-06-01,,,https://app.sanskargroup.in/,https://i.imgur.com/SDkiMvR.png
@@ -21932,8 +21941,8 @@ ShopLC.us,Shop LC,,,Vaibhav Global,US,,,c/US,eng,shop,FALSE,2007-01-01,,,https:/
 ShopMongolia.mn,Shop Mongolia,,,,MN,,,c/MN,mon,shop,FALSE,,,,,https://i.imgur.com/rWO8cMK.png
 ShoppingLive.ru,Shopping Live,,,,RU,,,c/RU,rus,shop,FALSE,,,,https://www.shoppinglive.ru/,https://i.imgur.com/EMmGnjV.png
 ShoppingNT.kr,Shopping NT,쇼핑엔티,,,KR,,,c/KR,kor,shop,FALSE,,,,https://www.shoppingntmall.com/,https://i.imgur.com/BgbJp5X.png
-ShoppsterTVSrbija.rs,Shoppster TV Srbija,,,,RS,,,c/RS,slv,shop,FALSE,,,,https://www.shoppster.rs/,https://i.imgur.com/RHxFi1e.jpg
+ShoppsterTV.rs,Shoppster TV,,,Slovenia Broadband s.a.r.l.,RS,,Belgrade,c/RS,slv,shop,FALSE,,,,https://www.shoppster.com/,https://i.imgur.com/l9AgNe8.png
-ShopShow.ru,Shop & Show,,,,RU,,,c/RU,rus,shop,FALSE,,,,https://shopandshow.ru/,https://i.imgur.com/ZTJcF5w.png
+ShopShow.ru,Shop&Show,,,,RU,,,c/RU,rus,shop,FALSE,,,,https://shopandshow.ru/,https://i.imgur.com/T4iEBdx.png
 Shoptime.br,Shoptime,,,B2W,BR,,,c/BR,por,shop,FALSE,,,,https://www.shoptime.com.br/,https://i.imgur.com/wcsIaWu.png
 ShopTV.ph,Shop TV,,,,PH,,,c/PH,eng,shop,FALSE,2005-11-01,,,https://www.shoptv.com.ph/,https://i.imgur.com/RUQASCU.png
 ShortsTV.uk,ShortsTV,,,,UK,,,c/UK,eng,movies,FALSE,,,,https://shorts.tv/,https://i.imgur.com/426L1ig.png
@@ -22896,7 +22905,7 @@ StarClassics.us,Star Classics,,,,US,,,c/US,eng,classic,FALSE,,,,,https://i.imgur
 StarComedy.us,Star Comedy,,,,US,,,c/US,eng,comedy,FALSE,,,,,https://i.imgur.com/B5mfsxU.png
 StarEntertainmentChannel.hk,Star Entertainment Channel,SEC;星衛娛樂台,,The Walt Disney Company,HK,,,c/HK,zho,movies,FALSE,2012-12-01,,,https://www.dngtw.tw/sec/,https://i.imgur.com/c8tHTne.png
 StarEPlus.tz,Star E +,,,,TZ,,,c/TZ,eng,,FALSE,,,,,https://i.imgur.com/8kb4HKD.png
-StarFamily.ua,Star Family,,,,UA,,,c/UA;c/RU,rus,family,FALSE,,,,,https://i.imgur.com/eGuGHnZ.png
+StarFamily.ru,Star Family,,,Media Telecom,RU,,,c/RU,rus,movies,FALSE,2018-01-01,,,,https://i.imgur.com/eGuGHnZ.png
 StarFolkTV.mk,Star Folk TV,,,,MK,,,c/MK,mkd,music,FALSE,,,,https://starfolk.net/,https://i.imgur.com/fM7FUgk.png
 StarFun.us,Star Fun,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/5AbAkPU.png
 StarFunPlus3.us,Star Fun +3,,,,US,,,c/US,eng,,FALSE,,,,,https://i.imgur.com/nbjDDBg.png
@@ -23756,7 +23765,7 @@ TavushTV.am,Tavush TV,,,Tavush Media,AM,,Noyemberyan,c/AM,hye,,FALSE,2010-01-01,
 TawafTV.id,Tawaf TV,,,,ID,,,c/ID,ind,,FALSE,,,,https://www.tawaf.tv/,https://i.imgur.com/pjYTa3P.png
 TaybaTV.sd,Tayba TV,قناة طيبة الفضائية,,,SD,,Khartoum,c/SD,ara,general,FALSE,,,,https://tayba.tv/livestream/,https://user-images.githubusercontent.com/41021857/75287296-67145080-581a-11ea-8978-5e31cdd84243.jpg
 Tayna.ru,Tayna,Тайна,,,RU,,,c/RU,rus,,FALSE,,,,https://tayna.tv/,https://i.imgur.com/S5BNJMp.png
-TaynyGalaktiki.ru,Tayny Galaktiki,Тайны Галактики,,,RU,,,c/RU,rus,,FALSE,,,,https://www.galaxy-tv.ru/,https://i.imgur.com/fR3abSD.png
+TaynyGalaktiki.ru,Tayny Galaktiki,Тайны Галактики;Galaxy,,NSK Studio,RU,,Moscow,c/RU,rus,documentary,FALSE,2009-04-12,,,https://www.galaxy-tv.ru/,https://i.imgur.com/fR3abSD.png
 TAYTV.tr,TAY TV,,,,TR,,,c/TR,tur,,FALSE,,,,https://www.tjk.org/,https://i.imgur.com/OeAJ5Mr.png
 Tb1.ba,Tb1,Tß1,,Callidus d.o.o. Trebinje,BA,,,c/BA,bos,,FALSE,,,,,https://i.imgur.com/ZwRnB5z.png
 TBAENetwork.us,TBAE Network,,,,US,US-FL,Tampa Bay,s/US-FL,eng,education,FALSE,,,,https://watch.tbae.net/,https://i.imgur.com/1ZOXJYu.png
@@ -23925,7 +23934,7 @@ TelebrandsIndia.in,Telebrands India,,,,IN,,,c/IN,eng,,FALSE,,,,http://www.telebr
 TeleC.bo,TeleC,,,,BO,BO-C,Cochabamba,s/BO-C,spa,,FALSE,,,,https://telec.com.bo/,https://i.imgur.com/YiXDawq.png
 Telecadena7y4.hn,Telecadena 7 y 4,,,,HN,,,c/HN,spa,,FALSE,,,,https://www.televicentro.hn/,https://i.imgur.com/3gzFNog.png
 Telecafe.co,Telecafe,Telecafé,,,CO,CO-CAL,Manizales,s/CO-CAL;s/CO-QUI;s/CO-RIS,spa,,FALSE,,,,https://telecafe.gov.co/,https://i.imgur.com/GN4JWDJ.png
-Telecafe.ru,Telecafe,Телекафе,,,RU,,,c/RU,rus,,FALSE,,,,https://www.telecafe.ru/,https://i.imgur.com/D2p4GaB.png
+Telecafe.ru,Telecafe,Телекафе,,Digital telefamily,RU,,Moscow,c/RU,rus,cooking,FALSE,2007-11-21,,,https://www.telecafe.ru/,https://i.imgur.com/1H3h1HL.png
 Telecafe2.co,Telecafe 2,Telecafé 2,,,CO,,,c/CO,spa,,FALSE,,,,http://www.telecafe.gov.co/,https://i.imgur.com/v3ksRmK.png
 Telecanal.cl,Telecanal,,,Albavisión,CL,,,c/CL,spa,,FALSE,2005-12-05,,,https://www.telecanal.cl/,https://i.imgur.com/3g6SbSt.png
 Telecanal12.do,Telecanal 12,,,,DO,,,c/DO,spa,,FALSE,,,,https://telecanal12.net/,https://i.imgur.com/90cTK8S.png
@@ -24763,7 +24772,7 @@ TopNews.al,Top News,,DigitAlb,Top Media,AL,,,c/AL,sqi,news,FALSE,,,,https://top-
 TopNews.th,Top News,,,,TH,,,c/TH,tha,news,FALSE,,,,https://www.topnews.co.th/,https://i.imgur.com/tRFnV9M.png
 TopperTV.in,Topper TV,,,,IN,,,c/IN,eng;hin,,FALSE,,,,,https://i.imgur.com/Wal00Lt.png
 ToprakTV.tr,Toprak TV,,,,TR,,,c/TR,tur,,FALSE,,,,https://www.toprak.tv/,https://i.imgur.com/JGnS0qs.png
-TopSecret.ru,Top Secret,Совершенно секретно,,,RU,,,c/RU,rus,,FALSE,,,,https://sovsekretno.tv/,https://i.imgur.com/HM4xy4G.png
+TopSecret.ru,Top Secret,Совершенно секретно,,Sovershenno sekretno,RU,,,c/RU,rus,documentary,FALSE,2006-11-01,,,https://sovsekretno.tv/,https://i.imgur.com/HM4xy4G.png
 TopShopTV.ru,Top Shop TV,,,,RU,,,c/RU,rus,shop,FALSE,,,,https://www.top-shop.ru/,https://i.imgur.com/5P9Rw06.png
 TopStoriesbyNewsy.us,Top Stories by Newsy,,,,US,,,c/US,eng,news,FALSE,,,,,https://i.imgur.com/UfN6aAi.png
 TopTV.cg,Top TV,,,,CG,,,c/CG,fra,,FALSE,,,,,https://i.imgur.com/vb4UE7u.png
@@ -26549,7 +26558,7 @@ UlibkaRebyonka.ru,Ulibka Rebyonka,Улыбка ребёнка,,,RU,,,c/RU,rus,ki
 UlkeTV.tr,Ulke TV,Ülke TV,,,TR,,,c/TR,tur,,FALSE,,,,https://www.ulketv.com.tr/,https://i.imgur.com/wdWR7Qk.png
 ULosLagosTV.cl,U Los Lagos TV,,,,CL,CL-LL,,c/CL,spa,,FALSE,,,,http://medios.ulagos.cl/,https://i.imgur.com/HxUZseV.png
 UltraFamilia.us,Ultra Familia,,,,US,,,c/US,eng,family,FALSE,,,,http://www.olympusat.com/networks/ultra-familia,https://i.imgur.com/y3acW0D.png
-UltraHDCinema.ru,Ultra HD Cinema,,,,RU,,,c/RU,rus,movies,FALSE,,,,https://www.tricolor.tv/channels/ultra-hd-cinema/,https://i.imgur.com/vZGdGaI.png
+UltraHDCinema.ru,Ultra HD Cinema,,,Signal Media,RU,,,c/RU,rus,movies,FALSE,2018-01-01,,,https://www.tricolor.tv/channels/ultra-hd-cinema/,https://i.imgur.com/1oxzSNz.png
 UltraNature.fr,Ultra Nature,,,,FR,,,c/FR,fra,documentary,FALSE,2016-05-19,,,,https://i.imgur.com/idxsy77.png
 UltraTV4K.pl,Ultra TV 4K,,,,PL,,,c/PL,pol,music,FALSE,,,,,https://i.imgur.com/sRtjNdd.png
 UltraTVPuebla.mx,Ultra TV Puebla,,Ultra FM,,MX,,Puebla,c/MX,spa,,FALSE,,,,https://puebla.ultralaradio.mx/,https://www.ultralaradio.mx/sad/imagenes/sucursales/1.png
@@ -27145,7 +27154,7 @@ VOOsportWorld1.be,VOOsport World 1,,,,BE,,,c/BE,fra,sports,FALSE,,,,https://www.
 VOOsportWorld2.be,VOOsport World 2,,,,BE,,,c/BE,fra,sports,FALSE,,,,https://www.voo.be/en/tv/voosport-world,https://i.imgur.com/rxDARkz.png
 VOOsportWorld3.be,VOOsport World 3,,,,BE,,,c/BE,fra,sports,FALSE,,,,https://www.voo.be/en/tv/voosport-world,https://i.imgur.com/tBoAVHY.png
 VOOsportWorld4.be,VOOsport World 4,,,,BE,,,c/BE,fra,sports,FALSE,,,,https://www.voo.be/en/tv/voosport-world,https://i.imgur.com/ILobm2s.png
-VoprosyiOtvety.ru,Voprosy i Otvety,Вопросы и ответы,,,RU,,,c/RU,rus,,FALSE,2009-10-01,2017-05-15,,http://tv-stream.ru/channels,https://i.imgur.com/yjETxk1.png
+VoprosyiOtvety.ru,Voprosy i Otvety,Вопросы и ответы,,Stream,RU,,,r/CIS,rus,entertainment,FALSE,2009-10-01,,,http://tv-stream.ru/channels,https://i.imgur.com/yjETxk1.png
 Vorterix.ar,Vorterix,,,,AR,,,c/AR,spa,entertainment,FALSE,,,,https://vorterix.com/,https://i.imgur.com/RWL10TG.png
 VosgesTV.fr,Vosges TV,,,,FR,,,c/FR,fra,,FALSE,,,,https://www.viavosges.tv/,https://i.imgur.com/7y7ancc.png
 VostokTV.ru,Vostok TV,Восток ТВ,,,RU,,,c/RU,rus,,FALSE,,,,http://vostok.tv/,https://i.imgur.com/X1RysL8.png
@@ -32834,7 +32843,7 @@ ZutTV.ve,Zut TV,,,,VE,,,r/HISPAM,spa,music,FALSE,,,,https://www.zut.tv/,https://
 ZUTV.ro,ZU TV,,,,RO,,,c/RO,ron,music,FALSE,,,,https://zutv.ro/,https://i.imgur.com/1gtkGhB.png
 ZuuTV.do,ZuuTV,,,,DO,,,c/DO,spa,general,FALSE,,,,https://zuutv.net/,https://i.imgur.com/SnXwTns.png
 Zvezda.ru,Zvezda,Звезда,,Russian Ministry of Defence,RU,,,c/RU,rus,general,FALSE,,,,https://tvzvezda.ru/,https://i.imgur.com/4PAcpfM.png
-ZvezdaPlus.ru,Zvezda Plus,Звезда Плюс,,,RU,,,c/RU,rus,,FALSE,,,,https://tvzvezda.ru/sp/zvezda-plus/,https://i.imgur.com/NNmjD9Z.png
+ZvezdaPlus.ru,Zvezda Plus,Звезда Плюс,,Zvezda;Red Media,RU,,Moscow,c/RU,rus,,FALSE,2021-02-23,,,https://tvzvezda.ru/sp/zvezda-plus/,https://i.imgur.com/NNmjD9Z.png
-ZvezdaTV.rs,Zvezda TV,,,,RS,,,c/RS,srp,,FALSE,,,,,https://i.imgur.com/wLYPmFM.png
+ZvezdaTV.rs,Zvezda TV,Звезда ТВ,,Fudbalski klub Crvena zvezda,RS,,Belgrade,c/RS,srp,sports,FALSE,,,,http://crvenazvezdafk.com/,https://i.imgur.com/oxHaNOZ.png
 ZVTAVS.nl,ZVT-AVS,,,,NL,,,c/NL,nld,,FALSE,,,,,https://i.imgur.com/KwBBHpZ.png
 ZweiMusicTelevision.de,Zwei Music Television,,Folx Network,,DE,,,c/DE,deu,music,FALSE,,,,https://folx.network/zwei-music-television/,https://i.imgur.com/RbdpCNf.png

package.json

@@ -7,7 +7,7 @@
     "db:validate": "ts-node scripts/db/validate.ts",
     "db:export": "ts-node scripts/db/export.ts",
     "db:update": "ts-node scripts/db/update.ts",
-    "lint": "npx eslint ./scripts/**/*.ts ./scripts/**/*.js ./tests/**/*.ts",
+    "lint": "npx eslint \"{scripts,tests}/**/*.{ts,js}\"",
     "test": "jest --runInBand"
   },
   "pre-commit": [

scripts/db/update.ts

@@ -84,24 +84,40 @@ async function editChannels({ loader, idCreator }: { loader: IssueLoader; idCrea
       channelId = idCreator.create(name, country)
     }
 
+    const deleteSymbol = '~'
     const updated = new Channel({
       id: channelId,
-      name: data.get('name'),
+      name: data.get('name') !== deleteSymbol ? data.get('name') : '',
-      alt_names: data.has('alt_names') ? data.get('alt_names').split(';') : [],
+      alt_names:
-      network: data.get('network'),
+        data.has('alt_names') && data.get('alt_names') !== deleteSymbol
-      owners: data.has('owners') ? data.get('owners').split(';') : [],
+          ? data.get('alt_names').split(';')
-      country: data.get('country'),
+          : [],
-      subdivision: data.get('subdivision'),
+      network: data.get('network') !== deleteSymbol ? data.get('network') : '',
-      city: data.get('city'),
+      owners:
-      broadcast_area: data.has('broadcast_area') ? data.get('broadcast_area').split(';') : [],
+        data.has('owners') && data.get('owners') !== deleteSymbol
-      languages: data.has('languages') ? data.get('languages').split(';') : [],
+          ? data.get('owners').split(';')
-      categories: data.has('categories') ? data.get('categories').split(';') : [],
+          : [],
+      country: data.get('country') !== deleteSymbol ? data.get('country') : '',
+      subdivision: data.get('subdivision') !== deleteSymbol ? data.get('subdivision') : '',
+      city: data.get('city') !== deleteSymbol ? data.get('city') : '',
+      broadcast_area:
+        data.has('broadcast_area') && data.get('broadcast_area') !== deleteSymbol
+          ? data.get('broadcast_area').split(';')
+          : [],
+      languages:
+        data.has('languages') && data.get('languages') !== deleteSymbol
+          ? data.get('languages').split(';')
+          : [],
+      categories:
+        data.has('categories') && data.get('categories') !== deleteSymbol
+          ? data.get('categories').split(';')
+          : [],
       is_nsfw: data.has('is_nsfw') ? data.get('is_nsfw') === 'TRUE' : false,
-      launched: data.get('launched'),
+      launched: data.get('launched') !== deleteSymbol ? data.get('launched') : '',
-      closed: data.get('closed'),
+      closed: data.get('closed') !== deleteSymbol ? data.get('closed') : '',
-      replaced_by: data.get('replaced_by'),
+      replaced_by: data.get('replaced_by') !== deleteSymbol ? data.get('replaced_by') : '',
-      website: data.get('website'),
+      website: data.get('website') !== deleteSymbol ? data.get('website') : '',
-      logo: data.get('logo')
+      logo: data.get('logo') !== deleteSymbol ? data.get('logo') : ''
     })
 
     found.merge(updated)

scripts/models/channel.ts

@@ -85,7 +85,7 @@ export class Channel {
     const data: { [key: string]: string | string[] | boolean } = channel.data()
     for (const prop in data) {
       if (data[prop] === undefined) continue
-      if (Array.isArray(data[prop]) && !data[prop].length) continue
+      if (Array.isArray(data[prop]) && !(data[prop] as string[]).length) continue
       this[prop] = data[prop]
     }
   }

tests/__data__/expected/api/channels.json

@@ -1 +1 @@
-[{"id":"002RadioTV.do","name":"002 Radio TV","alt_names":[],"network":null,"owners":[],"country":"DO","subdivision":null,"city":null,"broadcast_area":["c/DO"],"languages":["spa"],"categories":["general"],"is_nsfw":false,"launched":null,"closed":null,"replaced_by":null,"website":"https://www.002radio.com/","logo":"https://i.imgur.com/7oNe8xj.png"},{"id":"BeijingSatelliteTV.cn","name":"Beijing Satellite TV","alt_names":["北京卫视"],"network":null,"owners":[],"country":"CN","subdivision":null,"city":"Beijing","broadcast_area":["c/CN"],"languages":["zho"],"categories":["general"],"is_nsfw":false,"launched":"1979-05-16","closed":null,"replaced_by":null,"website":"https://www.brtn.cn/btv/","logo":"https://i.imgur.com/vsktAez.png"},{"id":"M5.hu","name":"M5","alt_names":[],"network":null,"owners":[],"country":"HU","subdivision":null,"city":null,"broadcast_area":["c/HU"],"languages":["hun"],"categories":[],"is_nsfw":false,"launched":null,"closed":null,"replaced_by":null,"website":"https://www.mediaklikk.hu/m5/","logo":"https://i.imgur.com/y21wFd0.png"}]
+[{"id":"002RadioTV.do","name":"002 Radio TV","alt_names":[],"network":null,"owners":[],"country":"DO","subdivision":null,"city":null,"broadcast_area":["c/DO"],"languages":["spa"],"categories":["general"],"is_nsfw":false,"launched":null,"closed":null,"replaced_by":null,"website":"https://www.002radio.com/","logo":"https://i.imgur.com/7oNe8xj.png"},{"id":"BeijingSatelliteTV.cn","name":"Beijing Satellite TV","alt_names":["北京卫视"],"network":null,"owners":[],"country":"CN","subdivision":null,"city":"Beijing","broadcast_area":["c/CN"],"languages":["zho"],"categories":["general"],"is_nsfw":false,"launched":"1979-05-16","closed":null,"replaced_by":null,"website":"https://www.brtn.cn/btv/","logo":"https://i.imgur.com/vsktAez.png"},{"id":"M5.hu","name":"M5","alt_names":[],"network":null,"owners":[],"country":"HU","subdivision":null,"city":null,"broadcast_area":["c/HU"],"languages":["hun"],"categories":[],"is_nsfw":false,"launched":null,"closed":"2001-01-01","replaced_by":null,"website":"https://www.mediaklikk.hu/m5/","logo":"https://i.imgur.com/y21wFd0.png"}]

tests/__data__/input/data/channels.csv

@@ -1,4 +1,4 @@
 id,name,alt_names,network,owners,country,subdivision,city,broadcast_area,languages,categories,is_nsfw,launched,closed,replaced_by,website,logo
 002RadioTV.do,002 Radio TV,,,,DO,,,c/DO,spa,general,FALSE,,,,https://www.002radio.com/,https://i.imgur.com/7oNe8xj.png
 BeijingSatelliteTV.cn,Beijing Satellite TV,北京卫视,,,CN,,Beijing,c/CN,zho,general,FALSE,1979-05-16,,,https://www.brtn.cn/btv/,https://i.imgur.com/vsktAez.png
-M5.hu,M5,,,,HU,,,c/HU,hun,,FALSE,,,,https://www.mediaklikk.hu/m5/,https://i.imgur.com/y21wFd0.png
+M5.hu,M5,,,,HU,,,c/HU,hun,,FALSE,,2001-01-01,,https://www.mediaklikk.hu/m5/,https://i.imgur.com/y21wFd0.png

tests/__data__/input/issues/channels_edit_approved.js

@@ -61,7 +61,7 @@ module.exports = [
     closed_at: null,
     author_association: 'CONTRIBUTOR',
     active_lock_reason: null,
-    body: '### Channel ID (required)\n\nM5.hu\n\n### Channel Name\n\n_No response_\n\n### Alternative Names\n\n_No response_\n\n### Network\n\n_No response_\n\n### Owners\n\nDuna Médiaszolgáltató Nonprofit Zrt.\n\n### Country\n\n_No response_\n\n### Subdivision\n\n_No response_\n\n### City\n\n_No response_\n\n### Broadcast Area\n\n_No response_\n\n### Languages\n\n_No response_\n\n### Categories\n\n_No response_\n\n### NSFW\n\nFALSE\n\n### Launched\n\n_No response_\n\n### Closed\n\n_No response_\n\n### Replaced By\n\n_No response_\n\n### Website\n\n_No response_\n\n### Logo\n\n_No response_\n\n### Notes\n\n_No response_',
+    body: '### Channel ID (required)\n\nM5.hu\n\n### Channel Name\n\n_No response_\n\n### Alternative Names\n\n_No response_\n\n### Network\n\n_No response_\n\n### Owners\n\nDuna Médiaszolgáltató Nonprofit Zrt.\n\n### Country\n\n_No response_\n\n### Subdivision\n\n_No response_\n\n### City\n\n_No response_\n\n### Broadcast Area\n\n_No response_\n\n### Languages\n\n_No response_\n\n### Categories\n\n_No response_\n\n### NSFW\n\nFALSE\n\n### Launched\n\n_No response_\n\n### Closed\n\n~\n\n### Replaced By\n\n_No response_\n\n### Website\n\n_No response_\n\n### Logo\n\n_No response_\n\n### Notes\n\n_No response_',
     reactions: {
       url: 'https://api.github.com/repos/iptv-org/database/issues/5901/reactions',
       total_count: 0,