add gemius and matomo as scriptlets, cleanup

AdguardTeam · Mar 13, 2024 · 47c9b66 · 47c9b66
1 parent 466c927
commit 47c9b66
Show file tree

Hide file tree

Showing 20 changed files with 80 additions and 31 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,11 +19,13 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
     - `didomi-loader`
     - `fingerprintjs2`
     - `fingerprintjs3`
+    - `gemius`
     - `google-analytics`
     - `google-analytics-ga`
     - `google-ima3`
     - `googlesyndication-adsbygoogle`
     - `googletagservices-gpt`
+    - `matomo`
     - `metrika-yandex-tag`
     - `metrika-yandex-watch`
     - `naver-wcslog`

diff --git a/scripts/compatibility-table.json b/scripts/compatibility-table.json
@@ -51,57 +51,39 @@
             "adg": "didomi-loader"
         },
         {
-            "adg": "fingerprintjs2"
-        },
-        {
-            "adg": "fingerprintjs3"
-        },
-        {
-            "adg": "google-analytics"
-        },
-        {
-            "adg": "google-analytics-ga"
-        },
-        {
-            "adg": "google-ima3"
-        },
-        {
-            "adg": "googlesyndication-adsbygoogle"
-        },
-        {
-            "adg": "googletagservices-gpt"
+            "adg": "dir-string"
         },
         {
-            "adg": "metrika-yandex-watch"
+            "adg": "disable-newtab-links",
+            "ubo": "disable-newtab-links.js"
         },
         {
-            "adg": "metrika-yandex-tag"
+            "adg": "evaldata-prune",
+            "ubo": "evaldata-prune.js"
         },
         {
-            "adg": "naver-wcslog"
+            "adg": "fingerprintjs2"
         },
         {
-            "adg": "no-protected-audience"
+            "adg": "fingerprintjs3"
         },
         {
-            "adg": "pardot-1.0"
+            "adg": "gemius"
         },
         {
-            "adg": "prebid"
+            "adg": "google-analytics"
         },
         {
-            "adg": "scorecardresearch-beacon"
+            "adg": "google-analytics-ga"
         },
         {
-            "adg": "dir-string"
+            "adg": "google-ima3"
         },
         {
-            "adg": "disable-newtab-links",
-            "ubo": "disable-newtab-links.js"
+            "adg": "googlesyndication-adsbygoogle"
         },
         {
-            "adg": "evaldata-prune",
-            "ubo": "evaldata-prune.js"
+            "adg": "googletagservices-gpt"
         },
         {
             "adg": "json-prune",
@@ -126,16 +108,37 @@
             "adg": "m3u-prune",
             "ubo": "m3u-prune.js"
         },
+        {
+            "adg": "matomo"
+        },
+        {
+            "adg": "metrika-yandex-watch"
+        },
+        {
+            "adg": "metrika-yandex-tag"
+        },
+        {
+            "adg": "naver-wcslog"
+        },
         {
             "adg": "noeval"
         },
         {
             "adg": "nowebrtc",
             "ubo": "nowebrtc.js"
         },
+        {
+            "adg": "no-protected-audience"
+        },
         {
             "adg": "no-topics"
         },
+        {
+            "adg": "pardot-1.0"
+        },
+        {
+            "adg": "prebid"
+        },
         {
             "adg": "prevent-addEventListener",
             "ubo": "addEventListener-defuser.js (aeld.js, prevent-addEventListener.js)",
@@ -206,6 +209,9 @@
             "adg": "remove-node-text",
             "ubo": "remove-node-text.js (rmnt.js)"
         },
