Merge branch 'dev' into page
All checks were successful
Build Branches / Build Equicord (push) Has been skipped
All checks were successful
Build Branches / Build Equicord (push) Has been skipped
This commit is contained in:
commit
01922fab44
7 changed files with 32 additions and 25 deletions
10
.github/workflows/build.yml
vendored
10
.github/workflows/build.yml
vendored
|
|
@ -19,12 +19,12 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- uses: pnpm/action-setup@v3
|
||||
- uses: pnpm/action-setup@v6
|
||||
|
||||
- name: Use Node.js 24
|
||||
uses: actions/setup-node@v4
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 24
|
||||
cache: "pnpm"
|
||||
|
|
@ -68,12 +68,12 @@ jobs:
|
|||
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
|
||||
|
|
|
|||
8
.github/workflows/buildBranches.yml
vendored
8
.github/workflows/buildBranches.yml
vendored
|
|
@ -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)
|
||||
|
|
|
|||
8
.github/workflows/nixosBuild.yml
vendored
8
.github/workflows/nixosBuild.yml
vendored
|
|
@ -16,12 +16,12 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- uses: pnpm/action-setup@v3
|
||||
- uses: pnpm/action-setup@v6
|
||||
|
||||
- name: Use Node.js 24
|
||||
uses: actions/setup-node@v4
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 24
|
||||
cache: "pnpm"
|
||||
|
|
@ -69,7 +69,7 @@ jobs:
|
|||
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
|
||||
|
||||
- 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/*
|
||||
|
|
|
|||
8
.github/workflows/publish.yml
vendored
8
.github/workflows/publish.yml
vendored
|
|
@ -15,7 +15,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
|
|
@ -60,11 +60,11 @@ jobs:
|
|||
|
||||
- name: Setup PNPM
|
||||
if: steps.check.outputs.release == 'true'
|
||||
uses: pnpm/action-setup@v3
|
||||
uses: pnpm/action-setup@v6
|
||||
|
||||
- name: Use Node.js 24
|
||||
if: steps.check.outputs.release == 'true'
|
||||
uses: actions/setup-node@v4
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 24
|
||||
cache: "pnpm"
|
||||
|
|
@ -83,7 +83,7 @@ jobs:
|
|||
".git/*"
|
||||
|
||||
- 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
|
||||
dist/extension-chrome.zip --firefox-zip
|
||||
dist/extension-firefox.zip --firefox-sources-zip
|
||||
|
|
|
|||
10
.github/workflows/reportBrokenPlugins.yml
vendored
10
.github/workflows/reportBrokenPlugins.yml
vendored
|
|
@ -12,7 +12,9 @@ on:
|
|||
default: both
|
||||
webhook_url:
|
||||
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
|
||||
schedule:
|
||||
# # Every day at midnight
|
||||
|
|
@ -27,14 +29,14 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/checkout@v6
|
||||
with:
|
||||
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
|
||||
uses: actions/setup-node@v4
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 24
|
||||
cache: "pnpm"
|
||||
|
|
|
|||
6
.github/workflows/test.yml
vendored
6
.github/workflows/test.yml
vendored
|
|
@ -15,11 +15,11 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: pnpm/action-setup@v3 # Install pnpm using packageManager key in package.json
|
||||
- uses: actions/checkout@v6
|
||||
- uses: pnpm/action-setup@v6 # Install pnpm using packageManager key in package.json
|
||||
|
||||
- name: Use Node.js 24
|
||||
uses: actions/setup-node@v4
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 24
|
||||
cache: "pnpm"
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue