Update ads.yml

Author: xbubbo

.github/workflows/ads.yml

@@ -6,40 +6,41 @@ on:
       - main
 
 jobs:
-  update-Ad-Free:
+  update-ad-free:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout main branch
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
-          ref: main
+          fetch-depth: 0
 
-      - name: Remove Ads
+      - name: Setup Ad-Free branch
         run: |
-          git fetch origin
-          if git branch --list | grep -q 'Ad-Free'; then
+          git fetch origin main
+          if git ls-remote --heads origin Ad-Free; then
             git checkout Ad-Free
-            git pull origin Ad-Free
-            git merge main --no-edit
+            git merge origin/main --no-edit
           else
-            git checkout -b Ad-Free
+            git checkout -b Ad-Free origin/main
           fi
 
-      - name: Remove first 9 lines from m.js
+      - name: Remove ad script block from m.js
         run: |
-          sed -i '1,9d' static/assets/js/m.js
-  
+          sed -i '/const blockedHostnames/,/document.body.appendChild(script);/d' static/assets/js/m1.js
+
       - name: Commit changes
         env:
           GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
           GIT_EMAIL: ${{ secrets.GIT_EMAIL }}
         run: |
           git config --global user.name "${GIT_USERNAME}"
           git config --global user.email "${GIT_EMAIL}"
-          git add static/assets/js/m.js
-          git commit -m "Remove specific JS code from m.js"
+          if git diff --quiet; then
+            echo "No changes detected"
+          else
+            git add static/assets/js/m1.js
+            git commit -m "Remove ad injection block from m1.js"
+          fi
 
-      - name: Push changes to Ad-Free branch
-        run: |
-          git push origin Ad-Free --force
+      - name: Push changes
+        run: git push origin Ad-Free --force