From 277fe860b5a35de5ff1797819c15c8189c6c1f99 Mon Sep 17 00:00:00 2001
From: Ming Di Leom <2809763-curben@users.noreply.gitlab.com>
Date: Wed, 11 May 2022 07:43:02 +0000
Subject: [PATCH] fix: migrate to malware-filter group

- BREAKING CHANGE
---
 src/build.js         | 4 ++--
 src/gitlab_status.sh | 4 ++--
 src/script.sh        | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/build.js b/src/build.js
index c4ecb95..71dcb27 100644
--- a/src/build.js
+++ b/src/build.js
@@ -14,8 +14,8 @@ const rootPath = join(__dirname, '..')
 const tmpPath = join(rootPath, 'tmp')
 const publicPath = join(rootPath, 'public')
 const zipPath = join(tmpPath, 'artifacts.zip')
-const artifactsUrl = 'https://gitlab.com/curben/tracking-filter/-/jobs/artifacts/main/download?job=pages'
-const pipelineUrl = 'https://gitlab.com/curben/tracking-filter/badges/main/pipeline.svg'
+const artifactsUrl = 'https://gitlab.com/malware-filter/tracking-filter/-/jobs/artifacts/main/download?job=pages'
+const pipelineUrl = 'https://gitlab.com/malware-filter/tracking-filter/badges/main/pipeline.svg'
 const ghMirror = 'https://nightly.link/curbengh/tracking-filter/workflows/pages/main/public.zip'
 
 const pipelineStatus = async (url) => {
diff --git a/src/gitlab_status.sh b/src/gitlab_status.sh
index c777ec0..f16d3b8 100644
--- a/src/gitlab_status.sh
+++ b/src/gitlab_status.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/curben/tracking-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200")
-PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/curben/tracking-filter/badges/main/pipeline.svg" | grep -F "failed")
+ARTIFACT_STATUS=$(curl -sSIL "https://gitlab.com/malware-filter/tracking-filter/-/jobs/artifacts/main/download?job=pages" | grep -F "HTTP/2 200")
+PIPELINE_STATUS=$(curl -sSL "https://gitlab.com/malware-filter/tracking-filter/badges/main/pipeline.svg" | grep -F "failed")
 GITLAB_STATUS="up"
 
 if [ -z "$ARTIFACT_STATUS" ] || [ -n "$PIPELINE_STATUS" ]; then
diff --git a/src/script.sh b/src/script.sh
index 3a9d75a..a8a2bf1 100644
--- a/src/script.sh
+++ b/src/script.sh
@@ -40,12 +40,10 @@ CURRENT_TIME="$(date -R -u)"
 FIRST_LINE="! Title: Tracking JS Blocklist"
 SECOND_LINE="! Updated: $CURRENT_TIME"
 THIRD_LINE="! Expires: 7 day (update frequency)"
-FOURTH_LINE="! Homepage: https://gitlab.com/curben/tracking-filter"
-FIFTH_LINE="! License: https://gitlab.com/curben/tracking-filter#license"
+FOURTH_LINE="! Homepage: https://gitlab.com/malware-filter/tracking-filter"
+FIFTH_LINE="! License: https://gitlab.com/malware-filter/tracking-filter#license"
 SIXTH_LINE="! Source: https://github.com/duckduckgo/tracker-radar"
-ANNOUNCEMENT_1="\n! 2021/01/08: There has been a major change to the mirrors, check the repo for the new mirrors."
-ANNOUNCEMENT_2="! Old mirrors will be deprecated in 3 months. The main download link \"curben.gitlab.io/malware-filter/\" _is not affected_."
-COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE\n$ANNOUNCEMENT_1\n$ANNOUNCEMENT_2"
+COMMENT_UBO="$FIRST_LINE\n$SECOND_LINE\n$THIRD_LINE\n$FOURTH_LINE\n$FIFTH_LINE\n$SIXTH_LINE"
 
 mkdir -p "../public/"