Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch 2023.09.2 #14226

Merged
merged 13 commits into from
Sep 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/ISSUE_TEMPLATE/-----streams_add.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ body:
validations:
required: true

- type: input
attributes:
label: Channel Name
description: "Full name of the channel. May contain any characters except: `,`, `[`, `]`."
placeholder: 'BBC America East'

- type: input
attributes:
label: Stream URL
Expand All @@ -28,6 +34,37 @@ body:
- 'Not 24/7'
- 'Geo-blocked'

- type: dropdown
attributes:
label: Quality
description: Maximum video resolution available on the link
options:
- 2160p
- 1280p
- 1080p
- 720p
- 576p
- 480p
- 360p

- type: dropdown
attributes:
label: Label
description: Is there any reason why the broadcast may not work?
options:
- 'Not 24/7'
- 'Geo-blocked'

- type: input
attributes:
label: HTTP User Agent
placeholder: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246'

- type: input
attributes:
label: HTTP Referrer
placeholder: 'https://example.com/'

- type: textarea
attributes:
label: Notes (optional)
Expand Down
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE/----streams_edit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@ body:
description: Channel ID from [iptv-org.github.io](https://iptv-org.github.io/).
placeholder: 'BBCAmericaEast.us'

- type: input
attributes:
label: Channel Name
description: "Full name of the channel. May contain any characters except: `,`, `[`, `]`."
placeholder: 'BBC America East'

- type: dropdown
attributes:
label: Quality
description: Maximum video resolution available on the link
options:
- 2160p
- 1280p
- 1080p
- 720p
- 576p
- 480p
- 360p

- type: dropdown
attributes:
label: Label
Expand All @@ -31,6 +50,16 @@ body:
- 'Not 24/7'
- 'Geo-blocked'

- type: input
attributes:
label: HTTP User Agent
placeholder: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36 Edge/12.246'

- type: input
attributes:
label: HTTP Referrer
placeholder: 'https://example.com/'

- type: textarea
attributes:
label: Notes
Expand Down
42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/---streams-remove.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: 🗑 Remove stream link
description: Request to remove a stream link from the playlist
title: 'Remove: '
labels: ['streams:remove']

body:
- type: input
attributes:
label: Stream URL
description: Link to the stream from a playlist
placeholder: 'https://lnc-kdfw-fox-aws.tubi.video/index.m3u8'
validations:
required: true

- type: dropdown
attributes:
label: Reason
options:
- Not loading
- Constantly interrupts/lagging
- Stuck at a single frame
- Visual artifacts
- Shows looped video
- No sound
- Displays a message asking to renew subscription
- Duplicate
- Other
validations:
required: true

- type: textarea
attributes:
label: Notes (optional)
placeholder: 'Anything else we should know?'

- type: checkboxes
attributes:
label: Contributing Guide
description: 'Please read this guide before posting your request'
options:
- label: I have read [Contributing Guide](https://github.com/iptv-org/iptv/blob/master/CONTRIBUTING.md)
required: true
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ body:
description: 'Please read this guide before posting your request'
options:
- label: I have read [Contributing Guide](https://github.com/iptv-org/iptv/blob/master/CONTRIBUTING.md)
required: true
required: true
11 changes: 9 additions & 2 deletions .github/ISSUE_TEMPLATE/--bug-report.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: 🐞 Bug Report
description: Report an error in this repository
title: 'Fix: '
labels: ['bug']

body:
Expand All @@ -9,4 +8,12 @@ body:
label: Describe your issue
description: Please describe the error in as much detail as possible so that we can fix it quickly.
validations:
required: true
required: true

- type: checkboxes
attributes:
label: Contributing Guide
description: 'Please read this guide before posting your request'
options:
- label: I have read [Contributing Guide](https://github.com/iptv-org/iptv/blob/master/CONTRIBUTING.md)
required: true
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
name: ✂️ Removal request
name: ©️ Copyright removal request
description: Request to remove content
title: 'Remove: '
labels: ['removal request']
body:
- type: markdown
attributes:
value: |
This form is only for requests from the copyright owner or an agent authorized to act on behalf of the copyright owner. If you're experiencing problems viewing a channel please fill a [Broken Stream](https://github.com/iptv-org/iptv/issues/new?assignees=&labels=broken+stream&template=-----broken-stream.yml&title=Fix%3A+) form instead.

- type: input
attributes:
label: Your full legal name
Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
blank_issues_enabled: false
blank_issues_enabled: true
contact_links:
- name: 🔍 Looking for a channel
url: https://github.com/orgs/iptv-org/discussions/new/choose
url: https://github.com/orgs/iptv-org/discussions/categories/channel-search
about: Need help finding a link to a channel stream
- name: 💡 Feature request
url: https://github.com/orgs/iptv-org/discussions/new/choose
url: https://github.com/orgs/iptv-org/discussions/categories/ideas
about: For any ideas or feature requests
- name: ❓ Ask a question
url: https://github.com/orgs/iptv-org/discussions/new/choose
url: https://github.com/orgs/iptv-org/discussions/categories/q-a
about: Ask questions about this project
50 changes: 30 additions & 20 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ name: update
on:
workflow_dispatch:
schedule:
- cron: '0 */6 * * *'
- cron: '0 0 * * *'
jobs:
main:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: tibdex/github-app-token@v1
- uses: getsentry/action-github-app-token@v2
if: ${{ !env.ACT }}
id: create-app-token
with:
Expand All @@ -20,39 +20,49 @@ jobs:
if: ${{ !env.ACT }}
with:
token: ${{ steps.create-app-token.outputs.token }}
- name: setup git
run: |
git config user.name "iptv-bot[bot]"
git config user.email "84861620+iptv-bot[bot]@users.noreply.github.com"
- uses: actions/setup-node@v3
if: ${{ !env.ACT }}
with:
node-version: 18
cache: 'npm'
- name: install dependencies
run: npm install
- name: load api data
run: npm run api:load
- name: validate playlists
- name: setup database
run: npm run db:create
- name: update internal playlists
run: npm run playlist:update --silent >> $GITHUB_OUTPUT
id: playlist-update
- name: check internal playlists
run: |
npm run playlist:lint
npm run playlist:validate
- name: setup database
run: npm run db:create
- name: generate playlists
- name: generate public playlists
run: npm run playlist:generate
- name: generate streams.json
- name: generate .api/streams.json
run: npm run api:generate
- name: update readme.md
run: npm run readme:update
- name: commit changes
uses: stefanzweifel/git-auto-commit-action@v4
- run: git status
- name: commit changes to /streams
run: |
git add streams
git status
git commit -m "[Bot] Update /streams" -m "Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [update](https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }}) workflow." -m "${{ steps.playlist-update.outputs.OUTPUT }}" --no-verify
- name: commit changes to readme.md
run: |
git add README.md
git status
git commit -m "[Bot] Update README.md" -m "Committed by [iptv-bot](https://github.com/apps/iptv-bot) via [update](https://github.com/iptv-org/iptv/actions/runs/${{ github.run_id }}) workflow." --no-verify
- name: push all changes to the repository
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
with:
commit_message: "[Bot] Update README.md"
branch: master
commit_options: '--no-verify'
file_pattern: README.md
repository: .
commit_user_name: iptv-bot[bot]
commit_user_email: 84861620+iptv-bot[bot]@users.noreply.github.com
commit_author: iptv-bot[bot] <84861620+iptv-bot[bot]@users.noreply.github.com>
- name: deploy to github pages
run: git push
- name: deploy public playlists to github pages
uses: JamesIves/github-pages-deploy-action@4.1.1
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
with:
Expand All @@ -64,7 +74,7 @@ jobs:
git-config-email: 84861620+iptv-bot[bot]@users.noreply.github.com
commit-message: '[Bot] Deploy to GitHub Pages'
clean: true
- name: deploy to iptv-org/api
- name: move .api/streams.json to iptv-org/api
uses: JamesIves/github-pages-deploy-action@4.1.1
if: ${{ !env.ACT && github.ref == 'refs/heads/master' }}
with:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ node_modules
.DS_Store
.gh-pages
.api
.env
.env
/temp
Loading