Compare commits

...

4 commits

Author SHA1 Message Date
33aef80b29 REMOVE PATHS REQUIREMENTS FROM ACTIONS THIS COMMIT SHOULD NOT ABSOLUTELY NOT BE COMMITTED TO THE MASTER THIS IS JUST TO CONVINCE ACTIONS TO ACTUALLY TEST IT 2025-01-16 20:34:56 +01:00
56dcf2c956 fix backend linting errors 2025-01-16 20:34:25 +01:00
f531171c59 Get setup-ffmpeg action from github.com
It's not mirrored by code.forgejo.org.
2025-01-16 20:33:07 +01:00
5ede011bf0 Use pnpm/action-setup@v4.0.0 in Actions
It's not possible to use v4, as action-setup doesn't have v4 tag,
and unlike GitHub Actions, Forgejo Actions doesn't try to automatically
convert refs like v4 into full tags like v4.0.0.
2025-01-16 20:32:16 +01:00
11 changed files with 17 additions and 44 deletions

View file

@ -5,8 +5,6 @@ on:
paths: paths:
- packages/misskey-js/** - packages/misskey-js/**
pull_request: pull_request:
paths:
- packages/misskey-js/**
jobs: jobs:
report: report:
@ -21,7 +19,7 @@ jobs:
submodules: true submodules: true
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false

View file

@ -8,9 +8,6 @@ on:
- packages/misskey-js/package.json - packages/misskey-js/package.json
- package.json - package.json
pull_request: pull_request:
paths:
- packages/misskey-js/package.json
- package.json
jobs: jobs:
check-version: check-version:

View file

@ -11,12 +11,6 @@ on:
- packages/misskey-js/** - packages/misskey-js/**
- packages/shared/.eslintrc.js - packages/shared/.eslintrc.js
pull_request: pull_request:
paths:
- packages/backend/**
- packages/frontend/**
- packages/sw/**
- packages/misskey-js/**
- packages/shared/.eslintrc.js
jobs: jobs:
pnpm_install: pnpm_install:
@ -26,7 +20,7 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- uses: actions/setup-node@v4.1.0 - uses: actions/setup-node@v4.1.0
@ -51,7 +45,7 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- uses: actions/setup-node@v4.1.0 - uses: actions/setup-node@v4.1.0
@ -75,7 +69,7 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- uses: actions/setup-node@v4.1.0 - uses: actions/setup-node@v4.1.0

View file

@ -9,10 +9,6 @@ on:
# for permissions # for permissions
- packages/misskey-js/** - packages/misskey-js/**
pull_request: pull_request:
paths:
- packages/backend/**
# for permissions
- packages/misskey-js/**
jobs: jobs:
unit: unit:
@ -51,11 +47,11 @@ jobs:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- name: Install FFmpeg - name: Install FFmpeg
uses: FedericoCarboni/setup-ffmpeg@v3 uses: https://github.com/FedericoCarboni/setup-ffmpeg@v3
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4.1.0 uses: actions/setup-node@v4.1.0
with: with:
@ -107,7 +103,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}

View file

@ -14,12 +14,6 @@ on:
- packages/backend/** - packages/backend/**
pull_request: pull_request:
paths:
- packages/frontend/**
# for permissions
- packages/misskey-js/**
# for e2e
- packages/backend/**
jobs: jobs:
vitest: vitest:
@ -35,7 +29,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}

View file

@ -10,8 +10,6 @@ on:
paths: paths:
- packages/misskey-js/** - packages/misskey-js/**
pull_request: pull_request:
paths:
- packages/misskey-js/**
jobs: jobs:
test: test:
@ -31,7 +29,7 @@ jobs:
submodules: true submodules: true
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false

View file

@ -23,7 +23,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}

View file

@ -7,8 +7,6 @@ on:
paths: paths:
- packages/backend/** - packages/backend/**
pull_request: pull_request:
paths:
- packages/backend/**
jobs: jobs:
validate-api-json: validate-api-json:
@ -24,7 +22,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
submodules: true submodules: true
- name: Install pnpm - name: Install pnpm
uses: pnpm/action-setup@v4 uses: pnpm/action-setup@v4.0.0
with: with:
run_install: false run_install: false
- name: Use Node.js ${{ matrix.node-version }} - name: Use Node.js ${{ matrix.node-version }}

View file

@ -244,14 +244,14 @@ export class SignupApiService {
} else { } else {
try { try {
const { account, secret } = await this.signupService.signup({ const { account, secret } = await this.signupService.signup({
username, password, host, reason username, password, host, reason,
}); });
if (instance.approvalRequiredForSignup) { if (instance.approvalRequiredForSignup) {
if (emailAddress) { if (emailAddress) {
this.emailService.sendEmail(emailAddress, 'Approval pending', this.emailService.sendEmail(emailAddress, 'Approval pending',
'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.', 'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.',
'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.'); 'Congratulations! Your account is now pending approval. You will get notified when you have been accepted.');
} }
} }

View file

@ -63,12 +63,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
await this.usedUsernamesRepository.delete({ username: user.username }); await this.usedUsernamesRepository.delete({ username: user.username });
//Actually delete it since the last function doesnt actually delete the account //Actually delete it since the last function doesnt actually delete the account
//Note: Before approval these accounts wont federate so this is totally fine. //Note: Before approval these accounts wont federate so this is totally fine.
await this.usersRepository.delete(user.id); await this.usersRepository.delete(user.id);
this.moderationLogService.log(me, 'decline', { this.moderationLogService.log(me, 'decline', {
userId: user.id, userId: user.id,
userUsername: user.username, userUsername: user.username,

View file

@ -37,9 +37,9 @@ export const meta = {
unapprovedUser: { unapprovedUser: {
message: 'The user has not been approved yet.', message: 'The user has not been approved yet.',
code: 'UNAPPROVED_USER', code: 'UNAPPROVED_USER',
id: '8d66f136-b3e1-48fd-92c4-30ecfd7fdb7a', id: '8d66f136-b3e1-48fd-92c4-30ecfd7fdb7a',
}, },
followeeIsYourself: { followeeIsYourself: {
message: 'Followee is yourself.', message: 'Followee is yourself.',