Merge pull request #129 from PretendoNetwork/chore/cleanup-post-logic

Chore: cleanup posting logic

Author: mrjvs

apps/juxtaposition-ui/src/services/juxt-web/routes/console/posts.js

@@ -190,6 +190,32 @@ router.post('/:post_id/report', upload.none(), async function (req, res) {
 	return res.redirect(`/posts/${post.id}`);
 });
 
+function canPost(community, userSettings, parentPost, user) {
+	const isReply = !!parentPost;
+	const isPublicPostableCommunity = community.type >= 0 && community.type < 2;
+	const isOpenCommunity = community.permissions.open;
+
+	const isCommunityAdmin = (community.admins ?? []).includes(user.pid);
+	const isUserLimitedFromPosting = userSettings.account_status !== 0;
+	const hasAccessLevelRequirement = isReply
+		? user.accessLevel >= community.permissions.minimum_new_comment_access_level
+		: user.accessLevel >= community.permissions.minimum_new_post_access_level;
+
+	if (isUserLimitedFromPosting) {
+		return false;
+	}
+
+	if (isCommunityAdmin) {
+		return true; // admins can always post (if not limited)
+	}
+
+	if (!hasAccessLevelRequirement) {
+		return false;
+	}
+
+	return isReply ? isOpenCommunity : isPublicPostableCommunity;
+}
+
 async function newPost(req, res) {
 	const userSettings = await database.getUserSettings(req.pid);
 	let parentPost = null;
@@ -211,13 +237,9 @@ async function newPost(req, res) {
 		}
 	}
 
-	if (!(community.admins && community.admins.indexOf(req.pid) !== -1 && userSettings.account_status === 0)) {
-		if (community.type >= 2 || req.user.access_level < community.permissions.minimum_new_post_access_level) {
-			if (!(parentPost && req.user.access_level >= community.permissions.minimum_new_comment_access_level && community.permissions.open)) {
-				res.status(403);
-				return res.redirect(`/titles/${community.olive_community_id}/new`);
-			}
-		}
+	if (!canPost(community, userSettings, parentPost, req.user)) {
+		res.status(403);
+		return res.redirect(`/titles/${community.olive_community_id}/new`);
 	}
 
 	let painting = '';

apps/miiverse-api/src/services/api/routes/posts.ts

@@ -23,6 +23,9 @@ import { config } from '@/config';
 import { ApiErrorCode, badRequest, serverError } from '@/errors';
 import type { PostRepliesResult } from '@/types/miiverse/post';
 import type { HydratedPostDocument } from '@/types/mongoose/post';
+import type { HydratedCommunityDocument } from '@/types/mongoose/community';
+import type { HydratedSettingsDocument } from '@/types/mongoose/settings';
+import type { GetUserDataResponse } from '@pretendonetwork/grpc/account/get_user_data_rpc';
 
 const newPostSchema = z.object({
 	community_id: z.string().optional(),
@@ -190,6 +193,32 @@ router.get('/', async function (request: express.Request, response: express.Resp
 	}).end({ pretty: true, allowEmpty: true }));
 });
 
+function canPost(community: HydratedCommunityDocument, userSettings: HydratedSettingsDocument, parentPost: HydratedPostDocument | null, user: GetUserDataResponse): boolean {
+	const isReply = !!parentPost;
+	const isPublicPostableCommunity = community.type >= 0 && community.type < 2;
+	const isOpenCommunity = community.permissions.open;
+
+	const isCommunityAdmin = (community.admins ?? []).includes(user.pid);
+	const isUserLimitedFromPosting = userSettings.account_status !== 0;
+	const hasAccessLevelRequirement = isReply
+		? user.accessLevel >= community.permissions.minimum_new_comment_access_level
+		: user.accessLevel >= community.permissions.minimum_new_post_access_level;
+
+	if (isUserLimitedFromPosting) {
+		return false;
+	}
+
+	if (isCommunityAdmin) {
+		return true; // admins can always post (if not limited)
+	}
+
+	if (!hasAccessLevelRequirement) {
+		return false;
+	}
+
+	return isReply ? isOpenCommunity : isPublicPostableCommunity;
+}
+
 async function newPost(request: express.Request, response: express.Response): Promise<void> {
 	response.type('application/xml');
 
@@ -264,14 +293,8 @@ async function newPost(request: express.Request, response: express.Response): Pr
 		}
 	}
 
-	// TODO - Clean this up
-	// * Nesting this because of how many checks there are, extremely unreadable otherwise
-	if (!(community.admins && community.admins.indexOf(request.pid) !== -1 && userSettings.account_status === 0)) {
-		if (community.type >= 2 || request.user.accessLevel < community.permissions.minimum_new_post_access_level) {
-			if (!(parentPost && request.user.accessLevel >= community.permissions.minimum_new_comment_access_level && community.permissions.open)) {
-				return badRequest(response, ApiErrorCode.NOT_ALLOWED, 403);
-			}
-		}
+	if (!canPost(community, userSettings, parentPost, request.user)) {
+		return badRequest(response, ApiErrorCode.NOT_ALLOWED, 403);
 	}
 
 	let miiFace = 'normal_face.png';