Akif9748/akf-forum
Akif9748/akf-forum
1
1
Fork 0
mirror of https://github.com/Akif9748/akf-forum.git synced 2024-11-26 13:20:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

hmm

Browse source
This commit is contained in:
Akif9748 2022-09-16 23:12:06 +03:00
parent 2db20ce132
commit 868068d80f
7 changed files with 14 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/index.js
View file

@ -1,11 +0,0 @@
module.exports = {
URLRegex: /https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)/g,
clearContent: (content) => {
if (!content) return "";
return content.replaceAll("&", "&")
.replaceAll("<", "&lt;").replaceAll(">", "&gt;")
.replaceAll("\"", "&quot;").replaceAll("'", "&#39;")
.replaceAll("\n", "<br>");
}
}

6
routes/api/routes/users.js
View file

@ -1,6 +1,5 @@
const { UserModel, SecretModel } = require("../../../models"); const { UserModel, SecretModel } = require("../../../models");
const { Router } = require("express"); const { Router } = require("express");
const { URLRegex } = require("../../../lib");
const multer = require("multer"); const multer = require("multer");
const app = Router(); const app = Router();
@ -55,13 +54,10 @@ app.patch("/:id/", async (req, res) => {
if (req.user.id !== member.id && !user.admin) return res.error(403, "You have not got permission for this."); if (req.user.id !== member.id && !user.admin) return res.error(403, "You have not got permission for this.");
if (!Object.values(req.body).some(Boolean)) return res.error(400, "Missing member informations in request body."); if (!Object.values(req.body).some(Boolean)) return res.error(400, "Missing member informations in request body.");
const { avatar, name, about, theme, admin, deleted } = req.body; const { name, about, theme, admin, deleted } = req.body;
if ((admin?.length || "deleted" in req.body) && !req.user.admin) return res.error(403, "You have not got permission for edit 'admin' and 'deleted' information, or bad request."); if ((admin?.length || "deleted" in req.body) && !req.user.admin) return res.error(403, "You have not got permission for edit 'admin' and 'deleted' information, or bad request.");
if (avatar && URLRegex.test(avatar))
member.avatar = avatar;
if (name) { if (name) {
await SecretModel.updateOne({ id: member.id }, { username: name }); await SecretModel.updateOne({ id: member.id }, { username: name });
member.name = name; member.name = name;

7
routes/register.js
View file

@ -1,8 +1,7 @@
const { UserModel, SecretModel } = require("../models"); const { UserModel, SecretModel } = require("../models");
const { Router } = require("express") const { Router } = require("express")
const bcrypt = require("bcrypt"); const bcrypt = require("bcrypt");
const rateLimit = require('express-rate-limit') const rateLimit = require('express-rate-limit');
const {URLRegex} = require("../lib")
const app = Router(); const app = Router();
app.get("/", (req, res) => res.reply("register", { user: null })); app.get("/", (req, res) => res.reply("register", { user: null }));
@ -14,16 +13,14 @@ app.post("/", rateLimit({
req.session.userID=null; req.session.userID=null;
let { username = null, password: body_pass = null, avatar, about } = req.body; let { username = null, password: body_pass = null, about } = req.body;
if (!username || !body_pass) return res.error(res, 400, "You forgot entering some values"); if (!username || !body_pass) return res.error(res, 400, "You forgot entering some values");
const user = await SecretModel.findOne({ username }); const user = await SecretModel.findOne({ username });
if (user) return res.error(res, 400, `We have got an user named ${username}!`) if (user) return res.error(res, 400, `We have got an user named ${username}!`)
const user2 = new UserModel({ name: req.body.username }) const user2 = new UserModel({ name: req.body.username })
if (avatar && URLRegex.test(avatar)) user2.avatar = avatar;
if (about) user2.about = about; if (about) user2.about = about;

1
routes/threads.js
View file

@ -1,6 +1,5 @@
const { Router } = require("express"); const { Router } = require("express");
const app = Router(); const app = Router();
const { clearContent } = require("../lib");
const { ThreadModel, MessageModel, CategoryModel } = require("../models") const { ThreadModel, MessageModel, CategoryModel } = require("../models")
app.get("/", async (req, res) => { app.get("/", async (req, res) => {

3
routes/users.js
View file

@ -1,7 +1,5 @@
const { Router } = require("express"); const { Router } = require("express");
const app = Router(); const app = Router();
const { clearContent } = require("../lib");
const { UserModel, MessageModel, ThreadModel } = require("../models"); const { UserModel, MessageModel, ThreadModel } = require("../models");
app.get("/", async (req, res) => { app.get("/", async (req, res) => {
@ -29,7 +27,6 @@ app.get("/:id", async (req, res) => {
const message = await MessageModel.count({ authorID: id }); const message = await MessageModel.count({ authorID: id });
const thread = await ThreadModel.count({ authorID: id }); const thread = await ThreadModel.count({ authorID: id });
member.about = clearContent(member.about)
res.reply("user", { member, counts: { message, thread } }) res.reply("user", { member, counts: { message, thread } })
} }
else res.error(404, `We don't have any user with id ${id}.`); else res.error(404, `We don't have any user with id ${id}.`);

2
views/register.ejs
View file

@ -17,7 +17,7 @@
<input type="text" name="username" placeholder="Username" class="input" required> <input type="text" name="username" placeholder="Username" class="input" required>
<input type="password" name="password" placeholder="Password" class="input" required> <input type="password" name="password" placeholder="Password" class="input" required>
<input type="url" name="avatar" placeholder="Avatar URL (not required)" class="input">
<textarea class="input" name="about" rows="4" placeholder="About you... Not required"></textarea> <textarea class="input" name="about" rows="4" placeholder="About you... Not required"></textarea>
<input type="submit" class="btn-primary" style="width:100%;" value="Register"> <input type="submit" class="btn-primary" style="width:100%;" value="Register">
</form> </form>

10
views/user.ejs
View file

@ -6,6 +6,7 @@
<body> <body>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css" integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A==" crossorigin="anonymous" referrerpolicy="no-referrer" /> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css" integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A==" crossorigin="anonymous" referrerpolicy="no-referrer" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/2.1.0/showdown.min.js"></script>
<link rel="stylesheet" href="/css/user.css" /> <link rel="stylesheet" href="/css/user.css" />
<%- include("extra/navbar") %> <%- include("extra/navbar") %>
@ -28,7 +29,7 @@
<div class="content"> <div class="content">
<form id="form" class="see" style="box-shadow:none"> <form id="form" class="see" style="box-shadow:none">
<input type="text" name="name" placeholder="<%=member.name%>" class="input"> <input type="text" name="name" placeholder="<%=member.name%>" class="input">
<input type="url" name="avatar" placeholder="<%=member.avatar%>" class="input">
<textarea class="input" name="about" rows="4" cols="60" name="content" placeholder="<%=member.about%>"></textarea> <textarea class="input" name="about" rows="4" cols="60" name="content" placeholder="<%=member.about%>"></textarea>
<% if (user?.admin){ %> <% if (user?.admin){ %>
Is Admin? <input id='admin' type='checkbox' value='true' name='admin' <%=member.admin ? "checked": ""%>> Is Admin? <input id='admin' type='checkbox' value='true' name='admin' <%=member.admin ? "checked": ""%>>
@ -93,7 +94,7 @@
<h2 class="box-value" style="align-self: center;">Admin</h2> <h2 class="box-value" style="align-self: center;">Admin</h2>
<% } %> <% } %>
<div class="box-value" style=" <div class="box-value" id="about" style="
margin: 10px auto; margin: 10px auto;
box-shadow: 0 0 5px 0 var(--second); box-shadow: 0 0 5px 0 var(--second);
padding: 10px; padding: 10px;
@ -106,6 +107,11 @@ color: var(--anti);
"> ">
<%= member.about %> <%= member.about %>
</div> </div>
<script>
const converter = new showdown.Converter();
const about = document.getElementById("about")
about.innerHTML=converter.makeHtml(about.innerText);
</script>
<div class="box"> <div class="box">
<h2 class="box-title">Name:</h2> <h2 class="box-title">Name:</h2>