Skip to content

Commit 3ce5135

Browse files
gorhillgorhill
committed
Add more spin-offs of Fanboy Annoyances
1 parent 80cc568 commit 3ce5135

10 files changed

Lines changed: 56 additions & 24 deletions

‎templates/easylist-annoyances.template‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,22 @@
11
[Adblock Plus 2.0]
2-
! Title: EasyList Annoyances
2+
! Title: EasyList – Annoyances
33
! Last modified: %timestamp%
44
! Expires: 7 days (update frequency)
55
%include easylist:template_header.txt%
66
!
77
!--------------------------General blocking rules-----------------------------!
88
%include easylist:fanboy-addon/fanboy_annoyance_general_block.txt%
9-
%include easylist:fanboy-addon/fanboy_notifications_general_block.txt%
10-
%include easylist:fanboy-addon/fanboy_newsletter_general_block.txt%
119
!------------------------General element hiding rules-------------------------!
1210
%include easylist:fanboy-addon/fanboy_annoyance_general_hide.txt%
13-
%include easylist:fanboy-addon/fanboy_notifications_general_hide.txt%
14-
%include easylist:fanboy-addon/fanboy_newsletter_general_hide.txt%
1511
!-------------------------Third-party blocking rules--------------------------!
1612
%include easylist:fanboy-addon/fanboy_annoyance_thirdparty.txt%
17-
%include easylist:fanboy-addon/fanboy_notifications_thirdparty.txt%
18-
%include easylist:fanboy-addon/fanboy_newsletter_thirdparty.txt%
19-
%include easylist:fanboy-addon/fanboy_sounds_thirdparty.txt%
2013
!--------------------------Specific blocking filters--------------------------!
2114
%include easylist:fanboy-addon/fanboy_annoyance_specific_block.txt%
22-
%include easylist:fanboy-addon/fanboy_notifications_specific_block.txt%
23-
%include easylist:fanboy-addon/fanboy_newsletter_specific_block.txt%
2415
!------------------------Specific element hiding rules------------------------!
2516
%include easylist:fanboy-addon/fanboy_annoyance_specific_hide.txt%
2617
%include easylist:fanboy-addon/fanboy_annoyance_specific_uBO.txt%
27-
%include easylist:fanboy-addon/fanboy_notifications_specific_hide.txt%
28-
%include easylist:fanboy-addon/fanboy_notifications_specific_uBO.txt%
29-
%include easylist:fanboy-addon/fanboy_newsletter_specific_hide.txt%
30-
%include easylist:fanboy-addon/fanboy_newsletter_specific_uBO.txt%
3118
!------------------------Rules for international sites------------------------!
3219
%include easylist:fanboy-addon/fanboy_annoyance_international.txt%
33-
%include easylist:fanboy-addon/fanboy_newsletter_international_block.txt%
34-
%include easylist:fanboy-addon/fanboy_newsletter_international_hide.txt%
3520
!---------------------------------Allowlists----------------------------------!
3621
%include easylist:fanboy-addon/fanboy_annoyance_allowlist.txt%
3722
%include easylist:fanboy-addon/fanboy_annoyance_allowlist_general_hide.txt%
38-
%include easylist:fanboy-addon/fanboy_notifications_allowlist.txt%
39-
%include easylist:fanboy-addon/fanboy_notifications_allowlist_general_hide.txt%
40-
%include easylist:fanboy-addon/fanboy_newsletter_allowlist.txt%
41-
%include easylist:fanboy-addon/fanboy_newsletter_allowlist_general_hide.txt%

‎templates/easylist-cookies.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Adblock Plus 2.0]
2-
! Title: EasyList Cookies
2+
! Title: EasyList – Cookie Notices
33
! Last modified: %timestamp%
44
! Expires: 7 days (update frequency)
55
%include easylist:template_header.txt%

