pi-hole / FTL

The Pi-hole FTL engine
https://pi-hole.net
Other
1.34k stars 187 forks source link

Allow adlist duplicates #1886

Closed DL6ER closed 4 months ago

DL6ER commented 4 months ago

What does this implement/fix?

Allow narrowing down the (ad)list type using the (optional) query parameter ?type={allow,block}.

Accompanying change related to https://github.com/pi-hole/pi-hole/pull/5572. See reasoning therein.

This is a feature request submitted on Discourse (see link below).

[!NOTE] This pull requests requires all three Pi-hole components to be checked out

pihole checkout core tweak/allow_adlist_dups
pihole checkout web tweak/allow_adlist_dups
pihole checkout ftl tweak/allow_adlist_dups

for testing


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

pralor-bot commented 4 months ago

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/lists-cant-add-identical-url-twice-blocklist-allowlist/68261/12

github-actions[bot] commented 4 months ago

This pull request has conflicts, please resolve those before we can evaluate the pull request.

github-actions[bot] commented 4 months ago

Conflicts have been resolved.

DL6ER commented 4 months ago

Has been confirmed working on the related Discourse thread

DL6ER commented 4 months ago

Merge only once https://github.com/pi-hole/pi-hole/pull/5572 and https://github.com/pi-hole/web/pull/2958 are approved as well as these branches depend on each other