Merge pull request #156 from PretendoNetwork/work/grpc-2

mrjvs · web-flow · commit 4a257f036b77 · 2025-08-13T13:44:01.000+02:00
backend: Add "posts by user" endpoints for user pages
diff --git a/apps/juxtaposition-ui/src/api/page.ts b/apps/juxtaposition-ui/src/api/page.ts
@@ -0,0 +1,7 @@
+/* !!! HEY
+ * This type lives in apps/miiverse-api/src/services/internal/contract/page.ts
+ * Modify it there and copy-paste here! */
+
+export type PageDto<T> = {
+	items: T[];
+};
diff --git a/apps/juxtaposition-ui/src/api/post.ts b/apps/juxtaposition-ui/src/api/post.ts
@@ -1,4 +1,5 @@
 import { apiFetchUser } from '@/fetch';
+import type { PageDto } from '@/api/page';
 import type { UserTokens } from '@/fetch';
 
 /* !!! HEY
@@ -63,3 +64,22 @@ export async function getPostById(tokens: UserTokens, post_id: string): Promise<
 	const post = await apiFetchUser<PostDto>(tokens, `/api/v1/posts/${post_id}`);
 	return post;
 }
+
+export async function getPostsByPoster(tokens: UserTokens, poster_pid: number, offset: number): Promise<PageDto<PostDto> | null> {
+	const params = new URLSearchParams({
+		posted_by: poster_pid.toString(),
+		offset: offset.toString()
+	});
+	const posts = await apiFetchUser<PageDto<PostDto>>(tokens, `/api/v1/posts?${params}`);
+	return posts;
+}
+
+export async function getPostsByEmpathy(tokens: UserTokens, empathy_by: number, offset: number): Promise<PageDto<PostDto> | null> {
+	const params = new URLSearchParams({
+		empathy_by: empathy_by.toString(),
+		offset: offset.toString(),
+		include_replies: 'true'
+	});
+	const posts = await apiFetchUser<PageDto<PostDto>>(tokens, `/api/v1/posts?${params}`);
+	return posts;
+}
diff --git a/apps/juxtaposition-ui/src/database.js b/apps/juxtaposition-ui/src/database.js
@@ -102,15 +102,6 @@ async function getPostByID(postID) {
 	});
 }
 
-async function getPostsByUserID(userID) {
-	verifyConnected();
-	return POST.find({
-		pid: userID,
-		parent: null,
-		removed: false
-	});
-}
-
 async function getPostReplies(postID, number) {
 	verifyConnected();
 	return POST.find({
@@ -141,16 +132,6 @@ async function getUserPostRepliesAfterTimestamp(post, numberOfPosts) {
 	}).limit(numberOfPosts);
 }
 
-async function getNumberUserPostsByID(userID, number, includeRemoved = false) {
-	verifyConnected();
-	return POST.find({
-		pid: userID,
-		parent: null,
-		message_to_pid: null,
-		...(includeRemoved ? {} : { removed: false })
-	}).sort({ created_at: -1 }).limit(number);
-}
-
 async function getTotalPostsByUserID(userID) {
 	verifyConnected();
 	return POST.find({
@@ -254,16 +235,6 @@ async function getUserPostsAfterTimestamp(post, numberOfPosts) {
 	}).limit(numberOfPosts);
 }
 
-async function getUserPostsOffset(pid, limit, offset) {
-	verifyConnected();
-	return POST.find({
-		pid: pid,
-		parent: null,
-		message_to_pid: null,
-		removed: false
-	}).skip(offset).limit(limit).sort({ created_at: -1 });
-}
-
 async function getCommunityPostsAfterTimestamp(post, numberOfPosts) {
 	verifyConnected();
 	return POST.find({
@@ -529,17 +500,14 @@ module.exports = {
 	getNumberVerifiedCommunityPostsByID,
 	getNewPostsByCommunity,
 	getPostsByCommunityKey,
-	getPostsByUserID,
 	getPostReplies,
 	getUserPostRepliesAfterTimestamp,
-	getNumberUserPostsByID,
 	getTotalPostsByUserID,
 	getPostByID,
 	getDuplicatePosts,
 	getEndpoints,
 	getEndPoint,
 	getUserPostsAfterTimestamp,
-	getUserPostsOffset,
 	getCommunityPostsAfterTimestamp,
 	getNewsFeed,
 	getNewsFeedAfterTimestamp,
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/routes/admin/admin.js b/apps/juxtaposition-ui/src/services/juxt-web/routes/admin/admin.js
@@ -10,8 +10,8 @@ const { COMMUNITY } = require('@/models/communities');
 const util = require('@/util');
 const storage = multer.memoryStorage();
 const upload = multer({ storage: storage });
-const { config } = require('@/config');
 const { logger } = require('@/logger');
+const { getPostsByPoster } = require('@/api/post');
 const router = express.Router();
 
 router.get('/posts', async function (req, res) {
@@ -87,7 +87,7 @@ router.get('/accounts/:pid', async function (req, res) {
 		return res.redirect('/404');
 	}
 	const userSettings = await database.getUserSettings(req.params.pid);
-	const posts = await database.getNumberUserPostsByID(req.params.pid, config.postLimit);
+	const posts = (await getPostsByPoster(req.tokens, req.params.pid, 0)).items;
 	const communityMap = await util.getCommunityHash();
 	const userMap = util.getUserHash();
 	const reasonMap = util.getReasonMap();
diff --git a/apps/juxtaposition-ui/src/services/juxt-web/routes/console/userpage.js b/apps/juxtaposition-ui/src/services/juxt-web/routes/console/userpage.js
@@ -1,13 +1,12 @@
 const express = require('express');
 const multer = require('multer');
 const moment = require('moment');
+const { getPostsByPoster, getPostsByEmpathy } = require('@/api/post');
 const database = require('@/database');
 const util = require('@/util');
 const { getUserFriendPIDs } = util;
 const { POST } = require('@/models/post');
 const { SETTINGS } = require('@/models/settings');
-const redis = require('@/redisCache');
-const { config } = require('@/config');
 const { logger } = require('@/logger');
 const router = express.Router();
 const upload = multer({ dest: 'uploads/' });
@@ -148,11 +147,7 @@ async function userPage(req, res, userID) {
 	}
 
 	const userSettings = await database.getUserSettings(userID);
-	let posts = JSON.parse(await redis.getValue(`${userID}-user_page_posts`));
-	if (!posts) {
-		posts = await database.getNumberUserPostsByID(userID, config.postLimit, res.locals.moderator);
-		await redis.setValue(`${userID}_user_page_posts`, JSON.stringify(posts), 60 * 60 * 1);
-	}
+	const posts = (await getPostsByPoster(req.tokens, userID, 0))?.items;
 
 	const numPosts = await database.getTotalPostsByUserID(userID);
 	const communityMap = await util.getCommunityHash();
@@ -215,7 +210,7 @@ async function userRelations(req, res, userID) {
 	let selection;
 
 	if (req.params.type === 'yeahs') {
-		const posts = await POST.find({ yeahs: userID, removed: false }).sort({ created_at: -1 }).limit(config.postLimit);
+		const posts = (await getPostsByEmpathy(req.tokens, userID, 0))?.items;
 		const communityMap = await util.getCommunityHash();
 		const bundle = {
 			posts,
@@ -304,7 +299,7 @@ async function morePosts(req, res, userID) {
 	if (!offset) {
 		offset = 0;
 	}
-	const posts = await database.getUserPostsOffset(userID, config.postLimit, offset);
+	const posts = (await getPostsByPoster(req.tokens, userID, offset))?.items;
 
 	const bundle = {
 		posts,
@@ -334,7 +329,7 @@ async function moreYeahPosts(req, res, userID) {
 	if (!offset) {
 		offset = 0;
 	}
-	const posts = await POST.find({ yeahs: userID, removed: false }).sort({ created_at: -1 }).skip(offset).limit(config.postLimit);
+	const posts = (await getPostsByEmpathy(req.tokens, userID, offset))?.items;
 
 	const bundle = {
 		posts: posts,
diff --git a/apps/miiverse-api/package.json b/apps/miiverse-api/package.json
@@ -40,7 +40,7 @@
 		"supertest": "^7.1.1",
 		"tga": "^1.0.3",
 		"xmlbuilder": "^15.1.1",
-		"zod": "^3.21.4"
+		"zod": "^3.25.7"
 	},
 	"devDependencies": {
 		"@pretendonetwork/eslint-config": "^0.0.11",
diff --git a/apps/miiverse-api/src/services/internal/contract/page.ts b/apps/miiverse-api/src/services/internal/contract/page.ts
@@ -0,0 +1,13 @@
+/* !!! HEY
+ * This type has a copy in apps/juxtaposition-ui/src/api/page.ts
+ * Make sure to copy over any modifications! */
+
+export type PageDto<T> = {
+	items: T[];
+};
+
+export function mapPages<T>(items: T[]): PageDto<T> {
+	return {
+		items
+	};
+}
diff --git a/apps/miiverse-api/src/services/internal/contract/post.ts b/apps/miiverse-api/src/services/internal/contract/post.ts
@@ -1,7 +1,7 @@
 import type { IPost } from '@/types/mongoose/post';
 
 /* !!! HEY
- * This type has a copy in apps/juxtaposition-ui/src/models/api/post.ts
+ * This type has a copy in apps/juxtaposition-ui/src/api/post.ts
  * Make sure to copy over any modifications! */
 
 /* This type is the contract for the frontend. If we make changes to the db, this shape should be kept. */
