sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
325 changed files with 1314 additions and 1494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/backend/src/server/api/endpoints/pages/create.ts
View File

@@ -62,7 +62,7 @@ export const paramDef = {
export default define(meta, paramDef, async (ps, user) => {
let eyeCatchingImage = null;
if (ps.eyeCatchingImageId != null) {
eyeCatchingImage = await DriveFiles.findOne({
eyeCatchingImage = await DriveFiles.findOneBy({
id: ps.eyeCatchingImageId,
userId: user.id,
});
@@ -72,7 +72,7 @@ export default define(meta, paramDef, async (ps, user) => {
}
}
await Pages.find({
await Pages.findBy({
userId: user.id,
name: ps.name,
}).then(result => {
@@ -97,7 +97,7 @@ export default define(meta, paramDef, async (ps, user) => {
alignCenter: ps.alignCenter,
hideTitleWhenPinned: ps.hideTitleWhenPinned,
font: ps.font,
})).then(x => Pages.findOneOrFail(x.identifiers[0]));
})).then(x => Pages.findOneByOrFail(x.identifiers[0]));
return await Pages.pack(page);
});

2
packages/backend/src/server/api/endpoints/pages/delete.ts
View File

@@ -34,7 +34,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const page = await Pages.findOne(ps.pageId);
const page = await Pages.findOneBy({ id: ps.pageId });
if (page == null) {
throw new ApiError(meta.errors.noSuchPage);
}

4
packages/backend/src/server/api/endpoints/pages/like.ts
View File

@@ -41,7 +41,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const page = await Pages.findOne(ps.pageId);
const page = await Pages.findOneBy({ id: ps.pageId });
if (page == null) {
throw new ApiError(meta.errors.noSuchPage);
}
@@ -51,7 +51,7 @@ export default define(meta, paramDef, async (ps, user) => {
}
// if already liked
const exist = await PageLikes.findOne({
const exist = await PageLikes.findOneBy({
pageId: page.id,
userId: user.id,
});

9
packages/backend/src/server/api/endpoints/pages/show.ts
View File

@@ -2,6 +2,7 @@ import define from '../../define.js';
import { ApiError } from '../../error.js';
import { Pages, Users } from '@/models/index.js';
import { Page } from '@/models/entities/page.js';
import { IsNull } from 'typeorm';
export const meta = {
tags: ['pages'],
@@ -38,14 +39,14 @@ export default define(meta, paramDef, async (ps, user) => {
let page: Page | undefined;
if (ps.pageId) {
page = await Pages.findOne(ps.pageId);
page = await Pages.findOneBy({ id: ps.pageId });
} else if (ps.name && ps.username) {
const author = await Users.findOne({
host: null,
const author = await Users.findOneBy({
host: IsNull(),
usernameLower: ps.username.toLowerCase(),
});
if (author) {
page = await Pages.findOne({
page = await Pages.findOneBy({
name: ps.name,
userId: author.id,
});

4
packages/backend/src/server/api/endpoints/pages/unlike.ts
View File

@@ -34,12 +34,12 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const page = await Pages.findOne(ps.pageId);
const page = await Pages.findOneBy({ id: ps.pageId });
if (page == null) {
throw new ApiError(meta.errors.noSuchPage);
}
const exist = await PageLikes.findOne({
const exist = await PageLikes.findOneBy({
pageId: page.id,
userId: user.id,
});

6
packages/backend/src/server/api/endpoints/pages/update.ts
View File

@@ -66,7 +66,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const page = await Pages.findOne(ps.pageId);
const page = await Pages.findOneBy({ id: ps.pageId });
if (page == null) {
throw new ApiError(meta.errors.noSuchPage);
}
@@ -76,7 +76,7 @@ export default define(meta, paramDef, async (ps, user) => {
let eyeCatchingImage = null;
if (ps.eyeCatchingImageId != null) {
eyeCatchingImage = await DriveFiles.findOne({
eyeCatchingImage = await DriveFiles.findOneBy({
id: ps.eyeCatchingImageId,
userId: user.id,
});
@@ -86,7 +86,7 @@ export default define(meta, paramDef, async (ps, user) => {
}
}
await Pages.find({
await Pages.findBy({
id: Not(ps.pageId),
userId: user.id,
name: ps.name,