Merge pull request #28 from Isaaker/Developer

Add more blocklist domains, remove casting domain, update contributing and other minor changes
Isaaker · Jul 12, 2024 · 7722659 · 7722659
2 parents 78a3f04 + 5769e4e
commit 7722659
Show file tree

Hide file tree

Showing 9 changed files with 117 additions and 67 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug-report.yaml b/.github/ISSUE_TEMPLATE/bug-report.yaml
@@ -25,68 +25,44 @@ body:
     validations:
       required: true
   - type: dropdown
-    id: version
+    id: platform
     attributes:
-      label: Browser
-      description: What browser did you use when you had the bug?
+      label: Platform
+      description: "Please, select your platform."
       options:
-        - Firefox
-        - Firefox Developer Edition
-        - Safari
-        - Chrome
-        - Chromium
-        - Opera
-        - Opera GX
-        - Microsoft Edge
-        - Internet Explorer
-        - QQ Browser
-        - elinks
-        - Samsung Internet
-        - Vivaldi
-        - Brave
-        - Other (Tell us the name the name in the box below)
+        - Web App
+        - App
+        - API
+        - TV
+        - Carplay & Android auto
+        - Smart Home Devices (such as speakers)
+        - Other
     validations:
       required: true
-  - type: textarea
-    id: browser-version
-    attributes:
-      label: Tell us the name the name of your browser if you select Other
-      description: Also tell us, what did you expect to happen?
-      placeholder: Tell us the name
-    validations:
-      required: false
-  - type: textarea
-    id: other-browser
+  - type: input
+    id: device
     attributes:
-      label: Browser Version
-      description: Tell us the name the version of your browser
-      placeholder: Example -> Version 16.0
+      label: Device
+      description: "Please, enter your device name."
+      placeholder: Example -> iPhone
     validations:
       required: true
-  - type: dropdown
-    id: operative_system
+  - type: input
+    id: os_version
     attributes:
-      label: Operative System (OS)
-      multiple: true
-      options:
-        - MacOS (Apple)
-        - iOS (Apple)
-        - Android (Google)
-        - WatchOS (Apple)
-        - ChromeOS (Google)
-        - Windows (Microsoft)
-        - Linux (Linux Foundation)
-        - Other
+      label: OS & Version
+      description: "Please, enter your device OS & Version."
+      placeholder: Example -> MacOS (14.2.1)
     validations:
       required: true
-  - type: textarea
-    id: other-os
+  - type: input
+    id: browser_version
     attributes:
-      label: OS Version
-      description: Tell us the Version of OS, if you select other also tell us your operative system name
-      placeholder: Example -> Monterey 12.6
+      label: Browser & Version (If applicable)
+      description: "Please, enter your Browser & Version (If applicable)."
+      placeholder: Example -> Safari (17.2.1)
     validations:
-      required: true
+      required: false
   - type: textarea
     id: logs
     attributes:

diff --git a/...REQUEST_TEMPLATE/pull_request_template.md → .github/pull_request_template.md b/...REQUEST_TEMPLATE/pull_request_template.md → .github/pull_request_template.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -34,4 +34,10 @@ You can colaborate in this ways:
 - [Opening a Issue](https://github.com/Isaaker/Spotify-AdsList/issues/new/choose)
 - [Making a Fork](https://github.com/Isaaker/Spotify-AdsList/fork) and later opening a Pull Request to the Developer branch of the origin repository
 
-**⚠️Please, make changes only on BLACKLIST.txt (Don't put extra lines or comments in this file) or WHITELIST.txt, changes on other files are not longer conserved due to an automatic list conversion.**
+**⚠️Please, make changes only on BLACKLIST.txt (Don't put extra lines or comments in this file) or WHITELIST.txt, changes on other files are not longer conserved due to an automatic list conversion.**
+
+## Appear as a contributor
+
+Only users who contribute through PR or provide possible solutions to their problems can appear in this repository as contributors. In addition, users whose contributions are deemed noteworthy or whose problem is followed for a long time may be considered eligible to appear as contributors.
+
+This is subject to change, and the repository administrator can always add or not add contributors at their discretion.
diff --git a/Lists/BLACKLIST.txt b/Lists/BLACKLIST.txt
@@ -719,7 +719,6 @@ cal.spotify.com
 car-dev.scdn.co
 car-prod.scdn.co
 car-staging.scdn.co
-cast.scdn.co
 charts-images.scdn.co
 clemmie.ash1.spotify.com
 clemmie.ash.spotify.com
@@ -1554,4 +1553,10 @@ a1556.dsct.akamai.net
 a1051.dscw154.akamai.net
 video-akpcw-cdn-spotify-com.akamaized.net
 2qbjhhcl4u87btjbo7dh8vi2n.litix.io
-litix.io
+litix.io
+a1949.dscb.akamai.net
+a1887.dscq.akamai.net
+e11408.d.akamaiedge.net
+e14768.dscb.akamaiedge.net
+e17437.dsct.akamaiedge.net
+e7366.dscb.akamaiedge.net
diff --git a/Lists/adguard.txt b/Lists/adguard.txt
@@ -1,10 +1,10 @@
 #######################################################################################
 ##### Spotify Ads Blacklist                                                        ####
 ##### Created by: Isaaker                                                          ####
-##### Updated: 2024-07-04 (GMT)                                                    ####
+##### Updated: 2024-07-12 (GMT)                                                    ####
 #######################################################################################
 ##### Version: Adguard                                                             ####
-##### Number of domains: 1557                                                      ####
+##### Number of domains: 1562                                                      ####
 #######################################################################################
 ##### Read more: https://github.com/Isaaker/Spotify-AdsList                        ####
 ##### License: https://github.com/Isaaker/Spotify-AdsList/blob/main/LICENSE.txt    ####
@@ -731,7 +731,6 @@
 ||car-dev.scdn.co^
 ||car-prod.scdn.co^
 ||car-staging.scdn.co^
-||cast.scdn.co^
 ||charts-images.scdn.co^
 ||clemmie.ash1.spotify.com^
 ||clemmie.ash.spotify.com^
@@ -1567,3 +1566,9 @@
 ||video-akpcw-cdn-spotify-com.akamaized.net^
 ||2qbjhhcl4u87btjbo7dh8vi2n.litix.io^
 ||litix.io^
+||a1949.dscb.akamai.net^
+||a1887.dscq.akamai.net^
+||e11408.d.akamaiedge.net^
+||e14768.dscb.akamaiedge.net^
+||e17437.dsct.akamaiedge.net^
+||e7366.dscb.akamaiedge.net^
diff --git a/Lists/dnsmasq.txt b/Lists/dnsmasq.txt
@@ -1,10 +1,10 @@
 #######################################################################################
 ##### Spotify Ads Blacklist                                                        ####
 ##### Created by: Isaaker                                                          ####
-##### Updated: 2024-07-04 (GMT)                                                    ####
+##### Updated: 2024-07-12 (GMT)                                                    ####
 #######################################################################################
 ##### Version: dnsmasq                                                             ####
-##### Number of domains: 1557                                                      ####
+##### Number of domains: 1562                                                      ####
 #######################################################################################
 ##### Read more: https://github.com/Isaaker/Spotify-AdsList                        ####
 ##### License: https://github.com/Isaaker/Spotify-AdsList/blob/main/LICENSE.txt    ####
@@ -731,7 +731,6 @@ server=/cal.spotify.com/
 server=/car-dev.scdn.co/
 server=/car-prod.scdn.co/
 server=/car-staging.scdn.co/
-server=/cast.scdn.co/
 server=/charts-images.scdn.co/
 server=/clemmie.ash1.spotify.com/
 server=/clemmie.ash.spotify.com/
@@ -1567,3 +1566,9 @@ server=/a1051.dscw154.akamai.net/
 server=/video-akpcw-cdn-spotify-com.akamaized.net/
 server=/2qbjhhcl4u87btjbo7dh8vi2n.litix.io/
 server=/litix.io/
+server=/a1949.dscb.akamai.net/
+server=/a1887.dscq.akamai.net/
+server=/e11408.d.akamaiedge.net/
+server=/e14768.dscb.akamaiedge.net/
+server=/e17437.dsct.akamaiedge.net/
+server=/e7366.dscb.akamaiedge.net/
diff --git a/Lists/pi-hole.txt b/Lists/pi-hole.txt
@@ -1,10 +1,10 @@
 #######################################################################################
 ##### Spotify Ads Blacklist                                                        ####
 ##### Created by: Isaaker                                                          ####
-##### Updated: 2024-07-04 (GMT)                                                    ####
+##### Updated: 2024-07-12 (GMT)                                                    ####
 #######################################################################################
 ##### Version: pi-hole                                                             ####
-##### Number of domains: 1557                                                      ####
+##### Number of domains: 1562                                                      ####
 #######################################################################################
 ##### Read more: https://github.com/Isaaker/Spotify-AdsList                        ####
 ##### License: https://github.com/Isaaker/Spotify-AdsList/blob/main/LICENSE.txt    ####
@@ -731,7 +731,6 @@ cal.spotify.com
 car-dev.scdn.co
 car-prod.scdn.co
 car-staging.scdn.co
-cast.scdn.co
 charts-images.scdn.co
 clemmie.ash1.spotify.com
 clemmie.ash.spotify.com
@@ -1566,4 +1565,10 @@ a1556.dsct.akamai.net
 a1051.dscw154.akamai.net
 video-akpcw-cdn-spotify-com.akamaized.net
 2qbjhhcl4u87btjbo7dh8vi2n.litix.io
-litix.io
+litix.io
+a1949.dscb.akamai.net
+a1887.dscq.akamai.net
+e11408.d.akamaiedge.net
+e14768.dscb.akamaiedge.net
+e17437.dsct.akamaiedge.net
+e7366.dscb.akamaiedge.net
diff --git a/Lists/standard_list.txt b/Lists/standard_list.txt
@@ -1,10 +1,10 @@
 #######################################################################################
 ##### Spotify Ads Blacklist                                                        ####
 ##### Created by: Isaaker                                                          ####
-##### Updated: 2024-07-04 (GMT)                                                    ####
+##### Updated: 2024-07-12 (GMT)                                                    ####
 #######################################################################################
 ##### Version: Standard                                                            ####
-##### Number of domains: 1557                                                      ####
+##### Number of domains: 1562                                                      ####
 #######################################################################################
 ##### Read more: https://github.com/Isaaker/Spotify-AdsList                        ####
 ##### License: https://github.com/Isaaker/Spotify-AdsList/blob/main/LICENSE.txt    ####
@@ -731,7 +731,6 @@
 0.0.0.0 car-dev.scdn.co
 0.0.0.0 car-prod.scdn.co
 0.0.0.0 car-staging.scdn.co
-0.0.0.0 cast.scdn.co
 0.0.0.0 charts-images.scdn.co
 0.0.0.0 clemmie.ash1.spotify.com
 0.0.0.0 clemmie.ash.spotify.com
@@ -1566,4 +1565,10 @@
 0.0.0.0 a1051.dscw154.akamai.net
 0.0.0.0 video-akpcw-cdn-spotify-com.akamaized.net
 0.0.0.0 2qbjhhcl4u87btjbo7dh8vi2n.litix.io
-0.0.0.0 litix.io
+0.0.0.0 litix.io
+0.0.0.0 a1949.dscb.akamai.net
+0.0.0.0 a1887.dscq.akamai.net
+0.0.0.0 e11408.d.akamaiedge.net
+0.0.0.0 e14768.dscb.akamaiedge.net
+0.0.0.0 e17437.dsct.akamaiedge.net
+0.0.0.0 e7366.dscb.akamaiedge.net
diff --git a/docs/contributing.md b/docs/contributing.md
@@ -0,0 +1,43 @@
+# Contributing
+
+**Always read the license and code of conduct before contributing, once the changes you have made are added to the source repository they will be licensed under the source repository license**
+
+## Content to collaborate with
+
+This repository is a blocklist for Spotify Ads, therefore, the following contents are acceptable as a contribution:
+
+Accepted contents:
+
+- Spelling corrections
+- Corrections of images or videos that are not displayed correctly
+- Invalid domain correction
+- New list format
+- Add new domains to the blocklist
+- Add new domains to the whitelist
+
+Not accepted contents:
+
+- Comments (for SPAM prevention)
+- Ads of any kind
+- Self-Promoting
+- Posts or articles of your own creation
+- Any kind of sensitive content
+- Any type of content containing personal information of any person
+- Any kind of software (as this repository is oriented to a website and not to software distribution)
+
+**If you are in doubt as to whether a piece of content is suitable to be added to this repository, please contact us through the contact section of the website**
+
+## How to colaborate
+
+You can colaborate in this ways:
+
+- [Opening a Issue](https://github.com/Isaaker/Spotify-AdsList/issues/new/choose)
+- [Making a Fork](https://github.com/Isaaker/Spotify-AdsList/fork) and later opening a Pull Request to the Developer branch of the origin repository
+
+**⚠️Please, make changes only on BLACKLIST.txt (Don't put extra lines or comments in this file) or WHITELIST.txt, changes on other files are not longer conserved due to an automatic list conversion.**
+
+## Appear as a contributor
+
+Only users who contribute through PR or provide possible solutions to their problems can appear in this repository as contributors. In addition, users whose contributions are deemed noteworthy or whose problem is followed for a long time may be considered eligible to appear as contributors.
+
+This is subject to change, and the repository administrator can always add or not add contributors at their discretion.