forked from woem.men/forkey
Compare commits
4 commits
aeaf34b904
...
33aef80b29
Author | SHA1 | Date | |
---|---|---|---|
33aef80b29 | |||
56dcf2c956 | |||
f531171c59 | |||
5ede011bf0 |
11 changed files with 17 additions and 44 deletions
|
@ -5,8 +5,6 @@ on:
|
|||
paths:
|
||||
- packages/misskey-js/**
|
||||
pull_request:
|
||||
paths:
|
||||
- packages/misskey-js/**
|
||||
|
||||
jobs:
|
||||
report:
|
||||
|
@ -21,7 +19,7 @@ jobs:
|
|||
submodules: true
|
||||
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
|
||||
|
|
|
@ -8,9 +8,6 @@ on:
|
|||
- packages/misskey-js/package.json
|
||||
- package.json
|
||||
pull_request:
|
||||
paths:
|
||||
- packages/misskey-js/package.json
|
||||
- package.json
|
||||
|
||||
jobs:
|
||||
check-version:
|
||||
|
|
|
@ -11,12 +11,6 @@ on:
|
|||
- packages/misskey-js/**
|
||||
- packages/shared/.eslintrc.js
|
||||
pull_request:
|
||||
paths:
|
||||
- packages/backend/**
|
||||
- packages/frontend/**
|
||||
- packages/sw/**
|
||||
- packages/misskey-js/**
|
||||
- packages/shared/.eslintrc.js
|
||||
|
||||
jobs:
|
||||
pnpm_install:
|
||||
|
@ -26,7 +20,7 @@ jobs:
|
|||
with:
|
||||
fetch-depth: 0
|
||||
submodules: true
|
||||
- uses: pnpm/action-setup@v4
|
||||
- uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- uses: actions/setup-node@v4.1.0
|
||||
|
@ -51,7 +45,7 @@ jobs:
|
|||
with:
|
||||
fetch-depth: 0
|
||||
submodules: true
|
||||
- uses: pnpm/action-setup@v4
|
||||
- uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- uses: actions/setup-node@v4.1.0
|
||||
|
@ -75,7 +69,7 @@ jobs:
|
|||
with:
|
||||
fetch-depth: 0
|
||||
submodules: true
|
||||
- uses: pnpm/action-setup@v4
|
||||
- uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- uses: actions/setup-node@v4.1.0
|
||||
|
|
|
@ -9,10 +9,6 @@ on:
|
|||
# for permissions
|
||||
- packages/misskey-js/**
|
||||
pull_request:
|
||||
paths:
|
||||
- packages/backend/**
|
||||
# for permissions
|
||||
- packages/misskey-js/**
|
||||
|
||||
jobs:
|
||||
unit:
|
||||
|
@ -51,11 +47,11 @@ jobs:
|
|||
fetch-depth: 0
|
||||
submodules: true
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- name: Install FFmpeg
|
||||
uses: FedericoCarboni/setup-ffmpeg@v3
|
||||
uses: https://github.com/FedericoCarboni/setup-ffmpeg@v3
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
uses: actions/setup-node@v4.1.0
|
||||
with:
|
||||
|
@ -107,7 +103,7 @@ jobs:
|
|||
fetch-depth: 0
|
||||
submodules: true
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
|
|
|
@ -14,12 +14,6 @@ on:
|
|||
- packages/backend/**
|
||||
|
||||
pull_request:
|
||||
paths:
|
||||
- packages/frontend/**
|
||||
# for permissions
|
||||
- packages/misskey-js/**
|
||||
# for e2e
|
||||
- packages/backend/**
|
||||
|
||||
jobs:
|
||||
vitest:
|
||||
|
@ -35,7 +29,7 @@ jobs:
|
|||
fetch-depth: 0
|
||||
submodules: true
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
|
|
|
@ -10,8 +10,6 @@ on:
|
|||
paths:
|
||||
- packages/misskey-js/**
|
||||
pull_request:
|
||||
paths:
|
||||
- packages/misskey-js/**
|
||||
|
||||
jobs:
|
||||
test:
|
||||
|
@ -31,7 +29,7 @@ jobs:
|
|||
submodules: true
|
||||
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ jobs:
|
|||
fetch-depth: 0
|
||||
submodules: true
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
|
|
|
@ -7,8 +7,6 @@ on:
|
|||
paths:
|
||||
- packages/backend/**
|
||||
pull_request:
|
||||
paths:
|
||||
- packages/backend/**
|
||||
|
||||
jobs:
|
||||
validate-api-json:
|
||||
|
@ -24,7 +22,7 @@ jobs:
|
|||
fetch-depth: 0
|
||||
submodules: true
|
||||
- name: Install pnpm
|
||||
uses: pnpm/action-setup@v4
|
||||
uses: pnpm/action-setup@v4.0.0
|
||||
with:
|
||||
run_install: false
|
||||
- name: Use Node.js ${{ matrix.node-version }}
|
||||
|
|
|
@ -244,14 +244,14 @@ export class SignupApiService {
|
|||
} else {
|
||||
try {
|
||||
const { account, secret } = await this.signupService.signup({
|
||||
username, password, host, reason
|
||||
username, password, host, reason,
|
||||
});
|
||||
|
||||
if (instance.approvalRequiredForSignup) {
|
||||
if (emailAddress) {
|
||||
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.');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -63,12 +63,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
|
|||
|
||||
await this.usedUsernamesRepository.delete({ username: user.username });
|
||||
|
||||
|
||||
//Actually delete it since the last function doesnt actually delete the account
|
||||
//Note: Before approval these accounts wont federate so this is totally fine.
|
||||
await this.usersRepository.delete(user.id);
|
||||
|
||||
|
||||
this.moderationLogService.log(me, 'decline', {
|
||||
userId: user.id,
|
||||
userUsername: user.username,
|
||||
|
|
|
@ -37,9 +37,9 @@ export const meta = {
|
|||
|
||||
unapprovedUser: {
|
||||
message: 'The user has not been approved yet.',
|
||||
code: 'UNAPPROVED_USER',
|
||||
id: '8d66f136-b3e1-48fd-92c4-30ecfd7fdb7a',
|
||||
},
|
||||
code: 'UNAPPROVED_USER',
|
||||
id: '8d66f136-b3e1-48fd-92c4-30ecfd7fdb7a',
|
||||
},
|
||||
|
||||
followeeIsYourself: {
|
||||
message: 'Followee is yourself.',
|
||||
|
|
Loading…
Reference in a new issue