From 00e5f694b57332f90f89b0598d280b68ecbadf16 Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Sun, 25 May 2025 21:33:23 +0200
Subject: [PATCH 01/10] =?UTF-8?q?Dodanie=20brakuj=C4=85cych=20plik=C3=B3w?=
 =?UTF-8?q?=20kategorii?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mirror-source.json       | 0
 src/reflink-spam-source.json | 0
 src/satire-source.json       | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/mirror-source.json
 create mode 100644 src/reflink-spam-source.json
 create mode 100644 src/satire-source.json

diff --git a/src/mirror-source.json b/src/mirror-source.json
new file mode 100644
index 0000000..e69de29
diff --git a/src/reflink-spam-source.json b/src/reflink-spam-source.json
new file mode 100644
index 0000000..e69de29
diff --git a/src/satire-source.json b/src/satire-source.json
new file mode 100644
index 0000000..e69de29
-- 
2.30.2


From cd39080c01d3499cc9466c34657e49f30a310dd9 Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Sun, 25 May 2025 21:39:34 +0200
Subject: [PATCH 02/10] Dodanie nowych kategorii do Makefile

---
 Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d934435..27f2ba4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,17 @@
 CONVERTER = python3 src/converter.py
 
+# AdGuard
 dist/seo-nonsense/adguard.txt:: src/seo-source.json
 	$(CONVERTER) --inputfile src/seo-source.json --targetformat adguard --outputfile dist/seo-nonsense/adguard.txt
+dist/reflink-spam/adguard.txt:: src/reflink-spam-source.json
+	$(CONVERTER) --inputfile src/reflink-spam-source.json --targetformat adguard --outputfile dist/reflink-spam/adguard.txt
+dist/satire/adguard.txt:: src/satire-source.json
+	$(CONVERTER) --inputfile src/satire-source.json --targetformat adguard --outputfile dist/satire/adguard.txt
+dist/mirror/adguard.txt:: src/mirror-source.json
+	$(CONVERTER) --inputfile src/mirror-source.json --targetformat adguard --outputfile dist/mirror/adguard.txt
 
-build: dist/seo-nonsense/adguard.txt
+
+build: dist/seo-nonsense/adguard.txt dist/reflink-spam/adguard.txt dist/satire/adguard.txt dist/mirror/adguard.txt
 
 
 clean:
-- 
2.30.2


From 759cfd704c545f572e52305f4e9b1116426696ee Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Sun, 25 May 2025 21:49:19 +0200
Subject: [PATCH 03/10] Add ublacklist converter format

---
 src/converter.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/converter.py b/src/converter.py
index e10fb0c..61a1a72 100644
--- a/src/converter.py
+++ b/src/converter.py
@@ -76,6 +76,8 @@ def convert(data: dict, last_modified: datetime, target_format: str) -> str:
     match target_format:
         case "adguard":
             return adguard_conversion(last_modified, data)
+        case "ublacklist":
+            return ublacklist_conversion(last_modified, data)
         case _:
             raise UnsupportedTargetFormatError
 
@@ -97,6 +99,23 @@ def adguard_conversion(last_modified: datetime, data: dict) -> list[str]:
     return "\n".join(output)
 
 
+def ublacklist_conversion(last_modified: datetime, data: dict) -> list[str]:
+    header_lines: list[str] = [
+        f"# Blocking list automatically generated at {last_modified.strftime('%Y-%m-%d %H:%M:%S %Z%z')}",
+        "# Created with ❤️ by internet-czas-dzialac.pl",
+    ]
+
+    output: list[str] = list(header_lines)
+
+    for entry in data["domains"]:
+        fqdn = entry["fqdn"]
+        if entry.get("exclude", False):
+            continue
+        output.append(f"*://*.{fqdn}/*")
+
+    return "\n".join(output)
+
+
 def dump_output(data: str, output_file: str) -> None:
     try:
         directory = os.path.dirname(output_file)
-- 
2.30.2


From 5a283cd79e54dfd0049f837d54ce016caba6921d Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Sun, 25 May 2025 21:50:07 +0200
Subject: [PATCH 04/10] Add ublacklist format to help message

---
 src/converter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/converter.py b/src/converter.py
index 61a1a72..b45b673 100644
--- a/src/converter.py
+++ b/src/converter.py
@@ -52,7 +52,7 @@ def parse_arguments() -> argparse.Namespace:
         "--targetformat",
         required=True,
         metavar="TARGET_FORMAT",
