SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into page
All checks were successful
Build Branches / Build Equicord (push) Has been skipped
Details

Browse source
This commit is contained in:
thororen1234 2026-05-07 11:54:45 -04:00
commit 01922fab44
No known key found for this signature in database
7 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View file

@ -19,12 +19,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v6
- name: Use Node.js 24 - name: Use Node.js 24
uses: actions/setup-node@v4 uses: actions/setup-node@v6
with: with:
node-version: 24 node-version: 24
cache: "pnpm" cache: "pnpm"
@ -68,12 +68,12 @@ jobs:
rm release/*.map rm release/*.map
- name: Upload Equicord Stable - name: Upload Equicord Stable
if: ${{ !vars.ACT }} if: ${{ vars.ACT == 'false' }}
run: | run: |
gh release upload latest --clobber dist/release/* gh release upload latest --clobber dist/release/*
- name: Upload Plugin JSONs to Equibored repo - name: Upload Plugin JSONs to Equibored repo
if: github.repository == 'Equicord/Equicord' && !vars.ACT if: github.repository == 'Equicord/Equicord' && !vars.ACT == 'false'
run: | run: |
git config --global user.name "GitHub-Actions" git config --global user.name "GitHub-Actions"
git config --global user.email actions@github.com git config --global user.email actions@github.com

8
.github/workflows/buildBranches.yml vendored
View file

@ -32,16 +32,16 @@ jobs:
if: github.repository == 'Equicord/Equicord' if: github.repository == 'Equicord/Equicord'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
with: with:
ref: ${{ github.event.inputs.branch || github.ref }} ref: ${{ github.event.inputs.branch || github.ref }}
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v6
if: github.ref_name != 'bun' if: github.ref_name != 'bun'
- name: Use Node.js 24 - name: Use Node.js 24
if: github.ref_name != 'bun' if: github.ref_name != 'bun'
uses: actions/setup-node@v4 uses: actions/setup-node@v6
with: with:
node-version: 24 node-version: 24
cache: "pnpm" cache: "pnpm"
@ -91,7 +91,7 @@ jobs:
bun run generateDevsList dist/devs.json bun run generateDevsList dist/devs.json
- name: Upload to Equibuilds repo - name: Upload to Equibuilds repo
if: ${{ !vars.ACT }} if: ${{ vars.ACT == 'false' }}
run: | run: |
BRANCH="${{ github.event.inputs.branch || github.ref_name }}" BRANCH="${{ github.event.inputs.branch || github.ref_name }}"
COMMIT_SHA=$(git rev-parse --short HEAD) COMMIT_SHA=$(git rev-parse --short HEAD)

8
.github/workflows/nixosBuild.yml vendored
View file

@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- uses: pnpm/action-setup@v3 - uses: pnpm/action-setup@v6
- name: Use Node.js 24 - name: Use Node.js 24
uses: actions/setup-node@v4 uses: actions/setup-node@v6
with: with:
node-version: 24 node-version: 24
cache: "pnpm" cache: "pnpm"
@ -69,7 +69,7 @@ jobs:
run: echo "::set-output name=date::$(date +'%Y-%m-%d')" run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
- name: Upload Equicord Stable - name: Upload Equicord Stable
if: ${{ !vars.ACT }} if: ${{ vars.ACT == 'false' }}
run: | run: |
gh release create ${{ steps.date.outputs.date }} --latest=false gh release create ${{ steps.date.outputs.date }} --latest=false
gh release upload ${{ steps.date.outputs.date }} --clobber dist/release/* gh release upload ${{ steps.date.outputs.date }} --clobber dist/release/*

8
.github/workflows/publish.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
with: with:
fetch-depth: 0 fetch-depth: 0
@ -60,11 +60,11 @@ jobs:
- name: Setup PNPM - name: Setup PNPM
if: steps.check.outputs.release == 'true' if: steps.check.outputs.release == 'true'
uses: pnpm/action-setup@v3 uses: pnpm/action-setup@v6
- name: Use Node.js 24 - name: Use Node.js 24
if: steps.check.outputs.release == 'true' if: steps.check.outputs.release == 'true'
uses: actions/setup-node@v4 uses: actions/setup-node@v6
with: with:
node-version: 24 node-version: 24
cache: "pnpm" cache: "pnpm"
@ -83,7 +83,7 @@ jobs:
".git/*" ".git/*"
- name: Publish extension - name: Publish extension
if: steps.check.outputs.release == 'true' && !vars.ACT if: steps.check.outputs.release == 'true' && !vars.ACT == 'false'
run: pnpx @equicord/publish-browser-extension@latest --chrome-zip run: pnpx @equicord/publish-browser-extension@latest --chrome-zip
dist/extension-chrome.zip --firefox-zip dist/extension-chrome.zip --firefox-zip
dist/extension-firefox.zip --firefox-sources-zip dist/extension-firefox.zip --firefox-sources-zip

10
.github/workflows/reportBrokenPlugins.yml vendored
View file

@ -12,7 +12,9 @@ on:
default: both default: both
webhook_url: webhook_url:
type: string 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." 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 Equibot."
required: false required: false
schedule: schedule:
# # Every day at midnight # # Every day at midnight
@ -27,14 +29,14 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
with: with:
ref: ${{ github.event_name == 'schedule' && 'dev' || github.ref }} ref: ${{ github.event_name == 'schedule' && 'dev' || github.ref }}
- uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json - uses: pnpm/action-setup@v6 # Install pnpm using packageManager key in package.json
- name: Use Node.js 24 - name: Use Node.js 24
uses: actions/setup-node@v4 uses: actions/setup-node@v6
with: with:
node-version: 24 node-version: 24
cache: "pnpm" cache: "pnpm"

6
.github/workflows/test.yml vendored
View file

@ -15,11 +15,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v6
- uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json - uses: pnpm/action-setup@v6 # Install pnpm using packageManager key in package.json
- name: Use Node.js 24 - name: Use Node.js 24
uses: actions/setup-node@v4 uses: actions/setup-node@v6
with: with:
node-version: 24 node-version: 24
cache: "pnpm" cache: "pnpm"

7
src/plugins/blurNsfw/index.ts
View file

@ -18,7 +18,12 @@ const settings = definePluginSettings({
description: "Blur Amount (in pixels)", description: "Blur Amount (in pixels)",
default: 10, default: 10,
onChange: setCss onChange: setCss
} },
blurAllChannels: {
type: OptionType.BOOLEAN,
description: "Blur attachments in all channels (not just NSFW)",
default: false
},
}); });
function setCss() { function setCss() {