diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 23bfac60c..aab934548 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,12 +55,12 @@ jobs: rm release/package.json rm release/*.map - name: Upload Equicord Stable - if: ${{ !vars.ACT }} + if: ${{ vars.ACT == 'false' }} run: | gh release upload latest --clobber dist/release/* - name: Upload Plugin JSONs to Equibored repo - if: github.repository == 'Equicord/Equicord' && !vars.ACT + if: github.repository == 'Equicord/Equicord' && !vars.ACT == 'false' run: | git config --global user.name "GitHub-Actions" git config --global user.email actions@github.com diff --git a/.github/workflows/buildBranches.yml b/.github/workflows/buildBranches.yml index f321da1f0..7ecf68c9f 100644 --- a/.github/workflows/buildBranches.yml +++ b/.github/workflows/buildBranches.yml @@ -32,16 +32,16 @@ jobs: if: github.repository == 'Equicord/Equicord' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ github.event.inputs.branch || github.ref }} - - uses: pnpm/action-setup@v3 + - uses: pnpm/action-setup@v6 if: github.ref_name != 'bun' - name: Use Node.js 24 if: github.ref_name != 'bun' - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 24 cache: "pnpm" @@ -91,7 +91,7 @@ jobs: bun run generateDevsList dist/devs.json - name: Upload to Equibuilds repo - if: ${{ !vars.ACT }} + if: ${{ vars.ACT == 'false' }} run: | BRANCH="${{ github.event.inputs.branch || github.ref_name }}" COMMIT_SHA=$(git rev-parse --short HEAD) diff --git a/.github/workflows/nixosBuild.yml b/.github/workflows/nixosBuild.yml index a0a19cb4a..0ac16e890 100644 --- a/.github/workflows/nixosBuild.yml +++ b/.github/workflows/nixosBuild.yml @@ -56,7 +56,7 @@ jobs: id: date run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT - name: Upload Equicord Stable - if: ${{ !vars.ACT }} + if: ${{ vars.ACT == 'false' }} run: | gh release create ${{ steps.date.outputs.date }} --latest=false gh release upload ${{ steps.date.outputs.date }} --clobber dist/release/* diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 89f2f38bb..295d9142c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: fetch-depth: 0 @@ -78,7 +78,7 @@ jobs: ".git/*" - name: Publish extension - if: steps.check.outputs.release == 'true' && !vars.ACT + if: steps.check.outputs.release == 'true' && !vars.ACT == 'false' run: bunx @equicord/publish-browser-extension@latest --chrome-zip dist/extension-chrome.zip --firefox-zip dist/extension-firefox.zip --firefox-sources-zip diff --git a/.github/workflows/reportBrokenPlugins.yml b/.github/workflows/reportBrokenPlugins.yml index 6c07dc10d..8929229a4 100644 --- a/.github/workflows/reportBrokenPlugins.yml +++ b/.github/workflows/reportBrokenPlugins.yml @@ -14,7 +14,7 @@ on: type: string description: "Webhook URL that the report will be posted to. This will be visible for everyone, so DO NOT pass sensitive webhooks like - discord webhook. This is meant to be used by Venbot." + discord webhook. This is meant to be used by Equibot." required: false schedule: # # Every day at midnight @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 with: ref: ${{ github.event_name == 'schedule' && 'dev' || github.ref }} diff --git a/src/plugins/blurNsfw/index.ts b/src/plugins/blurNsfw/index.ts index bd13dfd69..3b730c847 100644 --- a/src/plugins/blurNsfw/index.ts +++ b/src/plugins/blurNsfw/index.ts @@ -18,7 +18,12 @@ const settings = definePluginSettings({ description: "Blur Amount (in pixels)", default: 10, onChange: setCss - } + }, + blurAllChannels: { + type: OptionType.BOOLEAN, + description: "Blur attachments in all channels (not just NSFW)", + default: false + }, }); function setCss() {