‎templates/easylist-newsletters.template‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
[Adblock Plus 2.0]
2+
! Title: EasyList – Newsletter Notices
3+
! Last modified: %timestamp%
4+
! Expires: 7 days (update frequency)
5+
%include easylist:template_header.txt%
6+
!
7+
!--------------------------General blocking rules-----------------------------!
8+
%include easylist:fanboy-addon/fanboy_newsletter_general_block.txt%
9+
!------------------------General element hiding rules-------------------------!
10+
%include easylist:fanboy-addon/fanboy_newsletter_general_hide.txt%
11+
!-------------------------Third-party blocking rules--------------------------!
12+
%include easylist:fanboy-addon/fanboy_newsletter_thirdparty.txt%
13+
!--------------------------Specific blocking filters--------------------------!
14+
%include easylist:fanboy-addon/fanboy_newsletter_specific_block.txt%
15+
!------------------------Specific element hiding rules------------------------!
16+
%include easylist:fanboy-addon/fanboy_newsletter_specific_hide.txt%
17+
%include easylist:fanboy-addon/fanboy_newsletter_specific_uBO.txt%
18+
!------------------------Rules for international sites------------------------!
19+
%include easylist:fanboy-addon/fanboy_newsletter_international_block.txt%
20+
%include easylist:fanboy-addon/fanboy_newsletter_international_hide.txt%
21+
!---------------------------------Allowlists----------------------------------!
22+
%include easylist:fanboy-addon/fanboy_newsletter_allowlist.txt%
23+
%include easylist:fanboy-addon/fanboy_newsletter_allowlist_general_hide.txt%

‎templates/easylist-notifications.template‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[Adblock Plus 2.0]
2+
! Title: EasyList – Notifications
3+
! Last modified: %timestamp%
4+
! Expires: 7 days (update frequency)
5+
%include easylist:template_header.txt%
6+
!
7+
!--------------------------General blocking rules-----------------------------!
8+
%include easylist:fanboy-addon/fanboy_notifications_general_block.txt%
9+
!------------------------General element hiding rules-------------------------!
10+
%include easylist:fanboy-addon/fanboy_notifications_general_hide.txt%
11+
!-------------------------Third-party blocking rules--------------------------!
12+
%include easylist:fanboy-addon/fanboy_notifications_thirdparty.txt%
13+
%include easylist:fanboy-addon/fanboy_sounds_thirdparty.txt%
14+
!--------------------------Specific blocking filters--------------------------!
15+
%include easylist:fanboy-addon/fanboy_notifications_specific_block.txt%
16+
!------------------------Specific element hiding rules------------------------!
17+
%include easylist:fanboy-addon/fanboy_notifications_specific_hide.txt%
18+
%include easylist:fanboy-addon/fanboy_notifications_specific_uBO.txt%
19+
!------------------------Rules for international sites------------------------!
20+
!---------------------------------Allowlists----------------------------------!
21+
%include easylist:fanboy-addon/fanboy_notifications_allowlist.txt%
22+
%include easylist:fanboy-addon/fanboy_notifications_allowlist_general_hide.txt%

‎templates/easylist-social.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[Adblock Plus 2.0]
2-
! Title: EasyList Social
2+
! Title: EasyList – Social Widgets
33
! Last modified: %timestamp%
44
! Expires: 7 days (update frequency)
55
%include easylist:template_header.txt%

‎templates/ublock-filters.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
! Title: uBlock₀ filters
1+
! Title: uBlock filters
22
! Description: Filters optimized for uBlock, to be used along EasyList
33
! Expires: 5 days
44
! Last modified: %timestamp%

‎templates/ublock-privacy.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
! Title: uBlock₀ filters – Privacy
1+
! Title: uBlock filters – Privacy
22
! Description: |
33
! Some of these filters make use of the `important` filter option,
44
! which purpose is to guarantee that a filter won't be overriden by

‎thirdparties/easylist/easylist-newsletters.txt‎

Whitespace-only changes.

‎thirdparties/easylist/easylist-notifications.txt‎

Whitespace-only changes.

‎tools/make-easylist.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,10 @@ node ./tools/easylist/make-easylist.js dir=$TMPDIR/easylist in=easylist-cookies.
2323
echo "*** uAssets: Assembling easylist-social.txt"
2424
node ./tools/easylist/make-easylist.js dir=$TMPDIR/easylist in=easylist-social.template out=thirdparties/easylist/easylist-social.txt
2525

26+
echo "*** uAssets: Assembling easylist-newsletters.txt"
27+
node ./tools/easylist/make-easylist.js dir=$TMPDIR/easylist in=easylist-newsletters.template out=thirdparties/easylist/easylist-newsletters.txt
28+
29+
echo "*** uAssets: Assembling easylist-notifications.txt"
30+
node ./tools/easylist/make-easylist.js dir=$TMPDIR/easylist in=easylist-notifications.template out=thirdparties/easylist/easylist-notifications.txt
31+
2632
rm -rf $TMPDIR

0 commit comments

Comments
 (0)