-        help="Target output format (e.g., adguard)",
+        help="Target output format (supported formats: adguard, ublacklist)",
     )
     parser.add_argument(
         "--outputfile",
-- 
2.30.2


From 65bc720c10265d775b3732d6071228ab991c583c Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Sun, 25 May 2025 21:56:33 +0200
Subject: [PATCH 05/10] Dostosowanie Makefile pod nowy format

---
 Makefile | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 27f2ba4..0b6920e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,38 @@
 CONVERTER = python3 src/converter.py
 
-# AdGuard
+# Seo Nonsense
 dist/seo-nonsense/adguard.txt:: src/seo-source.json
 	$(CONVERTER) --inputfile src/seo-source.json --targetformat adguard --outputfile dist/seo-nonsense/adguard.txt
-dist/reflink-spam/adguard.txt:: src/reflink-spam-source.json
+dist/seo-nonsense/ublacklist.txt:: src/seo-source.json
+	$(CONVERTER) --inputfile src/seo-source.json --targetformat ublacklist --outputfile dist/seo-nonsense/ublacklist.txt
+
+# Reflink Spam
+dist/reflink-spam/adguard.txt:: src/seo-source.json
 	$(CONVERTER) --inputfile src/reflink-spam-source.json --targetformat adguard --outputfile dist/reflink-spam/adguard.txt
+dist/reflink-spam/ublacklist.txt:: src/seo-source.json
+	$(CONVERTER) --inputfile src/reflink-spam-source.json --targetformat ublacklist --outputfile dist/reflink-spam/ublacklist.txt
+
+# Satire
 dist/satire/adguard.txt:: src/satire-source.json
 	$(CONVERTER) --inputfile src/satire-source.json --targetformat adguard --outputfile dist/satire/adguard.txt
+dist/satire/ublacklist.txt:: src/satire-source.json
+	$(CONVERTER) --inputfile src/satire-source.json --targetformat ublacklist --outputfile dist/satire/ublacklist.txt
+
+# Mirror
 dist/mirror/adguard.txt:: src/mirror-source.json
 	$(CONVERTER) --inputfile src/mirror-source.json --targetformat adguard --outputfile dist/mirror/adguard.txt
+dist/mirror/ublacklist.txt:: src/mirror-source.json
+	$(CONVERTER) --inputfile src/mirror-source.json --targetformat ublacklist --outputfile dist/mirror/ublacklist.txt
 
 
-build: dist/seo-nonsense/adguard.txt dist/reflink-spam/adguard.txt dist/satire/adguard.txt dist/mirror/adguard.txt
+build-all: build-seo-nonsense build-reflink-spam build-satire build-mirror
 
+build-seo-nonsense: dist/seo-nonsense/adguard.txt dist/seo-nonsense/ublacklist.txt
+build-reflink-spam: dist/reflink-spam/adguard.txt dist/reflink-spam/ublacklist.txt
+build-satire: dist/satire/adguard.txt dist/satire/ublacklist.txt
+build-mirror: dist/mirror/adguard.txt dist/mirror/ublacklist.txt
 
 clean:
 	rm -rf dist/*
 
-all: build
+all: build-all
-- 
2.30.2


From 493721b16a8e3fe0576172e5f8927cbcef0e6a3b Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Sun, 25 May 2025 21:57:16 +0200
Subject: [PATCH 06/10] =?UTF-8?q?Dodanie=20pocz=C4=85tkowej=20warto=C5=9Bc?=
 =?UTF-8?q?i=20JSON=20plikom=20nowych=20kategorii?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mirror-source.json       | 3 +++
 src/reflink-spam-source.json | 3 +++
 src/satire-source.json       | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/src/mirror-source.json b/src/mirror-source.json
index e69de29..1240f0f 100644
--- a/src/mirror-source.json
+++ b/src/mirror-source.json
@@ -0,0 +1,3 @@
+{
+    "domains": []
+}
\ No newline at end of file
diff --git a/src/reflink-spam-source.json b/src/reflink-spam-source.json
index e69de29..1240f0f 100644
--- a/src/reflink-spam-source.json
+++ b/src/reflink-spam-source.json
@@ -0,0 +1,3 @@
+{
+    "domains": []
+}
\ No newline at end of file
diff --git a/src/satire-source.json b/src/satire-source.json
index e69de29..1240f0f 100644
--- a/src/satire-source.json
+++ b/src/satire-source.json
@@ -0,0 +1,3 @@
+{
+    "domains": []
+}
\ No newline at end of file
-- 
2.30.2


From f9ceae98efa42d71d2cf49195ecf0ddd508644b4 Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Sun, 25 May 2025 21:58:00 +0200
Subject: [PATCH 07/10] Automatycznie wygenerowane dane

---
 dist/mirror/adguard.txt          | 2 ++
 dist/mirror/ublacklist.txt       | 2 ++
 dist/reflink-spam/adguard.txt    | 2 ++
 dist/reflink-spam/ublacklist.txt | 2 ++
 dist/satire/adguard.txt          | 2 ++
 dist/satire/ublacklist.txt       | 2 ++
 6 files changed, 12 insertions(+)
 create mode 100644 dist/mirror/adguard.txt
 create mode 100644 dist/mirror/ublacklist.txt
 create mode 100644 dist/reflink-spam/adguard.txt
 create mode 100644 dist/reflink-spam/ublacklist.txt
 create mode 100644 dist/satire/adguard.txt
 create mode 100644 dist/satire/ublacklist.txt

diff --git a/dist/mirror/adguard.txt b/dist/mirror/adguard.txt
new file mode 100644
index 0000000..9079baf
--- /dev/null
+++ b/dist/mirror/adguard.txt
@@ -0,0 +1,2 @@
+! Blocking list automatically generated at 2025-05-25 19:55:20 UTC+0000
+! Created with ❤️ by internet-czas-dzialac.pl
\ No newline at end of file
diff --git a/dist/mirror/ublacklist.txt b/dist/mirror/ublacklist.txt
new file mode 100644
index 0000000..486173d
--- /dev/null
+++ b/dist/mirror/ublacklist.txt
@@ -0,0 +1,2 @@
+# Blocking list automatically generated at 2025-05-25 19:55:20 UTC+0000
+# Created with ❤️ by internet-czas-dzialac.pl
\ No newline at end of file
diff --git a/dist/reflink-spam/adguard.txt b/dist/reflink-spam/adguard.txt
new file mode 100644
index 0000000..797a4dc
--- /dev/null
+++ b/dist/reflink-spam/adguard.txt
@@ -0,0 +1,2 @@
+! Blocking list automatically generated at 2025-05-25 19:55:22 UTC+0000
+! Created with ❤️ by internet-czas-dzialac.pl
\ No newline at end of file
diff --git a/dist/reflink-spam/ublacklist.txt b/dist/reflink-spam/ublacklist.txt
new file mode 100644
index 0000000..7cc2bcf
--- /dev/null
+++ b/dist/reflink-spam/ublacklist.txt
@@ -0,0 +1,2 @@
+# Blocking list automatically generated at 2025-05-25 19:55:22 UTC+0000
+# Created with ❤️ by internet-czas-dzialac.pl
\ No newline at end of file
diff --git a/dist/satire/adguard.txt b/dist/satire/adguard.txt
new file mode 100644
index 0000000..157c4c5
--- /dev/null
+++ b/dist/satire/adguard.txt
@@ -0,0 +1,2 @@
+! Blocking list automatically generated at 2025-05-25 19:55:24 UTC+0000
+! Created with ❤️ by internet-czas-dzialac.pl
\ No newline at end of file
diff --git a/dist/satire/ublacklist.txt b/dist/satire/ublacklist.txt
new file mode 100644
index 0000000..a35e5e0
--- /dev/null
+++ b/dist/satire/ublacklist.txt
@@ -0,0 +1,2 @@
+# Blocking list automatically generated at 2025-05-25 19:55:24 UTC+0000
+# Created with ❤️ by internet-czas-dzialac.pl
\ No newline at end of file
-- 
2.30.2


From 7a43407aefef13614ef885f392dae7010193919c Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Tue, 27 May 2025 17:11:34 +0200
Subject: [PATCH 08/10] Zmiana nazwy seo-source.json na
 seo-nonsense-source.json

---
 src/{seo-source.json => seo-nonsense-source.json} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/{seo-source.json => seo-nonsense-source.json} (100%)

diff --git a/src/seo-source.json b/src/seo-nonsense-source.json
similarity index 100%
rename from src/seo-source.json
rename to src/seo-nonsense-source.json
-- 
2.30.2


From 4c5d889b9732e1ab8826eb34bd6104f55e89456b Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Tue, 27 May 2025 17:32:25 +0200
Subject: [PATCH 09/10] Refaktoryzacja Makefile

---
 Makefile | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

diff --git a/Makefile b/Makefile
index 0b6920e..ee53574 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,14 @@
 CONVERTER = python3 src/converter.py
+BLOCKLISTS = seo-nonsense reflink-spam satire mirror
+TARGET_FORMATS = adguard ublacklist
 
-# Seo Nonsense
-dist/seo-nonsense/adguard.txt:: src/seo-source.json
-	$(CONVERTER) --inputfile src/seo-source.json --targetformat adguard --outputfile dist/seo-nonsense/adguard.txt
-dist/seo-nonsense/ublacklist.txt:: src/seo-source.json
-	$(CONVERTER) --inputfile src/seo-source.json --targetformat ublacklist --outputfile dist/seo-nonsense/ublacklist.txt
+build: $(foreach blocklist, $(BLOCKLISTS), $(foreach targetformat, $(TARGET_FORMATS), dist/$(blocklist)/$(targetformat).txt))
 
-# Reflink Spam
-dist/reflink-spam/adguard.txt:: src/seo-source.json
-	$(CONVERTER) --inputfile src/reflink-spam-source.json --targetformat adguard --outputfile dist/reflink-spam/adguard.txt
-dist/reflink-spam/ublacklist.txt:: src/seo-source.json
-	$(CONVERTER) --inputfile src/reflink-spam-source.json --targetformat ublacklist --outputfile dist/reflink-spam/ublacklist.txt
-
-# Satire
-dist/satire/adguard.txt:: src/satire-source.json
-	$(CONVERTER) --inputfile src/satire-source.json --targetformat adguard --outputfile dist/satire/adguard.txt
-dist/satire/ublacklist.txt:: src/satire-source.json
-	$(CONVERTER) --inputfile src/satire-source.json --targetformat ublacklist --outputfile dist/satire/ublacklist.txt
-
-# Mirror
-dist/mirror/adguard.txt:: src/mirror-source.json
-	$(CONVERTER) --inputfile src/mirror-source.json --targetformat adguard --outputfile dist/mirror/adguard.txt
-dist/mirror/ublacklist.txt:: src/mirror-source.json
-	$(CONVERTER) --inputfile src/mirror-source.json --targetformat ublacklist --outputfile dist/mirror/ublacklist.txt
-
-
-build-all: build-seo-nonsense build-reflink-spam build-satire build-mirror
-
-build-seo-nonsense: dist/seo-nonsense/adguard.txt dist/seo-nonsense/ublacklist.txt
-build-reflink-spam: dist/reflink-spam/adguard.txt dist/reflink-spam/ublacklist.txt
-build-satire: dist/satire/adguard.txt dist/satire/ublacklist.txt
-build-mirror: dist/mirror/adguard.txt dist/mirror/ublacklist.txt
+dist/%.txt:
+	@mkdir -p $(dir $@) && \
+		$(CONVERTER) --inputfile src/$(firstword $(subst /, ,$*))-source.json --targetformat $(notdir $*) --outputfile $@
 
 clean:
 	rm -rf dist/*
 
-all: build-all
+all: build
-- 
2.30.2


From 103034719dde358c0567a7051d41028dc4acd3fd Mon Sep 17 00:00:00 2001
From: Wiktor <>
Date: Wed, 28 May 2025 22:08:48 +0200
Subject: [PATCH 10/10] fix: Makefile

Co-authored-by: cichy1173 <cichy1173@protonmail.com>
---
 Makefile | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index ee53574..ea5f65e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,22 @@ CONVERTER = python3 src/converter.py
 BLOCKLISTS = seo-nonsense reflink-spam satire mirror
 TARGET_FORMATS = adguard ublacklist
 
-build: $(foreach blocklist, $(BLOCKLISTS), $(foreach targetformat, $(TARGET_FORMATS), dist/$(blocklist)/$(targetformat).txt))
+TARGETS = $(foreach blocklist, $(BLOCKLISTS), $(foreach targetformat, $(TARGET_FORMATS), dist/$(blocklist)/$(targetformat).txt))
 
-dist/%.txt:
-	@mkdir -p $(dir $@) && \
-		$(CONVERTER) --inputfile src/$(firstword $(subst /, ,$*))-source.json --targetformat $(notdir $*) --outputfile $@
+build: $(TARGETS)
+
+dist/%/adguard.txt: src/%-source.json
+	mkdir -p dist/$*
+	$(CONVERTER) --inputfile src/$*-source.json --targetformat adguard --outputfile $@
+
+dist/%/ublacklist.txt: src/%-source.json
+	mkdir -p dist/$*
+	$(CONVERTER) --inputfile src/$*-source.json --targetformat ublacklist --outputfile $@
 
 clean:
 	rm -rf dist/*
 
 all: build
+
+.PHONY: build clean all
+
-- 
2.30.2