From f609d6aa0d411e624c5dd18e27f9153c8f8d69c2 Mon Sep 17 00:00:00 2001 From: Anatole Date: Mon, 11 Dec 2023 17:13:49 +0100 Subject: [PATCH] fix: blacklist annual recap page (#968) --- .github/workflows/ci.yaml | 6 +++--- src/site/App.vue | 14 +++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9b9f14f7d..27300e823 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -45,7 +45,7 @@ env: jobs: ci: name: WebExtension Lint, Build, Test - runs-on: aws-runner + runs-on: ubuntu-latest env: installable: ${{ secrets.WEB_EXTENSION_CRX }} concurrency: @@ -146,7 +146,7 @@ jobs: release: name: Create Release - runs-on: aws-runner + runs-on: ubuntu-latest needs: [ci] if: ${{ (inputs.branch) || (github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master') }} @@ -236,7 +236,7 @@ jobs: deploy: name: Deploy Hosted Build - runs-on: aws-runner + runs-on: ubuntu-latest needs: [ci, release] if: ${{ inputs.deploy || (github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master') }} diff --git a/src/site/App.vue b/src/site/App.vue index 2e43af10c..91dddadfa 100644 --- a/src/site/App.vue +++ b/src/site/App.vue @@ -95,12 +95,16 @@ loadEmojiList().then(() => convertEmojis()); log.setContextName(`site/${domain}`); onMounted(() => { - // Define site controller for the platform - platformComponent.value = { - "twitch.tv": markRaw(TwitchSite), - "youtube.com": markRaw(YouTubeSite), - "kick.com": markRaw(KickSite), + const site = { + "twitch.tv": { com: markRaw(TwitchSite), blacklist: ["/annual-recap"] }, + "youtube.com": { com: markRaw(YouTubeSite) }, + "kick.com": { com: markRaw(KickSite) }, }[domain]; + if (!site) return; + if (site.blacklist?.includes(window.location.pathname)) return; + + // Define site controller for the platform + platformComponent.value = site.com; }); // pre-init frankerfacez compat when on twitch