From 1e327e990b2990eae6d9fd92f7e99a9ad7f00306 Mon Sep 17 00:00:00 2001
From: jackra1n <45038833+jackra1n@users.noreply.github.com>
Date: Fri, 23 Aug 2024 00:47:01 +0200
Subject: [PATCH] Improve docker image build + arm

---
 .github/workflows/build.yaml | 14 ++++----------
 extensions/url_cleaner.py    |  3 ++-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 558fd1f..9182221 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -30,22 +30,16 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
         id: push
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v6
         with:
+          platform: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true
diff --git a/extensions/url_cleaner.py b/extensions/url_cleaner.py
index a72ff8b..94fc692 100644
--- a/extensions/url_cleaner.py
+++ b/extensions/url_cleaner.py
@@ -132,7 +132,8 @@ async def on_message(self, message: discord.Message):
 
 			embed = discord.Embed(title="Please avoid sending links containing tracking parameters.")
 			tracker_list = ", ".join([f"`{tracker}`" for tracker in removed_trackers])
-			response = f"{tracker_list} {'are' if len(removed_trackers) > 1 else 'is'} used for tracking."
+			verb = 'are' if len(removed_trackers) > 1 else 'is'
+			response = f"{tracker_list} {verb} used for tracking."
 			response += f"\n Here's the link without trackers:\n{'\n'.join(cleaned_urls)}"
 			embed.description = response
 			await message.reply(embed=embed)