Merge branch 'master' into pr/15708

.github/ISSUE_TEMPLATE/_blocklist_add.yml

@@ -13,6 +13,17 @@ body:
     validations:
       required: true
 
+  - type: dropdown
+    id: reason
+    attributes:
+      label: Reason
+      description: Reason for blocking the channel
+      options:
+        - 'DMCA'
+        - 'NSFW'
+    validations:
+      required: true
+
   - type: input
     id: ref
     attributes:

CONTRIBUTING.md

@@ -107,6 +107,7 @@ List of channels blocked at the request of copyright holders.
 | Field   | Description                                     | Required | Example                           |
 | ------- | ----------------------------------------------- | -------- | --------------------------------- |
 | channel | Channel ID                                      | Required | `AnimalPlanetAfrica.us`           |
+| reason  | Reason for blocking                             | Required | `dmca`                            |
 | ref     | Link to removal request or DMCA takedown notice | Required | `https://example.com/issues/0000` |
 
 ## Channel Logo Guidelines

data/subdivisions.csv

@@ -3198,7 +3198,6 @@ UK,Wales,GB-WLS
 UM,Palmyra Atoll,UM-95
 US,Alabama,US-AL
 US,Alaska,US-AK
-US,American Samoa,US-AS
 US,Arizona,US-AZ
 US,Arkansas,US-AR
 US,California,US-CA
@@ -3208,7 +3207,6 @@ US,Delaware,US-DE
 US,District of Columbia,US-DC
 US,Florida,US-FL
 US,Georgia,US-GA
-US,Guam,US-GU
 US,Hawaii,US-HI
 US,Idaho,US-ID
 US,Illinois,US-IL
@@ -3233,18 +3231,15 @@ US,New Mexico,US-NM
 US,New York,US-NY
 US,North Carolina,US-NC
 US,North Dakota,US-ND
-US,Northern Mariana Islands,US-MP
 US,Ohio,US-OH
 US,Oklahoma,US-OK
 US,Oregon,US-OR
 US,Pennsylvania,US-PA
-US,Puerto Rico,US-PR
 US,Rhode Island,US-RI
 US,South Carolina,US-SC
 US,South Dakota,US-SD
 US,Tennessee,US-TN
 US,Texas,US-TX
-US,U.S. Virgin Islands,US-VI
 US,United States Minor Outlying Islands,US-UM
 US,Utah,US-UT
 US,Vermont,US-VT

scripts/db/update.ts

@@ -185,12 +185,14 @@ async function blockChannels({ loader }: { loader: IssueLoader }) {
     if (found) return
 
     const channel = data.getString('channel_id')
+    const reason = data.getString('reason')?.toLowerCase()
     const ref = data.getString('ref')
-    if (!channel || !ref) return
+    if (!channel || !reason || !ref) return
 
     blocklist.push(
       new Blocked({
         channel,
+        reason,
         ref
       })
     )

scripts/models/blocked.ts

@@ -1,14 +1,17 @@
 type BlockedProps = {
   channel: string
+  reason: string
   ref: string
 }
 
 export class Blocked {
   channel: string
+  reason: string
   ref: string
 
-  constructor({ ref, channel }: BlockedProps) {
+  constructor({ ref, reason, channel }: BlockedProps) {
     this.channel = channel
+    this.reason = reason
     this.ref = ref
   }
 }

scripts/schemes/blocklist.ts

@@ -4,5 +4,8 @@ export default {
   channel: Joi.string()
     .regex(/^[A-Za-z0-9]+\.[a-z]{2}$/)
     .required(),
+  reason: Joi.string()
+    .valid(...['dmca', 'nsfw'])
+    .required(),
   ref: Joi.string().uri().required()
 }

tests/__data__/expected/api/blocklist.json

@@ -1 +1 @@
-[{"channel":"AnimalPlanetAfrica.za","ref":"https://github.com/iptv-org/iptv/issues/1831"},{"channel":"BeijingSatelliteTV.cn","ref":"https://github.com/iptv-org/iptv/issues/1831"}]
+[{"channel":"AnimalPlanetAfrica.za","reason":"dmca","ref":"https://github.com/iptv-org/iptv/issues/1831"},{"channel":"BeijingSatelliteTV.cn","reason":"dmca","ref":"https://github.com/iptv-org/iptv/issues/1831"}]

tests/__data__/expected/data/blocklist.csv

@@ -1,3 +1,3 @@
-channel,ref
+channel,reason,ref
-beINMoviesTurk.tr,https://github.com/iptv-org/iptv/issues/1831
+beINMoviesTurk.tr,dmca,https://github.com/iptv-org/iptv/issues/1831
-HGTVHungary.hu,https://github.com/iptv-org/iptv/issues/1831
+HGTVHungary.hu,nsfw,https://github.com/iptv-org/iptv/issues/1831

tests/__data__/input/data/blocklist.csv

@@ -1,3 +1,3 @@
-channel,ref
+channel,reason,ref
-AnimalPlanetAfrica.za,https://github.com/iptv-org/iptv/issues/1831
+AnimalPlanetAfrica.za,dmca,https://github.com/iptv-org/iptv/issues/1831
-BeijingSatelliteTV.cn,https://github.com/iptv-org/iptv/issues/1831
+BeijingSatelliteTV.cn,dmca,https://github.com/iptv-org/iptv/issues/1831

tests/__data__/input/issues/blocklist_add_approved.js

@@ -61,7 +61,7 @@ module.exports = [
     closed_at: null,
     author_association: 'CONTRIBUTOR',
     active_lock_reason: null,
-    body: '### Channel ID\n\nHGTVHungary.hu\n\n### Reference\n\nhttps://github.com/iptv-org/iptv/issues/1831\n\n### Notes (optional)\n\n_No response_',
+    body: '### Channel ID\n\nHGTVHungary.hu\n\n### Reason\n\nNSFW\n\n### Reference\n\nhttps://github.com/iptv-org/iptv/issues/1831\n\n### Notes (optional)\n\n_No response_',
     reactions: {
       url: 'https://api.github.com/repos/iptv-org/database/issues/5897/reactions',
       total_count: 0,

tests/__data__/input/validate/duplicate/blocklist.csv

@@ -1,3 +1,3 @@
-channel,ref
+channel,reason,ref
-002RadioTV.do,eee
+002RadioTV.do,dmca,eee
-002RadioTV.do,eee
+002RadioTV.do,dmca,eee

tests/__data__/input/validate/invalid_value/blocklist.csv

@@ -1,2 +1,2 @@
-channel,ref
+channel,reason,ref
-aaa.us,https://github.com/iptv-org/iptv/issues/1831
+aaa.us,dmca,https://github.com/iptv-org/iptv/issues/1831