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

2
packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
View File

@@ -39,7 +39,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch file
const file = await DriveFiles.findOne({
const file = await DriveFiles.findOneBy({
id: ps.fileId,
userId: user.id,
});

2
packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
View File

@@ -24,7 +24,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const file = await DriveFiles.findOne({
const file = await DriveFiles.findOneBy({
md5: ps.md5,
userId: user.id,
});

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

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

2
packages/backend/src/server/api/endpoints/drive/files/find-by-hash.ts
View File

@@ -29,7 +29,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const files = await DriveFiles.find({
const files = await DriveFiles.findBy({
md5: ps.md5,
userId: user.id,
});

5
packages/backend/src/server/api/endpoints/drive/files/find.ts
View File

@@ -1,5 +1,6 @@
import define from '../../../define.js';
import { DriveFiles } from '@/models/index.js';
import { IsNull } from 'typeorm';
export const meta = {
requireCredential: true,
@@ -30,10 +31,10 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const files = await DriveFiles.find({
const files = await DriveFiles.findBy({
name: ps.name,
userId: user.id,
folderId: ps.folderId,
folderId: ps.folderId ?? IsNull(),
});
return await Promise.all(files.map(file => DriveFiles.pack(file, { self: true })));

2
packages/backend/src/server/api/endpoints/drive/files/show.ts
View File

@@ -51,7 +51,7 @@ export default define(meta, paramDef, async (ps, user) => {
let file: DriveFile | undefined;
if (ps.fileId) {
file = await DriveFiles.findOne(ps.fileId);
file = await DriveFiles.findOneBy({ id: ps.fileId });
} else if (ps.url) {
file = await DriveFiles.findOne({
where: [{

4
packages/backend/src/server/api/endpoints/drive/files/update.ts
View File

@@ -58,7 +58,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const file = await DriveFiles.findOne(ps.fileId);
const file = await DriveFiles.findOneBy({ id: ps.fileId });
if (file == null) {
throw new ApiError(meta.errors.noSuchFile);
@@ -81,7 +81,7 @@ export default define(meta, paramDef, async (ps, user) => {
if (ps.folderId === null) {
file.folderId = null;
} else {
const folder = await DriveFolders.findOne({
const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});

4
packages/backend/src/server/api/endpoints/drive/folders/create.ts
View File

@@ -41,7 +41,7 @@ export default define(meta, paramDef, async (ps, user) => {
let parent = null;
if (ps.parentId) {
// Fetch parent folder
parent = await DriveFolders.findOne({
parent = await DriveFolders.findOneBy({
id: ps.parentId,
userId: user.id,
});
@@ -58,7 +58,7 @@ export default define(meta, paramDef, async (ps, user) => {
name: ps.name,
parentId: parent !== null ? parent.id : null,
userId: user.id,
}).then(x => DriveFolders.findOneOrFail(x.identifiers[0]));
}).then(x => DriveFolders.findOneByOrFail(x.identifiers[0]));
const folderObj = await DriveFolders.pack(folder);

6
packages/backend/src/server/api/endpoints/drive/folders/delete.ts
View File

@@ -36,7 +36,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Get folder
const folder = await DriveFolders.findOne({
const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});
@@ -46,8 +46,8 @@ export default define(meta, paramDef, async (ps, user) => {
}
const [childFoldersCount, childFilesCount] = await Promise.all([
DriveFolders.count({ parentId: folder.id }),
DriveFiles.count({ folderId: folder.id }),
DriveFolders.countBy({ parentId: folder.id }),
DriveFiles.countBy({ folderId: folder.id }),
]);
if (childFoldersCount !== 0 || childFilesCount !== 0) {

5
packages/backend/src/server/api/endpoints/drive/folders/find.ts
View File

@@ -1,5 +1,6 @@
import define from '../../../define.js';
import { DriveFolders } from '@/models/index.js';
import { IsNull } from 'typeorm';
export const meta = {
tags: ['drive'],
@@ -30,10 +31,10 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const folders = await DriveFolders.find({
const folders = await DriveFolders.findBy({
name: ps.name,
userId: user.id,
parentId: ps.parentId,
parentId: ps.parentId ?? IsNull(),
});
return await Promise.all(folders.map(folder => DriveFolders.pack(folder)));

2
packages/backend/src/server/api/endpoints/drive/folders/show.ts
View File

@@ -35,7 +35,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Get folder
const folder = await DriveFolders.findOne({
const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});

8
packages/backend/src/server/api/endpoints/drive/folders/update.ts
View File

@@ -50,7 +50,7 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
// Fetch folder
const folder = await DriveFolders.findOne({
const folder = await DriveFolders.findOneBy({
id: ps.folderId,
userId: user.id,
});
@@ -68,7 +68,7 @@ export default define(meta, paramDef, async (ps, user) => {
folder.parentId = null;
} else {
// Get parent folder
const parent = await DriveFolders.findOne({
const parent = await DriveFolders.findOneBy({
id: ps.parentId,
userId: user.id,
});
@@ -78,9 +78,9 @@ export default define(meta, paramDef, async (ps, user) => {
}
// Check if the circular reference will occur
async function checkCircle(folderId: any): Promise<boolean> {
async function checkCircle(folderId: string): Promise<boolean> {
// Fetch folder
const folder2 = await DriveFolders.findOne({
const folder2 = await DriveFolders.findOneBy({
id: folderId,
});