From 0157ade5467ce652fa779d3f41a4198701cae263 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 13:40:05 +0300 Subject: [PATCH 01/32] Update Del Run Comments CI --- .github/workflows/del-runs-comments.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/del-runs-comments.yml b/.github/workflows/del-runs-comments.yml index 6f11756e97b..08f6ad76e4d 100644 --- a/.github/workflows/del-runs-comments.yml +++ b/.github/workflows/del-runs-comments.yml @@ -1,19 +1,18 @@ -name: del-runs-comments -on: workflow_dispatch +name: Delete workflow runs + +on: + workflow_dispatch: + jobs: runx: runs-on: ubuntu-latest permissions: write-all + steps: - - uses: christosgalano/delete-workflow-runs@v1.0.0 + - name: Delete workflow runs + uses: christosgalano/delete-gh-workflow-runs@v1 with: owner: uBlockOrigin repo: uAssets token: ${{ secrets.GITHUB_TOKEN }} workflow: on-issue-comment - - - - - - \ No newline at end of file From ae58d157775b2a83907ce8325a53b082521b0251 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 13:41:38 +0300 Subject: [PATCH 02/32] Format CI --- .github/workflows/main.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c8d2aca69a1..c97e020fde2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -21,10 +21,11 @@ jobs: name: Publish lists runs-on: ubuntu-latest steps: - - name: Clone uAssets + - name: Checkout repository uses: actions/checkout@v4 with: - ref: gh-pages + ref: gh-pages + - name: Copy filter lists to gh-pages run: | TMPDIR=$(mktemp -d) @@ -35,6 +36,7 @@ jobs: cp $TMPDIR/filters/*.txt filters/ cp $TMPDIR/thirdparties/easylist/easy*.txt thirdparties/ cp $TMPDIR/dnr/*.json dnr/ + - name: Patch last-updated field run: | DATE=$(date -Ru) @@ -46,6 +48,7 @@ jobs: git checkout -q $f fi done + - name: Commit changes (if any) run: | if [[ -n $(git diff) ]]; then From 7b1d5bbe55e738c6ee572dc82a492c52aaf90bf4 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 13:42:30 +0300 Subject: [PATCH 03/32] Update Delete Bad Comments CI --- .github/workflows/on-issue-comment.yml | 32 +++++++++++++++++++++----- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/.github/workflows/on-issue-comment.yml b/.github/workflows/on-issue-comment.yml index c397373f5f8..81319eac5e3 100644 --- a/.github/workflows/on-issue-comment.yml +++ b/.github/workflows/on-issue-comment.yml @@ -1,18 +1,38 @@ -name: on-issue-comment +name: Delete Bad Comments + on: + workflow_dispatch: issue_comment: types: created + jobs: check-if-bad-comment: - name: delete bad comment + name: Delete Bad Comment runs-on: ubuntu-latest - if: (( contains(github.event.comment.body, 'Download') || contains(github.event.comment.body, 'install') || contains(github.event.comment.body, 'mediafire') || contains(github.event.comment.body, 'changeme') ) && ( contains(github.event.comment.body, 'gcc') || contains(github.event.comment.body, 'usx'))) || ( contains(github.event.comment.body, 'install') && ( contains(github.event.comment.body, 'mediafire') || contains(github.event.comment.body, 'gofile') )) + if: >- + ( + (contains(github.event.comment.body, 'Download') || + contains(github.event.comment.body, 'install') || + contains(github.event.comment.body, 'mediafire') || + contains(github.event.comment.body, 'changeme')) && + (contains(github.event.comment.body, 'gcc') || + contains(github.event.comment.body, 'usx')) + ) || + ( + contains(github.event.comment.body, 'install') && + (contains(github.event.comment.body, 'mediafire') || + contains(github.event.comment.body, 'gofile')) + ) + permissions: write-all + steps: - - name: Delete comment + - name: Echo event comment body run: | - echo " ${{ github.event.comment.body }} " - - uses: actions-cool/issues-helper@v3 + echo "${{ github.event.comment.body }}" + + - name: Delete comments + uses: actions-cool/issues-helper@v3 with: actions: 'delete-comment' token: ${{ secrets.GITHUB_TOKEN }} From 647c8f61920ab1cb25bfba4ae04bf6a08941aa18 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 13:44:29 +0300 Subject: [PATCH 04/32] Update YouTube issue CO --- .github/workflows/on-youtube-issue.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/on-youtube-issue.yml b/.github/workflows/on-youtube-issue.yml index 7c6eb4c99c7..80c58992806 100644 --- a/.github/workflows/on-youtube-issue.yml +++ b/.github/workflows/on-youtube-issue.yml @@ -1,8 +1,9 @@ name: Triage YouTube issues on: + workflow_dispatch: issues: - types: opened + types: [opened] jobs: check-if-youtube: @@ -11,12 +12,14 @@ jobs: if: contains(github.event.issue.title, 'youtube.com:') permissions: issues: write + steps: - name: Add label uses: actions-cool/issues-helper@v3 with: actions: 'add-labels' labels: 'duplicate' + - name: Add comment uses: actions-cool/issues-helper@v3 with: @@ -25,6 +28,7 @@ jobs: Please respect what is asked in the issue template to not unduly burden volunteers. This is a `youtube.com` issue, see . + - name: Close issue uses: actions-cool/issues-helper@v3 with: From aeaa3279637275fa94aec4ff59018d9a413b6157 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 13:48:33 +0300 Subject: [PATCH 05/32] Update asset updater CI --- .github/workflows/update-3rd-party-assets.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-3rd-party-assets.yml b/.github/workflows/update-3rd-party-assets.yml index 7065811d58b..e971dd3d1b5 100644 --- a/.github/workflows/update-3rd-party-assets.yml +++ b/.github/workflows/update-3rd-party-assets.yml @@ -15,12 +15,15 @@ jobs: contents: write # for Git to git push name: Update 3rd-party assets runs-on: ubuntu-latest + steps: - - name: Clone uAssets - uses: actions/checkout@v3 + - name: Checkout repository + uses: actions/checkout@v4 + - name: Fetch 3rd-party assets run: | ./tools/update-3rdparties.sh + - name: Commit changes, if any run: | if [[ -n $(git diff) ]]; then From fb3e7993fd34145e08bc0ec2d2bef1a12be6f38e Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 13:55:44 +0300 Subject: [PATCH 06/32] Make the action run every hour --- .github/workflows/update-easylist.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-easylist.yml b/.github/workflows/update-easylist.yml index 18256120edb..e2b181c8d8a 100644 --- a/.github/workflows/update-easylist.yml +++ b/.github/workflows/update-easylist.yml @@ -2,7 +2,7 @@ name: Update Easylist assets (hourly) on: schedule: - - cron: "47 */3 * * *" + - cron: "0 * * * *" workflow_dispatch: permissions: @@ -16,12 +16,15 @@ jobs: contents: write # for Git to git push name: Update Easylist assets runs-on: ubuntu-latest + steps: - - name: Clone uAssets + - name: Checkout repository uses: actions/checkout@v4 + - name: Assemble Easylist assets run: | ./tools/make-easylist.sh + - name: Commit changes, if any env: GH_TOKEN: ${{ github.token }} From fbe6b36b9792133cd414128af704e519e6c5238d Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 13:56:56 +0300 Subject: [PATCH 07/32] Update pr template --- .github/PULL_REQUEST_TEMPLATE.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 38d470920d2..eabaee3570c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,15 +2,15 @@ ### URL(s) where the issue occurs -`[At least one URL for a web page where the clearly described issue occurs is **mandatory**. The backticks surrounding the URLs is important, it prevents the URL from being clickable. Warn with "NSFW" where applicable.]` +`[At least one URL for a web page where the clearly described issue occurs is **mandatory**. The backticks surrounding the URLs is important; it prevents the URL from being clickable. Warn with "NSFW" where applicable.]` ### Describe the issue -[Be as clear as possible: nobody can read mind, and nobody is looking at your issue over your shoulder.] +[Be as clear as possible: nobody can read minds, and nobody is looking at your issue over your shoulder.] ### Screenshot(s) -[Screenshot(s) for difficult to describe visual issues are **mandatory**] +[Screenshot(s) for difficult-to-describe visual issues are **mandatory**.] ### Versions @@ -19,8 +19,8 @@ ### Settings -- [List here all the changes you made to uBO's default settings] +- [List here all the changes you made to uBO's default settings.] ### Notes -[Add here the result of whatever investigation work you have done: please investigate the issues you report -- this prevents burdening other volunteers. This is especially true for issues arising from settings which are very different from default ones.] +[Add here the result of whatever investigation work you have done: please investigate the issues you report—this prevents burdening other volunteers. This is especially true for issues arising from settings which are very different from default ones.] From 453a989cb3083af3094180c6c6f05899ff82144e Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 14:04:06 +0300 Subject: [PATCH 08/32] Update bug report template --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5e94a8d9243..17fda91db14 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -10,7 +10,7 @@ body: description: | **IMPORTANT:** Answer carefully and truthfully. options: - - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. + - label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. required: true - label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets). required: true From 7920ecd10dee941b7d5d7143b48b21690c275e62 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 14:07:08 +0300 Subject: [PATCH 09/32] sure From 1b05810f716a69e1bc6bd87157d5b2956ad5d921 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 14:10:06 +0300 Subject: [PATCH 10/32] update template --- .github/ISSUE_TEMPLATE/report_from_ubo.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/report_from_ubo.yml b/.github/ISSUE_TEMPLATE/report_from_ubo.yml index 890213ad458..eb4f44a5133 100644 --- a/.github/ISSUE_TEMPLATE/report_from_ubo.yml +++ b/.github/ISSUE_TEMPLATE/report_from_ubo.yml @@ -3,14 +3,15 @@ description: "DO NOT MANUALLY SELECT THIS TEMPLATE. It's used by uBlock Origin ( body: - type: markdown attributes: - value: To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template. + value: > + To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template. - type: checkboxes attributes: label: Prerequisites description: | **IMPORTANT:** Answer carefully and truthfully. options: - - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. + - label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. required: true - label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets). required: true @@ -32,7 +33,6 @@ body: required: true - label: I did not answer truthfully to **ALL** the above checkboxes. required: false - - type: textarea attributes: label: URL(s) where the issue occurs. @@ -46,21 +46,18 @@ body: render: yaml validations: required: true - - type: textarea attributes: label: Description description: Provide a clear and concise description of the issue. validations: required: true - - type: textarea attributes: label: Other extensions used description: List other extensions you are using along uBO (write _none_ if no other extensions). This information helps volunteers investigate issues. validations: required: true - - type: textarea attributes: label: Screenshot(s) @@ -74,13 +71,11 @@ body: - validations: required: false - - type: textarea id: configuration attributes: From 9f8acfe34b1a09273e9dca93dc1ee1dfae513292 Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 14:13:09 +0300 Subject: [PATCH 11/32] update ubo template --- .../specific_report_from_ubo.yml | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml b/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml index 64e06e9ed67..81caf041516 100644 --- a/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml +++ b/.github/ISSUE_TEMPLATE/specific_report_from_ubo.yml @@ -3,14 +3,15 @@ description: "DO NOT MANUALLY SELECT THIS TEMPLATE. It's used by uBlock Origin ( body: - type: markdown attributes: - value: To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template. + value: > + To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template. - type: checkboxes attributes: label: Prerequisites description: | **IMPORTANT:** Answer carefully and truthfully. options: - - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. + - label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. required: true - label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets). required: true @@ -32,39 +33,34 @@ body: required: true - label: I did not answer truthfully to **ALL** the above checkboxes. required: false - - type: textarea id: url_address_of_the_web_page attributes: label: URL address of the web page description: | - Auto-filled by uBO, leave it alone. + Auto-filled by uBO, don't change. validations: required: true - - type: textarea id: category attributes: label: Category description: | - Auto-filled by uBO, leave it alone. + Auto-filled by uBO, don't change. validations: required: true - - type: textarea attributes: label: Description description: Provide a clear and concise description of the issue. validations: required: true - - type: textarea attributes: label: Other extensions used description: List other extensions you are using along uBO (write _none_ if no other extensions). This information helps volunteers investigate issues. validations: required: true - - type: textarea attributes: label: Screenshot(s) @@ -78,18 +74,16 @@ body: - validations: required: false - - type: textarea id: configuration attributes: label: Configuration description: | - Auto-filled by uBO, leave it alone. + Auto-filled by uBO, don't change. validations: required: true From 4798a51525ff66264be433fdc42ea486fa46616d Mon Sep 17 00:00:00 2001 From: daylight Date: Fri, 25 Oct 2024 14:13:56 +0300 Subject: [PATCH 12/32] change template --- .github/ISSUE_TEMPLATE/report_from_ubo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/report_from_ubo.yml b/.github/ISSUE_TEMPLATE/report_from_ubo.yml index eb4f44a5133..299ce4f3ef2 100644 --- a/.github/ISSUE_TEMPLATE/report_from_ubo.yml +++ b/.github/ISSUE_TEMPLATE/report_from_ubo.yml @@ -81,6 +81,6 @@ body: attributes: label: Configuration description: | - If this section gets automatically filled by uBO, leave it alone. + Auto-filled by uBO, don't change. validations: required: true From 446b8fdde34767f47c681421bdce66be748b4ca3 Mon Sep 17 00:00:00 2001 From: daylight Date: Sun, 27 Oct 2024 11:59:12 +0300 Subject: [PATCH 13/32] update ub0l template --- .../ISSUE_TEMPLATE/specific_report_from_ubol.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/specific_report_from_ubol.yml b/.github/ISSUE_TEMPLATE/specific_report_from_ubol.yml index cd347f4f37a..47062f53011 100644 --- a/.github/ISSUE_TEMPLATE/specific_report_from_ubol.yml +++ b/.github/ISSUE_TEMPLATE/specific_report_from_ubol.yml @@ -4,14 +4,15 @@ labels: ["uBOL"] body: - type: markdown attributes: - value: To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template. + value: | + To avoid burdening **VOLUNTEERS** with invalid or duplicate reports, disregarding these steps **WILL** get your account blocked on this repository temporarily, then permanently, with repeated disregard for the template. - type: checkboxes attributes: label: Prerequisites description: | **IMPORTANT:** Answer carefully and truthfully. options: - - label: This is **NOT** a [_YouTube_](https://www.github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://www.github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://www.github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. + - label: This is **NOT** a [_YouTube_](https://github.com/uBlockOrigin/uAssets/issues/20586), [_Facebook_](https://github.com/uBlockOrigin/uAssets/issues/3367), [_Twitch_](https://github.com/uBlockOrigin/uAssets/issues/5184) or [_a shortener/hosting site_](https://github.com/uBlockOrigin/uAssets/discussions/17361) report. _These sites MUST be reported by clicking their **respective links**_. required: true - label: I read and understand the [policy about what is a valid filter issue](https://github.com/uBlockOrigin/uAssets/blob/master/README.md#uassets). required: true @@ -35,7 +36,7 @@ body: attributes: label: URL address of the web page description: | - Auto-filled by uBOL, leave it alone. + Auto-filled by uBOL, don't change. validations: required: true @@ -44,7 +45,7 @@ body: attributes: label: Category description: | - Auto-filled by uBOL, leave it alone. + Auto-filled by uBOL, don't change. validations: required: true @@ -75,9 +76,7 @@ body: - - validations: required: false @@ -87,6 +86,6 @@ body: attributes: label: Configuration description: | - Auto-filled by uBOL, leave it alone. + Auto-filled by uBOL, don't change. validations: required: true From fe54eb6ac5e4729ce54b131ec6d7864d9e314baa Mon Sep 17 00:00:00 2001 From: daylight Date: Sun, 27 Oct 2024 12:02:26 +0300 Subject: [PATCH 14/32] Make the workflow run daily --- .github/workflows/update-3rd-party-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-3rd-party-assets.yml b/.github/workflows/update-3rd-party-assets.yml index e971dd3d1b5..e1d8d28db16 100644 --- a/.github/workflows/update-3rd-party-assets.yml +++ b/.github/workflows/update-3rd-party-assets.yml @@ -2,7 +2,7 @@ name: Update 3rd-party assets (daily) on: schedule: - - cron: "29 4 * * *" + - cron: "0 0 * * *" workflow_dispatch: permissions: From 0694fe7750a1f0083a5f6a6fa1192b90b802a85c Mon Sep 17 00:00:00 2001 From: daylight Date: Sun, 27 Oct 2024 12:03:04 +0300 Subject: [PATCH 15/32] Update link --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c97e020fde2..f29d8d16e10 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,7 +6,7 @@ on: - master workflow_dispatch: -# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow +# https://docs.github.com/en/actions/writing-workflows/workflow-syntax-for-github-actions#example-only-cancel-in-progress-jobs-or-runs-for-the-current-workflow concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true From 9510a1f5b06676d80e3fa452b4eabb1d2a7c696f Mon Sep 17 00:00:00 2001 From: daylight Date: Sun, 27 Oct 2024 12:06:24 +0300 Subject: [PATCH 16/32] Update readme --- README.md | 49 +++++++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 1df8f5a1278..07c7a89fee8 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,18 @@ # uAssets -This repository is for the resources of [uBlock Origin (uBO)](https://github.com/gorhill/uBlock). It receives all reports for new filters or existing filters that cause web page breakage. Any contributors are welcome. Contributors who are proven valuable will get write permissions to the repository. +This repository is dedicated to the resources for [uBlock Origin (uBO)](https://github.com/gorhill/uBlock). It serves as a hub for reporting new filters or existing filters that may cause webpage breakage. Contributions are welcome, and valuable contributors may be granted write permissions to the repository. -The rationale for including a specific filter in uBO's filter lists is the same as the [EasyList/EasyPrivacy policies](https://easylist.to/pages/policy.html) and also takes into account whether a filter requires uBO's extended filter syntax. +## Filter Inclusion Rationale -It is preferred to fix filter issues in EasyList. Any filters included in uBO's filter lists must use the [extended syntax](https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#extended-syntax). +The rationale for including specific filters in uBO's filter lists aligns with the [EasyList/EasyPrivacy policies](https://easylist.to/pages/policy.html) and considers whether a filter requires uBO's extended filter syntax. -The EasyList-compatible fixes for high-traffic websites are added to uBO filters until they become added to EasyList. +It is preferred to address filter issues in EasyList first. Any filters included in uBO's filter lists must utilize the [extended syntax](https://github.com/gorhill/uBlock/wiki/Static-filter-syntax#extended-syntax). -uAssets will fix the following exceptions even if they do not require using the extended syntax: +High-traffic websites will have EasyList-compatible fixes added to uBO filters until they are incorporated into EasyList. + +## Exceptions Handled by uAssets + +uAssets will address the following exceptions even if they do not require the extended syntax: - Ad-Reinsertion - Anti-Blocker @@ -18,34 +22,35 @@ uAssets will fix the following exceptions even if they do not require using the - Website Breakage - Video Ads -uAssets will not address the following: +### Exclusions + +uAssets will **not** address the following: - Paywalls - Porn Farms -#### How to correctly report an issue - -- Disable all other browser extensions and see if the problem still persists +## Reporting an Issue -- How to provide troubleshooting information: +To report an issue correctly: - If the problem persists, then please: - - On the problematic website, click the uBlock Origin icon - - Click the chat icon - - Click "Troubleshooting Information" to expand, and copy that information into the appropriate github issue. +1. Disable all other browser extensions to see if the problem persists. +2. If the issue continues: + - On the problematic website, click the uBlock Origin icon. + - Click the chat icon. + - Click "Troubleshooting Information" to expand, and copy that information into the relevant GitHub issue. -#### Support Forum +## Support Forum -For support, questions, or help, visit [/r/uBlockOrigin](https://www.reddit.com/r/uBlockOrigin/). +For support, questions, or assistance, visit [/r/uBlockOrigin](https://www.reddit.com/r/uBlockOrigin/). -#### uBO Issues +## uBO Issues -Report issues with uBO in the [uBO issue tracker](https://github.com/uBlockOrigin/uBlock-issues/issues). +For issues related to uBO, please report them in the [uBO issue tracker](https://github.com/uBlockOrigin/uBlock-issues/issues). -#### uBO Lite (uBOL) Issues +## uBO Lite (uBOL) Issues -Report issues specific to the Manifest Version 3 (MV3) variant in the [uBOL issue tracker](https://github.com/uBlockOrigin/uBOL-home/issues). +For issues specific to the Manifest Version 3 (MV3) variant, report them in the [uBOL issue tracker](https://github.com/uBlockOrigin/uBOL-home/issues). -#### Similarly-Purposed Blockers +## Concurrent Blockers -Do **NOT** use any other [similarly-purposed blockers](https://x.com/gorhill/status/1033706103782170625) concurrently with uBO. It can result in website breakage or undefined results. +Do **NOT** use any other [similarly-purposed blockers](https://x.com/gorhill/status/1033706103782170625) concurrently with uBO, as this may lead to website breakage or unpredictable results. From b3bc06acea03c8c8e6afc248455c31ec8b76a6d1 Mon Sep 17 00:00:00 2001 From: daylight Date: Sun, 27 Oct 2024 12:07:19 +0300 Subject: [PATCH 17/32] Update contributing --- CONTRIBUTING.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d84e45a8fd9..5e0a06ad6bd 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,22 +1,24 @@ -#### Filter lists +### Filter Lists -##### Ordering of filters +#### Ordering of Filters -New filter must be added at the end of the list. +- New filters must be added at the end of the list. + + This approach allows for an easy assessment of a filter's relevance. Filters at the top will be the oldest and most likely to be obsolete. -The reason is to provide an easy way to check whether a filter is still relevant. The filters at the top of the file will be the oldest filters, and also the most likely to maybe be obsolete. +- Old filters confirmed to still be required should also be moved to the end of the list. -Old filters which are confirmed to still be required must be moved to the end of the list. +#### Issue Number Association -##### Issue number association +- **All** added filters must be associated with a formal issue number. For example: -**All** added filters must be associated with a formal issue number, example: + ``` + ! https://github.com/uBlockOrigin/uAssets/issues/2 + ||data.inertanceretinallaurel.com^ + ``` - ! https://github.com/uBlockOrigin/uAssets/issues/2 - ||data.inertanceretinallaurel.com^ + This practice documents the reason for adding a filter and provides a way to verify if an old filter is still necessary. The comment line preceding the filter(s) should consist solely of the URL to the issue, which contains all relevant details about the resolution. -This way this documents why a filter was added, and how to verify whether an old filter is still needed. The comment line preceding the filter(s) to solve a specific issue should be only a URL to the issue. The issue itself can contains all the details about how the issue was solved, and why it was solved this way, etc. +#### Commit Message -##### Commit message - -Keep it simple, example: `this fixes #2`. The issue itself will contains all the details. +- Keep it simple. For example: `this fixes #2`. The issue itself will contain all the necessary details. From 5aa7044d69892b1f529d225e5626afc28e5d3598 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:27:50 +0300 Subject: [PATCH 18/32] Update license template --- tools/validate/validate.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/validate/validate.js b/tools/validate/validate.js index ce448f859d4..710c090d521 100644 --- a/tools/validate/validate.js +++ b/tools/validate/validate.js @@ -1,6 +1,6 @@ /******************************************************************************* - uBlock Origin - a browser extension to block requests. + uBlock Origin - a comprehensive, efficient content blocker Copyright (C) 2022-present Raymond Hill This program is free software: you can redistribute it and/or modify From dc84c1fcd93cc09d923702a7d5dd5d6c0acc1c27 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:28:14 +0300 Subject: [PATCH 19/32] Update license template --- tools/validate/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/validate/config.js b/tools/validate/config.js index 270aedb1364..fd144b8fccd 100644 --- a/tools/validate/config.js +++ b/tools/validate/config.js @@ -1,6 +1,6 @@ /******************************************************************************* - uBlock Origin - a browser extension to block requests. + uBlock Origin - a comprehensive, efficient content blocker Copyright (C) 2022-present Raymond Hill This program is free software: you can redistribute it and/or modify From 90b4199ef7175d91c1e4cfc35299179dc7a3df48 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:30:51 +0300 Subject: [PATCH 20/32] Update to latest Node --- tools/validate/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/validate/package.json b/tools/validate/package.json index c10527aa90d..5e9f0fafa0b 100644 --- a/tools/validate/package.json +++ b/tools/validate/package.json @@ -1,6 +1,6 @@ { "engines": { - "node": ">=17.5.0" + "node": ">=22.0.0" }, "type": "module" } From f7baa087a2ca704d0def9c27f81763eae2cb0068 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:31:15 +0300 Subject: [PATCH 21/32] Update license --- tools/need-patch.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/need-patch.mjs b/tools/need-patch.mjs index c0cf231b4c8..780a025d6f4 100644 --- a/tools/need-patch.mjs +++ b/tools/need-patch.mjs @@ -1,6 +1,6 @@ /******************************************************************************* - uBlock Origin - a browser extension to block requests. + uBlock Origin - a comprehensive, efficient content blocker Copyright (C) 2023-present Raymond Hill This program is free software: you can redistribute it and/or modify From abb464fea5344f1792ef2064be131b5879bd0a97 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:33:04 +0300 Subject: [PATCH 22/32] Update make-diffpatch.sh --- tools/make-diffpatch.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/make-diffpatch.sh b/tools/make-diffpatch.sh index 81e0aabbaff..d35a9202ef2 100755 --- a/tools/make-diffpatch.sh +++ b/tools/make-diffpatch.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# -# This script assumes a linux environment set -e From 8ca2152547be1d45a4aa2d8edb30926a57967311 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:34:16 +0300 Subject: [PATCH 23/32] Update license --- tools/make-easylist.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make-easylist.mjs b/tools/make-easylist.mjs index b6483636ad5..ac1aceafea9 100644 --- a/tools/make-easylist.mjs +++ b/tools/make-easylist.mjs @@ -1,6 +1,6 @@ /******************************************************************************* - uBlock Origin - a browser extension to block requests. + uBlock Origin - a comprehensive, efficient content blocker Copyright (C) 2022-present Raymond Hill This program is free software: you can redistribute it and/or modify From 3a2b051481b19aff8b495355680527d3ccecf1d4 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:34:42 +0300 Subject: [PATCH 24/32] Update make-easylist.sh --- tools/make-easylist.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/make-easylist.sh b/tools/make-easylist.sh index 0185d8a272b..bb6f8fd3143 100755 --- a/tools/make-easylist.sh +++ b/tools/make-easylist.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# -# This script assumes a linux environment echo "*** uAssets: Assembling EasyList lists" TMPDIR=$(mktemp -d) From d9779b3861f627e8bdb9d53b45f97c57c282f64e Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:34:54 +0300 Subject: [PATCH 25/32] Update make-ublock.sh --- tools/make-ublock.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/make-ublock.sh b/tools/make-ublock.sh index f35fb139b51..340b36427e4 100755 --- a/tools/make-ublock.sh +++ b/tools/make-ublock.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# -# This script assumes a linux environment echo "*** uAssets: Assembling filters/filters.txt" node ./tools/make-easylist.mjs in=templates/ublock-filters.template out=filters/filters.min.txt minify=1 From a54856ed276bc7ce0c20b16dd40da8772c6391fd Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:36:13 +0300 Subject: [PATCH 26/32] Update make-validate.sh --- tools/make-validate.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/make-validate.sh b/tools/make-validate.sh index 8d7ff9b84e2..dc8a2332eab 100755 --- a/tools/make-validate.sh +++ b/tools/make-validate.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# -# This script assumes a linux environment # https://stackoverflow.com/a/52526704 echo "*** Importing required uBO files" From 4222e2fb8541071593031d4c92b22de19704fe17 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:36:46 +0300 Subject: [PATCH 27/32] Update update-3rdparties.sh --- tools/update-3rdparties.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/update-3rdparties.sh b/tools/update-3rdparties.sh index f007c0c0a1c..3c42c530286 100755 --- a/tools/update-3rdparties.sh +++ b/tools/update-3rdparties.sh @@ -1,10 +1,8 @@ #!/usr/bin/env bash -# -# This script assumes a linux environment TEMPFILE=$(mktemp) -echo "*** uAssets: updating remote assets..." +echo "*** uAssets: Updating remote assets..." declare -A assets assets=( From f29f1f4808bd1c52d74b642a6c626b02c49f6121 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:37:14 +0300 Subject: [PATCH 28/32] Update update-diffpatches.sh --- tools/update-diffpatches.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/update-diffpatches.sh b/tools/update-diffpatches.sh index 2d98dfe819a..3f179aaf78e 100755 --- a/tools/update-diffpatches.sh +++ b/tools/update-diffpatches.sh @@ -1,6 +1,4 @@ #!/usr/bin/env bash -# -# This script assumes a linux environment set -e From 96c5cd88313092c5164c32a779e16b71e615ef03 Mon Sep 17 00:00:00 2001 From: daylight Date: Wed, 30 Oct 2024 13:38:03 +0300 Subject: [PATCH 29/32] Update LICENSE --- LICENSE | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 9cecc1d4669..f288702d2fa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - {one line to give the program's name and a brief idea of what it does.} - Copyright (C) {year} {name of author} + + Copyright (C) This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found. GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - {project} Copyright (C) {year} {fullname} + Copyright (C) This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. From 28d5dfecdbc46baed3e5b37350bf56b8f352a21b Mon Sep 17 00:00:00 2001 From: daylight Date: Thu, 31 Oct 2024 13:24:43 +0300 Subject: [PATCH 30/32] add space --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index eabaee3570c..8a12189ad9f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -23,4 +23,4 @@ ### Notes -[Add here the result of whatever investigation work you have done: please investigate the issues you report—this prevents burdening other volunteers. This is especially true for issues arising from settings which are very different from default ones.] +[Add here the result of whatever investigation work you have done: please investigate the issues you report — this prevents burdening other volunteers. This is especially true for issues arising from settings which are very different from default ones.] From 3d851052faa4c228b06b9fc90a05081acc377319 Mon Sep 17 00:00:00 2001 From: daylight Date: Thu, 31 Oct 2024 13:27:21 +0300 Subject: [PATCH 31/32] add few missing things thanks for noticing btw @garry-ut99 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 07c7a89fee8..46c6c76da37 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,8 @@ uAssets will address the following exceptions even if they do not require the ex - Ad-Reinsertion - Anti-Blocker -- Context Menu Blockage -- Cut/Copy/Paste Blockage +- Context Menu/Dev Console Blockage +- Cut/Copy/Paste/Drag Blockage - Popups/Popunders - Website Breakage - Video Ads From e77f4cf7b7e1916bae3d3577bb433ca1420f0be4 Mon Sep 17 00:00:00 2001 From: daylight Date: Thu, 31 Oct 2024 13:38:35 +0300 Subject: [PATCH 32/32] also forgot --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 46c6c76da37..3759eb22e64 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,8 @@ uAssets will address the following exceptions even if they do not require the ex - Cut/Copy/Paste/Drag Blockage - Popups/Popunders - Website Breakage -- Video Ads +- Resource Abuse/Coin Mining +- Video/Audio Ads ### Exclusions