diff --git a/.github/ISSUE_TEMPLATE/channels_add.yml b/.github/ISSUE_TEMPLATE/__channels_add.yml similarity index 99% rename from .github/ISSUE_TEMPLATE/channels_add.yml rename to .github/ISSUE_TEMPLATE/__channels_add.yml index 08c496d8..d7a621e9 100644 --- a/.github/ISSUE_TEMPLATE/channels_add.yml +++ b/.github/ISSUE_TEMPLATE/__channels_add.yml @@ -67,7 +67,7 @@ body: attributes: label: Broadcast Area description: List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/`, `c/`, `s/` - placeholder: 's/CN-AH' + placeholder: 'c/CN;r/EUR' validations: required: true diff --git a/.github/ISSUE_TEMPLATE/channels_edit.yml b/.github/ISSUE_TEMPLATE/__channels_edit.yml similarity index 92% rename from .github/ISSUE_TEMPLATE/channels_edit.yml rename to .github/ISSUE_TEMPLATE/__channels_edit.yml index 8437ff22..708d4c1d 100644 --- a/.github/ISSUE_TEMPLATE/channels_edit.yml +++ b/.github/ISSUE_TEMPLATE/__channels_edit.yml @@ -5,6 +5,7 @@ labels: ['channels:edit'] body: - type: input + id: id attributes: label: Channel ID (required) description: The ID of the channel that should be updated @@ -18,66 +19,77 @@ body: What exactly needs to be changed? - type: input + id: name attributes: label: Channel Name description: "Official channel name in English or call sign. May include: `a-z`, `0-9`, `space`, `-`, `!`, `:`, `&`, `.`, `+`, `'`, `/`, `»`, `#`, `%`, `°`, `$`, `@`, `?`" placeholder: 'Anhui TV' - type: input + id: alt_names attributes: label: Alternative Names description: List of alternative channel names separated by `;`. May contain any characters except `,` and `"` placeholder: '安徽卫视' - type: input + id: network attributes: label: Network description: Network of which this channel is a part. May contain any characters except `,` and `"` placeholder: 'Anhui' - type: input + id: owners attributes: label: Owners description: List of channel owners separated by `;`. May contain any characters except `,` and `"` placeholder: 'China Central Television' - type: input + id: country attributes: label: Country description: Country code from which the channel is transmitted. A list of all supported countries and their codes can be found in [data/countries.csv](https://github.com/iptv-org/database/blob/master/data/countries.csv) placeholder: 'CN' - type: input + id: subdivision attributes: label: Subdivision description: Code of the subdivision (e.g., provinces or states) from which the broadcast is transmitted. A list of all supported subdivisions and their codes can be found in [data/subdivisions.csv](https://github.com/iptv-org/database/blob/master/data/subdivisions.csv) placeholder: 'CN-AH' - type: input + id: city attributes: label: City description: Name of the city from which the channel is transmitted placeholder: 'Hefei' - type: input + id: broadcast_area attributes: label: Broadcast Area description: List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/`, `c/`, `s/` - placeholder: 's/CN-AH' + placeholder: 'c/CN;r/EUR' - type: input + id: languages attributes: label: Languages description: List of languages in which the channel is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](https://github.com/iptv-org/database/blob/master/data/languages.csv) placeholder: 'zho;eng' - type: input + id: categories attributes: label: Categories description: List of categories to which this channel belongs separated by `;`. A list of all supported categories can be found in [data/categories.csv](https://github.com/iptv-org/database/blob/master/data/categories.csv) placeholder: 'animation;kids' - type: dropdown + id: is_nsfw attributes: label: NSFW description: Indicates whether the channel broadcasts adult content @@ -88,36 +100,42 @@ body: required: true - type: input + id: launched attributes: label: Launched description: Launch date of the channel (`YYYY-MM-DD`) placeholder: '2016-07-28' - type: input + id: closed attributes: label: Closed description: Date on which the channel closed (`YYYY-MM-DD`) placeholder: '2020-05-31' - type: input + id: replaced_by attributes: label: Replaced By description: The ID of the channel that this channel was replaced by placeholder: 'CCTV1.cn' - type: input + id: website attributes: label: Website description: Official website URL placeholder: 'http://www.ahtv.cn/' - type: input + id: logo attributes: label: Logo description: "Logo URL. Only URL with HTTPS protocol are allowed. Supported image types: `PNG`, `JPEG`. Max size: 512x512 pixels. The link should not be [geo-blocked](https://en.wikipedia.org/wiki/Geo-blocking)" placeholder: 'https://example.com/logo.png' - type: textarea + id: notes attributes: label: Notes description: 'Anything else we should know?' diff --git a/.github/ISSUE_TEMPLATE/channels_remove.yml b/.github/ISSUE_TEMPLATE/__channels_remove.yml similarity index 100% rename from .github/ISSUE_TEMPLATE/channels_remove.yml rename to .github/ISSUE_TEMPLATE/__channels_remove.yml diff --git a/.github/ISSUE_TEMPLATE/_blocklist_add.yml b/.github/ISSUE_TEMPLATE/_blocklist_add.yml new file mode 100644 index 00000000..85627276 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/_blocklist_add.yml @@ -0,0 +1,28 @@ +name: 🔏 Block channel +description: Request to add a channel to the blocklist +title: 'Block: ' +labels: ['blocklist:add'] + +body: + - type: input + id: id + attributes: + label: Channel ID + description: The ID of the channel that should be blocked + placeholder: 'AnhuiTV.cn' + validations: + required: true + + - type: input + id: ref + attributes: + label: Reference + description: Link to the official request for channel removal + placeholder: 'https://github.com/iptv-org/iptv/issues/1831' + validations: + required: true + + - type: textarea + attributes: + label: Notes (optional) + description: 'Any additional information' diff --git a/.github/ISSUE_TEMPLATE/_blocklist_remove.yml b/.github/ISSUE_TEMPLATE/_blocklist_remove.yml new file mode 100644 index 00000000..4e02b489 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/_blocklist_remove.yml @@ -0,0 +1,28 @@ +name: 🕊️ Unblock channel +description: Request to remove a channel from the blocklist +title: 'Unblock: ' +labels: ['blocklist:remove'] + +body: + - type: input + attributes: + label: Channel ID (required) + description: The ID of the channel that should be removed + placeholder: 'AnhuiTV.cn' + validations: + required: true + + - type: dropdown + attributes: + label: Reason (required) + description: Select the reason for removal from the list below + options: + - 'Invalid channel id' + - 'Other' + validations: + required: true + + - type: textarea + attributes: + label: Notes + description: 'Any additional information' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e5a067fa..c9a5b3a3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -35,9 +35,9 @@ | country | Country code from which the channel is transmitted. A list of all supported countries and their codes can be found in [data/countries.csv](data/countries.csv) | Required | `CN` | | subdivision | Code of the subdivision (e.g., provinces or states) from which the broadcast is transmitted. A list of all supported subdivisions and their codes can be found in [data/subdivisions.csv](data/subdivisions.csv). | Optional | `CN-AH` | | city | The name of the city in English from which the channel is broadcast. May contain any characters except `,` and `"`. | Optional | `Hefei` | -| broadcast_area | List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/`, `c/`, `s/`. | Required | `s/CN-AH` | -| languages | List of languages in which the channel is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](data/languages.csv). | Required | `zho` | -| categories | List of categories to which this channel belongs separated by `;`. A list of all supported categories can be found in [data/categories.csv](data/categories.csv). | Optional | `general` | +| broadcast_area | List of codes describing the broadcasting area of the channel separated by `;`. Any combination of `r/`, `c/`, `s/`. | Required | `c/CN;r/EUR` | +| languages | List of languages in which the channel is broadcast separated by `;`. A list of all supported languages and their codes can be found in [data/languages.csv](data/languages.csv). | Required | `zho;eng` | +| categories | List of categories to which this channel belongs separated by `;`. A list of all supported categories can be found in [data/categories.csv](data/categories.csv). | Optional | `animation;kids` | | is_nsfw | Indicates whether the channel broadcasts adult content (`TRUE` or `FALSE`). | Required | `FALSE` | | launched | Launch date of the channel (`YYYY-MM-DD`). | Optional | `2016-07-28` | | closed | Date on which the channel closed (`YYYY-MM-DD`). | Optional | `2020-05-31` | diff --git a/data/blocklist.csv b/data/blocklist.csv index 0483c228..8cee1488 100644 --- a/data/blocklist.csv +++ b/data/blocklist.csv @@ -415,7 +415,7 @@ Novasports4.gr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl Novasports4.gr,https://github.com/iptv-org/iptv/issues/6486 Novasports5.gr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md Novasports6.gr,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md -NovaTV.bg,https://github.com/iptv-org/iptv/issues/6486 +Nova.bg,https://github.com/iptv-org/iptv/issues/6486 NovaTV.hr,https://github.com/iptv-org/iptv/issues/6486 Nove.it,https://github.com/iptv-org/iptv/issues/1831 One.il,https://github.com/github/dmca/blob/master/2020/09/2020-09-16-dfl.md