summaryrefslogtreecommitdiff
path: root/packages/backend/src/server/api/endpoints/pages
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/pages
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/pages')
-rw-r--r--packages/backend/src/server/api/endpoints/pages/create.ts6
-rw-r--r--packages/backend/src/server/api/endpoints/pages/delete.ts2
-rw-r--r--packages/backend/src/server/api/endpoints/pages/like.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/pages/show.ts9
-rw-r--r--packages/backend/src/server/api/endpoints/pages/unlike.ts4
-rw-r--r--packages/backend/src/server/api/endpoints/pages/update.ts6
6 files changed, 16 insertions, 15 deletions
diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts
index 7cac530606..c171cd39f5 100644
--- a/packages/backend/src/server/api/endpoints/pages/create.ts
+++ b/packages/backend/src/server/api/endpoints/pages/create.ts
@@ -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);
});
diff --git a/packages/backend/src/server/api/endpoints/pages/delete.ts b/packages/backend/src/server/api/endpoints/pages/delete.ts
index ddf691f53c..e35ad9ebf2 100644
--- a/packages/backend/src/server/api/endpoints/pages/delete.ts
+++ b/packages/backend/src/server/api/endpoints/pages/delete.ts
@@ -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);
}
diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts
index cab78e576c..20793db988 100644
--- a/packages/backend/src/server/api/endpoints/pages/like.ts
+++ b/packages/backend/src/server/api/endpoints/pages/like.ts
@@ -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,
});
diff --git a/packages/backend/src/server/api/endpoints/pages/show.ts b/packages/backend/src/server/api/endpoints/pages/show.ts
index 4e3facae5b..1c218acfd4 100644
--- a/packages/backend/src/server/api/endpoints/pages/show.ts
+++ b/packages/backend/src/server/api/endpoints/pages/show.ts
@@ -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,
});
diff --git a/packages/backend/src/server/api/endpoints/pages/unlike.ts b/packages/backend/src/server/api/endpoints/pages/unlike.ts
index 31cd1a3359..636f3c7149 100644
--- a/packages/backend/src/server/api/endpoints/pages/unlike.ts
+++ b/packages/backend/src/server/api/endpoints/pages/unlike.ts
@@ -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,
});
diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts
index 24c8f467e6..bf95ab36f2 100644
--- a/packages/backend/src/server/api/endpoints/pages/update.ts
+++ b/packages/backend/src/server/api/endpoints/pages/update.ts
@@ -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,