From a11fd6971dec8afbac37eca24694f03e2547eca7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 11 Dec 2022 14:50:16 -0800
Subject: [PATCH] fix liked pages endpoint

---
 package.json                                              | 2 +-
 packages/backend/src/models/repositories/page-like.ts     | 8 ++++----
 packages/backend/src/models/repositories/page.ts          | 6 +++---
 packages/backend/src/server/api/endpoints/i/page-likes.ts | 6 +++---
 packages/backend/src/server/api/endpoints/i/pages.ts      | 4 ++--
 packages/client/src/pages/pages.vue                       | 2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 41199a220..5299cd941 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "12.119.0-calc.19-b15",
+	"version": "12.119.0-calc.19-b16",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/models/repositories/page-like.ts b/packages/backend/src/models/repositories/page-like.ts
index 87d6accc3..3f259f981 100644
--- a/packages/backend/src/models/repositories/page-like.ts
+++ b/packages/backend/src/models/repositories/page-like.ts
@@ -1,12 +1,12 @@
 import { db } from '@/db/postgre.js';
 import { PageLike } from '@/models/entities/page-like.js';
+import type { User } from '@/models/entities/user.js';
 import { Pages } from '../index.js';
-import { User } from '@/models/entities/user.js';
 
 export const PageLikeRepository = db.getRepository(PageLike).extend({
 	async pack(
 		src: PageLike['id'] | PageLike,
-		me?: { id: User['id'] } | null | undefined
+		me?: { id: User['id'] } | null | undefined,
 	) {
 		const like = typeof src === 'object' ? src : await this.findOneByOrFail({ id: src });
 
@@ -17,8 +17,8 @@ export const PageLikeRepository = db.getRepository(PageLike).extend({
 	},
 
 	packMany(
-		likes: any[],
-		me: { id: User['id'] }
+		likes: PageLike[],
+		me: { id: User['id'] },
 	) {
 		return Promise.all(likes.map(x => this.pack(x, me)));
 	},
diff --git a/packages/backend/src/models/repositories/page.ts b/packages/backend/src/models/repositories/page.ts
index 65b54f8b8..1a8bc50e2 100644
--- a/packages/backend/src/models/repositories/page.ts
+++ b/packages/backend/src/models/repositories/page.ts
@@ -1,9 +1,9 @@
 import { db } from '@/db/postgre.js';
 import { Page } from '@/models/entities/page.js';
-import { Packed } from '@/misc/schema.js';
+import type { Packed } from '@/misc/schema.js';
 import { awaitAll } from '@/prelude/await-all.js';
-import { DriveFile } from '@/models/entities/drive-file.js';
-import { User } from '@/models/entities/user.js';
+import type { DriveFile } from '@/models/entities/drive-file.js';
+import type { User } from '@/models/entities/user.js';
 import { Users, DriveFiles, PageLikes } from '../index.js';
 
 export const PageRepository = db.getRepository(Page).extend({
diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts
index 71e326e2f..987387237 100644
--- a/packages/backend/src/server/api/endpoints/i/page-likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { PageLikes } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
@@ -26,7 +26,7 @@ export const meta = {
 					ref: 'Page',
 				},
 			},
-		}
+		},
 	},
 } as const;
 
@@ -43,7 +43,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(PageLikes.createQueryBuilder('like'), ps.sinceId, ps.untilId)
-		.andWhere(`like.userId = :meId`, { meId: user.id })
+		.andWhere('like.userId = :meId', { meId: user.id })
 		.leftJoinAndSelect('like.page', 'page');
 
 	const likes = await query
diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts
index f28aed3fd..7e1820d45 100644
--- a/packages/backend/src/server/api/endpoints/i/pages.ts
+++ b/packages/backend/src/server/api/endpoints/i/pages.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Pages } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
@@ -33,7 +33,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(Pages.createQueryBuilder('page'), ps.sinceId, ps.untilId)
-		.andWhere(`page.userId = :meId`, { meId: user.id });
+		.andWhere('page.userId = :meId', { meId: user.id });
 
 	const pages = await query
 		.take(ps.limit)
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index a5bd4c4c8..66ba58df4 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -60,7 +60,7 @@ watch($$(tab), () => (syncSlide(tabs.indexOf(tab))));
 
 const featuredPagesPagination = {
 	endpoint: 'pages/featured' as const,
-	noPaging: true,
+	limit: 10,
 };
 const myPagesPagination = {
 	endpoint: 'i/pages' as const,