Private posts (#4)

* Prohibit viewing on private posts.
Allow viewing of unlisted posts.

Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>

* Admins can always see posts.
Fixed user registration.

Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>

---------

Signed-off-by: Armored Dragon <publicmail@armoreddragon.com>
account-personalization
Armored Dragon 2024-05-02 16:20:22 +00:00 committed by GitHub
parent 37e582ac1d
commit 6dde5d7020
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 53 additions and 29 deletions

View File

@ -140,28 +140,6 @@ async function newPost({ requester_id }) {
return post.id; return post.id;
} }
async function getPost({ requester_id, post_id, visibility = "PUBLISHED" } = {}, { search, search_title, search_content, search_tags } = {}, { limit = 10, page = 0, pagination = true } = {}) { async function getPost({ requester_id, post_id, visibility = "PUBLISHED" } = {}, { search, search_title, search_content, search_tags } = {}, { limit = 10, page = 0, pagination = true } = {}) {
// Get a single post
if (post_id) {
let post;
post = await prisma.post.findUnique({ where: { id: post_id }, include: { owner: true, tags: true } });
if (!post) return _r(false, "Post does not exist");
post = _stripPrivatePost(post);
// Tags
let post_tags = [];
post.raw_tags = [];
post.tags.forEach((tag) => {
post_tags.push(tag.name);
post.raw_tags.push();
});
post.tags = post_tags;
// Render post
return { success: true, data: await _renderPost(post) };
}
// Otherwise build WHERE_OBJECT using data we do have
let post_list = [];
let where_object = { let where_object = {
OR: [ OR: [
// Standard discovery: Public, and after the publish date // Standard discovery: Public, and after the publish date
@ -190,6 +168,46 @@ async function getPost({ requester_id, post_id, visibility = "PUBLISHED" } = {},
}, },
], ],
}; };
// Admins can view everything at any point
let user;
if (requester_id) {
user = await getUser({ user_id: requester_id });
if (user.success) user = user.data;
if (user.role === "ADMIN") where_object["OR"].push({ NOT: { id: "" } });
}
// Get a single post
if (post_id) {
let post;
// We can view unlisted posts, but we don't want them to show up otherwise in search.
// Inject a "unlisted" inclusion into where_object to allow direct viewing of unlisted posts
where_object["OR"].push({ visibility: "UNLISTED" });
// Allow getting drafts if the requesting user owns the draft
where_object["OR"].push({ AND: [{ visibility: "DRAFT" }, { ownerid: requester_id }] });
post = await prisma.post.findUnique({ where: { ...where_object, id: post_id }, include: { owner: true, tags: true } });
if (!post) return _r(false, "Post does not exist");
post = _stripPrivatePost(post);
// Tags
let post_tags = [];
post.raw_tags = [];
post.tags.forEach((tag) => {
post_tags.push(tag.name);
post.raw_tags.push();
});
post.tags = post_tags;
// Render post
return { success: true, data: await _renderPost(post) };
}
// Otherwise build WHERE_OBJECT using data we do have
let post_list = [];
// Build the "where_object" object // Build the "where_object" object
if (search) { if (search) {
if (search_tags) where_object["AND"][0]["OR"].push({ tags: { some: { name: search?.toLowerCase() } } }); if (search_tags) where_object["AND"][0]["OR"].push({ tags: { some: { name: search?.toLowerCase() } } });
@ -599,7 +617,7 @@ async function postSetting(key, value) {
async function editSetting({ name, value }) { async function editSetting({ name, value }) {
if (!Object.keys(settings).includes(name)) return _r(false, "Setting is not valid"); if (!Object.keys(settings).includes(name)) return _r(false, "Setting is not valid");
await prisma.setting.upsert({ where: { id: key }, update: { value: value }, create: { id: key, value: value } }); await prisma.setting.upsert({ where: { id: name }, update: { value: value }, create: { id: name, value: value } });
try { try {
settings[key] = JSON.parse(value); settings[key] = JSON.parse(value);
} catch { } catch {

View File

@ -5,7 +5,7 @@ const validate = require("../form_validation");
async function postRegister(req, res) { async function postRegister(req, res) {
const { username, password } = req.body; // Get the username and password from the request body const { username, password } = req.body; // Get the username and password from the request body
const form_validation = await validate.registerUser(username, password); // Check form for errors const form_validation = await validate.newUser({ username: username, password: password }); // Check form for errors
// User registration disabled? // User registration disabled?
// We also check if the server was setup. If it was not set up, the server will proceed anyways. // We also check if the server was setup. If it was not set up, the server will proceed anyways.

View File

@ -5,10 +5,10 @@
// Format given data in an accessible way // Format given data in an accessible way
// //
const core = require("./core/core");
// Make sure the user registration data is safe and valid. // Make sure the user registration data is safe and valid.
function newUser({ username, password } = {}) { function newUser({ username, password } = {}) {
const core = require("./core/core"); // HACK: Need to require the core module here because the settings don't get set otherwise.
if (!username) return _r(false, "No username provided"); if (!username) return _r(false, "No username provided");
if (!password) return _r(false, "No password provided"); if (!password) return _r(false, "No password provided");
if (password.length < core.settings["USER_MINIMUM_PASSWORD_LENGTH"]) return _r(false, `Password is not long enough. Minimum length is ${core.settings["USER_MINIMUM_PASSWORD_LENGTH"]}`); if (password.length < core.settings["USER_MINIMUM_PASSWORD_LENGTH"]) return _r(false, `Password is not long enough. Minimum length is ${core.settings["USER_MINIMUM_PASSWORD_LENGTH"]}`);

View File

@ -75,7 +75,7 @@ async function blogList(req, res) {
}); });
} }
async function blogSingle(req, res) { async function blogSingle(req, res) {
const blog = await core.getPost({ post_id: req.params.blog_id }); const blog = await core.getPost({ requester_id: req.session.user?.id, post_id: req.params.blog_id });
if (blog.success === false) return res.redirect("/"); if (blog.success === false) return res.redirect("/");
res.render(_getThemePage("post"), { ...(await getDefaults(req)), blog_post: blog.data }); res.render(_getThemePage("post"), { ...(await getDefaults(req)), blog_post: blog.data });
} }

View File

@ -16,8 +16,14 @@ function patchPost(post_content, user) {
return _r(false, "User is not permitted to preform action."); return _r(false, "User is not permitted to preform action.");
} }
function patchBiography(biography, user) { function patchBiography(biography, user) {
// Biographies are just fancy posts right now. // Admins can always update any post
return patchPost(biography, user); if (user.role === "ADMIN") return _r(true);
// User edits their own account
if (biography.id === user.id) return _r(true);
// User is not permitted
return _r(false, "User is not permitted to preform action.");
} }
function _r(s, m, d) { function _r(s, m, d) {