Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: migrate to typeorm 3.0 (#8443)

Browse source 
* wip

* wip

* wip

* Update following.ts

* wip

* wip

* wip

* Update resolve-user.ts

* maxQueryExecutionTime

* wip

* wip
This commit is contained in:
syuilo 2022-03-26 15:34:00 +09:00 • committed by GitHub
parent 41c87074e6
commit 1c67c26bd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
325 changed files with 1314 additions and 1494 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/backend/src/server/index.ts
View file

@ -26,6 +26,7 @@ import { createTemp } from '@/misc/create-temp.js';
import { publishMainStream } from '@/services/stream.js';
import * as Acct from '@/misc/acct.js';
import { initializeStreamingServer } from './api/streaming.js';
import { IsNull } from 'typeorm';
export const serverLogger = new Logger('server', 'gray', false);
@ -71,10 +72,11 @@ router.use(wellKnown.routes());
router.get('/avatar/@:acct', async ctx => {
const { username, host } = Acct.parse(ctx.params.acct);
const user = await Users.findOne({
usernameLower: username.toLowerCase(),
host: host === config.host ? null : host,
isSuspended: false,
}, {
where: {
usernameLower: username.toLowerCase(),
host: (host == null) || (host === config.host) ? IsNull() : host,
isSuspended: false,
},
relations: ['avatar'],
});
@ -93,7 +95,7 @@ router.get('/identicon/:x', async ctx => {
});
router.get('/verify-email/:code', async ctx => {
const profile = await UserProfiles.findOne({
const profile = await UserProfiles.findOneBy({
emailVerifyCode: ctx.params.code,
});