refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { getConnection, In } from 'typeorm';
|
||||
import { In } from 'typeorm';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -25,7 +26,7 @@ export const paramDef = {
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default define(meta, paramDef, async (ps) => {
|
||||
const emojis = await Emojis.find({
|
||||
const emojis = await Emojis.findBy({
|
||||
id: In(ps.ids),
|
||||
});
|
||||
|
||||
@@ -36,5 +37,5 @@ export default define(meta, paramDef, async (ps) => {
|
||||
});
|
||||
}
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
});
|
||||
|
@@ -1,11 +1,11 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis, DriveFiles } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { getConnection } from 'typeorm';
|
||||
import { insertModerationLog } from '@/services/insert-moderation-log.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import rndstr from 'rndstr';
|
||||
import { publishBroadcastStream } from '@/services/stream.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -32,7 +32,7 @@ export const paramDef = {
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default define(meta, paramDef, async (ps, me) => {
|
||||
const file = await DriveFiles.findOne(ps.fileId);
|
||||
const file = await DriveFiles.findOneBy({ id: ps.fileId });
|
||||
|
||||
if (file == null) throw new ApiError(meta.errors.noSuchFile);
|
||||
|
||||
@@ -48,9 +48,9 @@ export default define(meta, paramDef, async (ps, me) => {
|
||||
originalUrl: file.url,
|
||||
publicUrl: file.webpublicUrl ?? file.url,
|
||||
type: file.webpublicType ?? file.type,
|
||||
}).then(x => Emojis.findOneOrFail(x.identifiers[0]));
|
||||
}).then(x => Emojis.findOneByOrFail(x.identifiers[0]));
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
|
||||
publishBroadcastStream('emojiAdded', {
|
||||
emoji: await Emojis.pack(emoji.id),
|
||||
|
@@ -1,11 +1,11 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { genId } from '@/misc/gen-id.js';
|
||||
import { getConnection } from 'typeorm';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { DriveFile } from '@/models/entities/drive-file.js';
|
||||
import { uploadFromUrl } from '@/services/drive/upload-from-url.js';
|
||||
import { publishBroadcastStream } from '@/services/stream.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -44,7 +44,7 @@ export const paramDef = {
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default define(meta, paramDef, async (ps, me) => {
|
||||
const emoji = await Emojis.findOne(ps.emojiId);
|
||||
const emoji = await Emojis.findOneBy({ id: ps.emojiId });
|
||||
|
||||
if (emoji == null) {
|
||||
throw new ApiError(meta.errors.noSuchEmoji);
|
||||
@@ -68,9 +68,9 @@ export default define(meta, paramDef, async (ps, me) => {
|
||||
originalUrl: driveFile.url,
|
||||
publicUrl: driveFile.webpublicUrl ?? driveFile.url,
|
||||
type: driveFile.webpublicType ?? driveFile.type,
|
||||
}).then(x => Emojis.findOneOrFail(x.identifiers[0]));
|
||||
}).then(x => Emojis.findOneByOrFail(x.identifiers[0]));
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
|
||||
publishBroadcastStream('emojiAdded', {
|
||||
emoji: await Emojis.pack(copied.id),
|
||||
|
@@ -1,8 +1,9 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { getConnection, In } from 'typeorm';
|
||||
import { In } from 'typeorm';
|
||||
import { insertModerationLog } from '@/services/insert-moderation-log.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -23,14 +24,14 @@ export const paramDef = {
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default define(meta, paramDef, async (ps, me) => {
|
||||
const emojis = await Emojis.find({
|
||||
const emojis = await Emojis.findBy({
|
||||
id: In(ps.ids),
|
||||
});
|
||||
|
||||
for (const emoji of emojis) {
|
||||
await Emojis.delete(emoji.id);
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
|
||||
insertModerationLog(me, 'deleteEmoji', {
|
||||
emoji: emoji,
|
||||
|
@@ -1,8 +1,8 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { getConnection } from 'typeorm';
|
||||
import { insertModerationLog } from '@/services/insert-moderation-log.js';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -29,13 +29,13 @@ export const paramDef = {
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default define(meta, paramDef, async (ps, me) => {
|
||||
const emoji = await Emojis.findOne(ps.id);
|
||||
const emoji = await Emojis.findOneBy({ id: ps.id });
|
||||
|
||||
if (emoji == null) throw new ApiError(meta.errors.noSuchEmoji);
|
||||
|
||||
await Emojis.delete(emoji.id);
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
|
||||
insertModerationLog(me, 'deleteEmoji', {
|
||||
emoji: emoji,
|
||||
|
@@ -1,7 +1,8 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { getConnection, In } from 'typeorm';
|
||||
import { In } from 'typeorm';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -25,7 +26,7 @@ export const paramDef = {
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default define(meta, paramDef, async (ps) => {
|
||||
const emojis = await Emojis.find({
|
||||
const emojis = await Emojis.findBy({
|
||||
id: In(ps.ids),
|
||||
});
|
||||
|
||||
@@ -36,5 +37,5 @@ export default define(meta, paramDef, async (ps) => {
|
||||
});
|
||||
}
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
});
|
||||
|
@@ -1,7 +1,8 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { getConnection, In } from 'typeorm';
|
||||
import { In } from 'typeorm';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -32,5 +33,5 @@ export default define(meta, paramDef, async (ps) => {
|
||||
aliases: ps.aliases,
|
||||
});
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
});
|
||||
|
@@ -1,7 +1,8 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { getConnection, In } from 'typeorm';
|
||||
import { In } from 'typeorm';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -30,5 +31,5 @@ export default define(meta, paramDef, async (ps) => {
|
||||
category: ps.category,
|
||||
});
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
});
|
||||
|
@@ -1,7 +1,7 @@
|
||||
import define from '../../../define.js';
|
||||
import { Emojis } from '@/models/index.js';
|
||||
import { getConnection } from 'typeorm';
|
||||
import { ApiError } from '../../../error.js';
|
||||
import { db } from '@/db/postgre.js';
|
||||
|
||||
export const meta = {
|
||||
tags: ['admin'],
|
||||
@@ -33,7 +33,7 @@ export const paramDef = {
|
||||
|
||||
// eslint-disable-next-line import/no-default-export
|
||||
export default define(meta, paramDef, async (ps) => {
|
||||
const emoji = await Emojis.findOne(ps.id);
|
||||
const emoji = await Emojis.findOneBy({ id: ps.id });
|
||||
|
||||
if (emoji == null) throw new ApiError(meta.errors.noSuchEmoji);
|
||||
|
||||
@@ -44,5 +44,5 @@ export default define(meta, paramDef, async (ps) => {
|
||||
aliases: ps.aliases,
|
||||
});
|
||||
|
||||
await getConnection().queryResultCache!.remove(['meta_emojis']);
|
||||
await db.queryResultCache!.remove(['meta_emojis']);
|
||||
});
|
||||
|
Reference in New Issue
Block a user