Merge pull request #15733 from iptv-org/apply-nonsfw-readme

iptv-org · Feb 1, 2024 · 049664f · 049664f
2 parents 1d75617 + bd16471
commit 049664f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.readme/supported-categories.md b/.readme/supported-categories.md
@@ -29,4 +29,3 @@
 | Sports        | Programming is sports                                                 |
 | Travel        | Programming is travel related                                         |
 | Weather       | Programming is focused on weather                                     |
-| XXX           | Programming is adult oriented and x-rated                             |
diff --git a/.readme/template.md b/.readme/template.md
@@ -24,22 +24,16 @@ Simply insert one of the links below into [any video player](https://github.com/
 
 ## Playlists
 
-There are several versions of playlists that differ in the way they are grouped.
+There are several versions of playlists that differ in the way they are grouped. As of January 30th, 2024, we have stopped distributing NSFW channels. For more information, please look at [this issue](https://github.com/iptv-org/iptv/issues/15723).
 
 ### Main playlist
 
-Playlist includes all known channels except adult channels.
+This playlist includes all known channels available in this repository.
 
 ```
 https://iptv-org.github.io/iptv/index.m3u
 ```
 
-And here is the full version:
-
-```
-https://iptv-org.github.io/iptv/index.nsfw.m3u
-```
-
 ### Grouped by category
 
 <details>

diff --git a/scripts/commands/playlist/generate.ts b/scripts/commands/playlist/generate.ts
@@ -65,8 +65,6 @@ async function main() {
   }).generate()
   logger.info('generating index.m3u...')
   await new IndexGenerator({ streams, logger: generatorsLogger }).generate()
-  logger.info('generating index.nsfw.m3u...')
-  await new IndexNsfwGenerator({ streams, logger: generatorsLogger }).generate()
   logger.info('generating index.category.m3u...')
   await new IndexCategoryGenerator({ streams, logger: generatorsLogger }).generate()
   logger.info('generating index.country.m3u...')

diff --git a/scripts/commands/playlist/validate.ts b/scripts/commands/playlist/validate.ts
@@ -82,6 +82,16 @@ async function main() {
           message: `"${stream.name}" is on the blocklist due to claims of copyright holders or NSFW content (${blocked.ref})`
         })
       }
+
+      const channel_NSFW = stream.channel && channels.first((channel: Channel) => (channel.id === stream.channel) && (channel.isNSFW === true))
+      if(channel_NSFW) {
+        log.add({
+          type: 'error',
+          line: stream.line,
+          message: `Since January 30th, 2024, NSFW channels are no longer allowed in our playlists. Please see https://github.com/iptv-org/iptv/issues/15723 for further information.`
+        })
+      }
+
     })
 
     if (log.notEmpty()) {