diff --git a/apps/miiverse-api/src/services/internal/pagination.ts b/apps/miiverse-api/src/services/internal/pagination.ts
@@ -0,0 +1,11 @@
+import * as z from 'zod/v4';
+
+// eslint-disable-next-line @typescript-eslint/explicit-function-return-type -- Zod schema is inferred here
+export function pageSchema(limit = 50) {
+	return z.object({
+		limit: z.coerce.number().min(1).max(limit).default(10),
+		offset: z.coerce.number().min(0).default(0)
+	});
+}
+
+export type PageControls = z.infer<ReturnType<typeof pageSchema>>;
diff --git a/apps/miiverse-api/src/services/internal/routes/posts.ts b/apps/miiverse-api/src/services/internal/routes/posts.ts
@@ -1,17 +1,53 @@
 import express from 'express';
-import { getPostByID } from '@/database';
+import * as z from 'zod/v4';
+import { Post } from '@/models/post';
 import { errors } from '@/services/internal/errors';
-import { handle } from '@/services/internal/utils';
+import { deleteOptional, filterRemovedPosts, handle } from '@/services/internal/utils';
 import { guards } from '@/services/internal/middleware/guards';
 import { mapPost } from '@/services/internal/contract/post';
+import { mapPages } from '@/services/internal/contract/page';
+import { pageSchema } from '@/services/internal/pagination';
 
 export const postsRouter = express.Router();
 