+        {
+            "adg": "scorecardresearch-beacon"
+        },
         {
             "adg": "set-attr",
             "ubo": "set-attr.js"

diff --git a/src/scriptlets/amazon-apstag.js → src/scriptlets/amazon-apstag.ts b/src/scriptlets/amazon-apstag.js → src/scriptlets/amazon-apstag.ts
diff --git a/src/scriptlets/didomi-loader.js → src/scriptlets/didomi-loader.ts b/src/scriptlets/didomi-loader.js → src/scriptlets/didomi-loader.ts
diff --git a/src/scriptlets/fingerprintjs2.js → src/scriptlets/fingerprintjs2.ts b/src/scriptlets/fingerprintjs2.js → src/scriptlets/fingerprintjs2.ts
diff --git a/src/scriptlets/fingerprintjs3.js → src/scriptlets/fingerprintjs3.ts b/src/scriptlets/fingerprintjs3.js → src/scriptlets/fingerprintjs3.ts
diff --git a/src/scriptlets/gemius.ts b/src/scriptlets/gemius.ts
@@ -0,0 +1,18 @@
+import { Gemius } from '../redirects/gemius';
+
+/**
+ * @scriptlet gemius
+ *
+ * @description
+ * Mocks Gemius Analytics.
+ * https://flowplayer.com/developers/plugins/gemius
+ *
+ * ### Examples
+ *
+ * ```adblock
+ * example.org#%#//scriptlet('gemius')
+ * ```
+ *
+ * @added unknown.
+ */
+export { Gemius };
diff --git a/src/scriptlets/google-analytics-ga.js → src/scriptlets/google-analytics-ga.ts b/src/scriptlets/google-analytics-ga.js → src/scriptlets/google-analytics-ga.ts
diff --git a/src/scriptlets/google-analytics.js → src/scriptlets/google-analytics.ts b/src/scriptlets/google-analytics.js → src/scriptlets/google-analytics.ts
diff --git a/src/scriptlets/google-ima3.js → src/scriptlets/google-ima3.ts b/src/scriptlets/google-ima3.js → src/scriptlets/google-ima3.ts
diff --git a/...riptlets/googlesyndication-adsbygoogle.js → ...riptlets/googlesyndication-adsbygoogle.ts b/...riptlets/googlesyndication-adsbygoogle.js → ...riptlets/googlesyndication-adsbygoogle.ts
diff --git a/src/scriptlets/googletagservices-gpt.js → src/scriptlets/googletagservices-gpt.ts b/src/scriptlets/googletagservices-gpt.js → src/scriptlets/googletagservices-gpt.ts
diff --git a/src/scriptlets/matomo.ts b/src/scriptlets/matomo.ts
@@ -0,0 +1,17 @@
+import { Matomo } from '../redirects/matomo';
+
+/**
+ * @scriptlet matomo
+ *
+ * @description
+ * Mocks the piwik.js file of Matomo (formerly Piwik).
+ *
+ * ### Examples
+ *
+ * ```adblock
+ * example.org#%#//scriptlet('matomo')
+ * ```
+ *
+ * @added unknown.
+ */
+export { Matomo };
diff --git a/src/scriptlets/metrika-yandex-tag.js → src/scriptlets/metrika-yandex-tag.ts b/src/scriptlets/metrika-yandex-tag.js → src/scriptlets/metrika-yandex-tag.ts
diff --git a/src/scriptlets/metrika-yandex-watch.js → src/scriptlets/metrika-yandex-watch.ts b/src/scriptlets/metrika-yandex-watch.js → src/scriptlets/metrika-yandex-watch.ts
diff --git a/src/scriptlets/naver-wcslog.js → src/scriptlets/naver-wcslog.ts b/src/scriptlets/naver-wcslog.js → src/scriptlets/naver-wcslog.ts
diff --git a/src/scriptlets/pardot-1.0.js → src/scriptlets/pardot-1.0.ts b/src/scriptlets/pardot-1.0.js → src/scriptlets/pardot-1.0.ts
diff --git a/src/scriptlets/prebid.js → src/scriptlets/prebid.ts b/src/scriptlets/prebid.js → src/scriptlets/prebid.ts
diff --git a/src/scriptlets/scorecardresearch-beacon.js → src/scriptlets/scorecardresearch-beacon.ts b/src/scriptlets/scorecardresearch-beacon.js → src/scriptlets/scorecardresearch-beacon.ts
diff --git a/src/scriptlets/scriptlets-list.js b/src/scriptlets/scriptlets-list.js
@@ -74,10 +74,16 @@ export * from './amazon-apstag';
 export * from './didomi-loader';
 export * from './fingerprintjs2';
 export * from './fingerprintjs3';
+export * from './gemius';
 export * from './google-analytics';
 export * from './google-analytics-ga';
 export * from './google-ima3';
 export * from './googlesyndication-adsbygoogle';
 export * from './googletagservices-gpt';
+export * from './matomo';
 export * from './metrika-yandex-tag';
 export * from './metrika-yandex-watch';
+export * from './naver-wcslog';
+export * from './pardot-1.0';
+export * from './prebid';
+export * from './scorecardresearch-beacon';