summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/messaging
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2022-03-26 15:34:00 +0900
committerGitHub <noreply@github.com>2022-03-26 15:34:00 +0900
commit1c67c26bd87aae64fe0f2ef45140e12a78564699 (patch)
tree633a3fad1c5841ea20bc39d6b681b455bbdeabf3 /packages/backend/src/server/api/endpoints/messaging
parent.js (diff)
downloadsharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.gz
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.tar.bz2
sharkey-1c67c26bd87aae64fe0f2ef45140e12a78564699.zip
refactor: migrate to typeorm 3.0 (#8443)
* wip * wip * wip * Update following.ts * wip * wip * wip * Update resolve-user.ts * maxQueryExecutionTime * wip * wip
Diffstat (limited to 'packages/backend/src/server/api/endpoints/messaging')
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/history.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages/create.ts12
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages/delete.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/messaging/messages/read.ts2
5 files changed, 12 insertions, 12 deletions
diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts
index 14de4e1028..ea0600d0e4 100644
--- a/packages/backend/src/server/api/endpoints/messaging/history.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/history.ts
@@ -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)) : [];
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
index 49ace21600..9760709c29 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts
@@ -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,
});
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
index a9b926c4fb..8c1226b0f4 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
@@ -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,
});
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
index a0945af510..f66d75873c 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
@@ -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,
});
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
index 8d38e509ac..db12ae922c 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
@@ -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);