+// Get posts by topic tag, poster, or empathy
+postsRouter.get('/posts', guards.user, handle(async ({ req, res }) => {
+	// the idea is that any combination of these can be left undefined
+	const query = z.object({
+		topic_tag: z.string().optional(),
+		posted_by: z.coerce.number().optional(),
+		empathy_by: z.coerce.number().optional(),
+		include_replies: z.stringbool().default(false)
+	}).and(pageSchema()).parse(req.query);
+
+	const posts = await Post.find(deleteOptional({
+		pid: query.posted_by,
+		topic_tag: query.topic_tag,
+		yeahs: query.empathy_by,
+
+		message_to_pid: null, // messages aren't really posts
+		...query.include_replies ? {} : { parent: null },
+		...filterRemovedPosts(res.locals.account)
+	})).sort({ created_at: -1 }).skip(query.offset).limit(query.limit);
+
+	// PageDto<PostDto>
+	return mapPages(posts.map(mapPost));
+}));
+
+// Get post by id
 postsRouter.get('/posts/:post_id', guards.guest, handle(async ({ req, res }) => {
-	const post = await getPostByID(req.params.post_id);
-	if (!post || (post.removed && res.locals.account?.moderator !== true)) {
+	const params = z.object({
+		post_id: z.string().length(21)
+	}).parse(req.params);
+
+	const post = await Post.findOne({
+		id: params.post_id,
+		...filterRemovedPosts(res.locals.account)
+	});
+	if (!post) {
 		throw new errors.notFound('Post not found');
 	}
 
+	// PostDto
 	return mapPost(post);
 }));
diff --git a/apps/miiverse-api/src/services/internal/utils.ts b/apps/miiverse-api/src/services/internal/utils.ts
@@ -1,3 +1,4 @@
+import type { AccountData } from '@/types/common/account-data';
 import type { Request, Response } from 'express';
 
 export type HandlerContext = {
@@ -14,3 +15,29 @@ export function handle(handler: HandlerFunction) {
 		res.status(200).json(result);
 	};
 }
+
+/**
+ * Returns { removed: false }, unless you're a moderator.
+ * The idea is that you can object spread this into a query. Now moderators can see
+ * removed posts.
+ * @param account The account making the request.
+ * @returns The appropriate filter
+ */
+export function filterRemovedPosts(account: AccountData | null): { removed?: false } {
+	return account?.moderator ? {} : { removed: false };
+}
+
+/**
+ * Deletes undefined, but present, values. Useful for Mongoose queries.
+ * @param query Your query.
+ * @returns Partial<query>, with undefined values deleted
+ */
+export function deleteOptional<T extends {}>(query: T): Partial<T> { // Partial<T> kinda wrong but good enough
+	for (const _key of Object.keys(query)) {
+		const key = _key as keyof T;
+		if (query[key] === undefined) {
+			delete query[key];
+		}
+	}
+	return query;
+}
diff --git a/package-lock.json b/package-lock.json
