Apply automatic changes

* add 7 new redirects

* change sjv.io to match against all subdomains

* change amazon to match against 'com' or 'ca' TLD

* add fintelconnect and c2ukkg

* bestbuy: exclude tracking parameters

* add dodxnr.net

.github/workflows/tamper-monkey.yaml

@@ -1,16 +1,20 @@
 name: "Generate Tampermonkey script"
 on:
   pull_request:
+  push:
+    branches:
+      - main
 
 jobs:
   gomplate:
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
 
       - name: Install gomplate
         run: |
@@ -21,10 +25,4 @@ jobs:
       - name: Run gomplate
         run: gomplate < script.js.tmpl > script.js
 
-      - name: Commit and push changes
+      - uses: stefanzweifel/git-auto-commit-action@v5
-        run: |
-          git config --global user.name "GitHub Actions"
-          git config --global user.email "actions@users.noreply.github.com"
-          git add .
-          git commit -m "Update script.js using gomplate" || true
-          git push

redirects.json

@@ -1,11 +1,11 @@
 [
   {
     "name": "Amazon",
-    "pattern": "www.amazon.ca/gp/redirect.html\\?ie=UTF8&location=(?<baseUrl>.*?)(&|ref%3D|%3F)"
+    "pattern": ".*amazon\\.(?:ca|com)\/gp\/redirect\\.html\\?ie=UTF8&location=(?<baseUrl>.*?)(?:&|ref%3D|%3F)"
   },
   {
     "name": "Best Buy",
-    "pattern": "bestbuyca.(.*).net(.*)\\?u=(?<baseUrl>.*)"
+    "pattern": "bestbuyca.(.*).net(.*)\\?u=(?<baseUrl>.*)\\?.*"
   },
   {
     "name": "HP",
@@ -28,8 +28,8 @@
     "pattern": "go.redirectingat.com(.*)?url=(?<baseUrl>.*)"
   },
   {
-    "name": "adidas-canada",
+    "name": "sjv.io",
-    "pattern": "adidas-canada.sjv.io(.*)?u=(?<baseUrl>.*)"
+    "pattern": ".*sjv\\.io.*\\?u=(?<baseUrl>.*)"
   },
   {
     "name": "canadiantire",
@@ -78,5 +78,45 @@
   {
     "name": "staples",
     "pattern": ".*staplescanada\\.4u8mqw\\.net.+\\?u=(?<baseUrl>.*)"
+  },
+  {
+    "name": "pjtra.com",
+    "pattern": ".*pjtra\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pjatr.com",
+    "pattern": ".*pjatr\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pntra.com",
+    "pattern": ".*pntra\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pntrs.com",
+    "pattern": ".*pntrs\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pntrac.com",
+    "pattern": ".*pntrac\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "shareasale.com",
+    "pattern": ".*shareasale\\.com.*&urllink=(?<baseUrl>.*)"
+  },
+  {
+    "name": "mkr3.net",
+    "pattern": ".*mkr3\\.net.*\\?u=(?<baseUrl>.*)"
+  },
+	{
+	  "name": "fintelconnect.com",
+	  "pattern": ".*fintelconnect\\.com.*\\?u=(?<baseUrl>.*)"
+	},
+	{
+	  "name": "c2ukkg.net",
+	  "pattern": ".*c2ukkg\\.net.*\\?u=(?<baseUrl>.*)"
+	},
+	{
+	  "name": "dodxnr.net",
+	  "pattern": ".*dodxnr\\.net.*\\?u=(?<baseUrl>.*)"
 	}
 ]

script.js

@@ -18,11 +18,11 @@
     const REDIRECT_REGEX = [
   {
     "name": "Amazon",
-    "pattern": "www.amazon.ca/gp/redirect.html\\?ie=UTF8&location=(?<baseUrl>.*?)(&|ref%3D|%3F)"
+    "pattern": ".*amazon\\.(?:ca|com)\/gp\/redirect\\.html\\?ie=UTF8&location=(?<baseUrl>.*?)(?:&|ref%3D|%3F)"
   },
   {
     "name": "Best Buy",
-    "pattern": "bestbuyca.(.*).net(.*)\\?u=(?<baseUrl>.*)"
+    "pattern": "bestbuyca.(.*).net(.*)\\?u=(?<baseUrl>.*)\\?.*"
   },
   {
     "name": "HP",
@@ -45,8 +45,8 @@
     "pattern": "go.redirectingat.com(.*)?url=(?<baseUrl>.*)"
   },
   {
-    "name": "adidas-canada",
+    "name": "sjv.io",
-    "pattern": "adidas-canada.sjv.io(.*)?u=(?<baseUrl>.*)"
+    "pattern": ".*sjv\\.io.*\\?u=(?<baseUrl>.*)"
   },
   {
     "name": "canadiantire",
@@ -95,6 +95,46 @@
   {
     "name": "staples",
     "pattern": ".*staplescanada\\.4u8mqw\\.net.+\\?u=(?<baseUrl>.*)"
+  },
+  {
+    "name": "pjtra.com",
+    "pattern": ".*pjtra\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pjatr.com",
+    "pattern": ".*pjatr\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pntra.com",
+    "pattern": ".*pntra\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pntrs.com",
+    "pattern": ".*pntrs\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "pntrac.com",
+    "pattern": ".*pntrac\\.com.*\\?url=(?<baseUrl>.*)&sid.*"
+  },
+  {
+    "name": "shareasale.com",
+    "pattern": ".*shareasale\\.com.*&urllink=(?<baseUrl>.*)"
+  },
+  {
+    "name": "mkr3.net",
+    "pattern": ".*mkr3\\.net.*\\?u=(?<baseUrl>.*)"
+  },
+	{
+	  "name": "fintelconnect.com",
+	  "pattern": ".*fintelconnect\\.com.*\\?u=(?<baseUrl>.*)"
+	},
+	{
+	  "name": "c2ukkg.net",
+	  "pattern": ".*c2ukkg\\.net.*\\?u=(?<baseUrl>.*)"
+	},
+	{
+	  "name": "dodxnr.net",
+	  "pattern": ".*dodxnr\\.net.*\\?u=(?<baseUrl>.*)"
 	}
 ]
 ;