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

4
packages/backend/src/server/api/endpoints/messaging/history.ts
View File

@@ -32,11 +32,11 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
const mute = await Mutings.find({
const mute = await Mutings.findBy({
muterId: user.id,
});
const groups = ps.group ? await UserGroupJoinings.find({
const groups = ps.group ? await UserGroupJoinings.findBy({
userId: user.id,
}).then(xs => xs.map(x => x.userGroupId)) : [];

4
packages/backend/src/server/api/endpoints/messaging/messages.ts
View File

@@ -97,14 +97,14 @@ export default define(meta, paramDef, async (ps, user) => {
})));
} else if (ps.groupId != null) {
// Fetch recipient (group)
const recipientGroup = await UserGroups.findOne(ps.groupId);
const recipientGroup = await UserGroups.findOneBy({ id: ps.groupId });
if (recipientGroup == null) {
throw new ApiError(meta.errors.noSuchGroup);
}
// check joined
const joining = await UserGroupJoinings.findOne({
const joining = await UserGroupJoinings.findOneBy({
userId: user.id,
userGroupId: recipientGroup.id,
});

12
packages/backend/src/server/api/endpoints/messaging/messages/create.ts
View File

@@ -77,8 +77,8 @@ export const paramDef = {
// eslint-disable-next-line import/no-default-export
export default define(meta, paramDef, async (ps, user) => {
let recipientUser: User | undefined;
let recipientGroup: UserGroup | undefined;
let recipientUser: User | null;
let recipientGroup: UserGroup | null;
if (ps.userId != null) {
// Myself
@@ -93,7 +93,7 @@ export default define(meta, paramDef, async (ps, user) => {
});
// Check blocking
const block = await Blockings.findOne({
const block = await Blockings.findOneBy({
blockerId: recipientUser.id,
blockeeId: user.id,
});
@@ -102,14 +102,14 @@ export default define(meta, paramDef, async (ps, user) => {
}
} else if (ps.groupId != null) {
// Fetch recipient (group)
recipientGroup = await UserGroups.findOne(ps.groupId);
recipientGroup = await UserGroups.findOneBy({ id: ps.groupId! });
if (recipientGroup == null) {
throw new ApiError(meta.errors.noSuchGroup);
}
// check joined
const joining = await UserGroupJoinings.findOne({
const joining = await UserGroupJoinings.findOneBy({
userId: user.id,
userGroupId: recipientGroup.id,
});
@@ -121,7 +121,7 @@ export default define(meta, paramDef, async (ps, user) => {
let file = null;
if (ps.fileId != null) {
file = await DriveFiles.findOne({
file = await DriveFiles.findOneBy({
id: ps.fileId,
userId: user.id,
});

2
packages/backend/src/server/api/endpoints/messaging/messages/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 message = await MessagingMessages.findOne({
const message = await MessagingMessages.findOneBy({
id: ps.messageId,
userId: user.id,
});

2
packages/backend/src/server/api/endpoints/messaging/messages/read.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 message = await MessagingMessages.findOne(ps.messageId);
const message = await MessagingMessages.findOneBy({ id: ps.messageId });
if (message == null) {
throw new ApiError(meta.errors.noSuchMessage);