diff --git a/js/dms.js b/js/dms.js index 9904ae2..f46156e 100644 --- a/js/dms.js +++ b/js/dms.js @@ -340,7 +340,7 @@ function unreply() { var cansendNoti = false -async function askNotiPerms() { + function askNotiPerms() { return Notification.requestPermission() } @@ -411,7 +411,7 @@ function createChannel(channelname,tab) { channelp.id = channelname let textnode = document.createTextNode(channelname) channelp.appendChild(textnode) - channelp.addEventListener("click",async function(){ + channelp.addEventListener("click", function(){ switchChannel(channelname) main() unreply() diff --git a/js/posts.js b/js/posts.js index fd0c7bf..2663e14 100644 --- a/js/posts.js +++ b/js/posts.js @@ -36,7 +36,7 @@ socket.addEventListener("message", async function (event) { var cd = true //inversed "cooldown" -async function postMessage() { + function postMessage() { let msg = getById("post-text").value let len = msg.length if(len > 1000) { @@ -286,7 +286,7 @@ function unreply() { var cansendNoti = false -async function askNotiPerms() { + function askNotiPerms() { return Notification.requestPermission() } @@ -329,7 +329,7 @@ function switchChannel(channelname) { socket.send(JSON.stringify({"id":"switchChannel","data":channelname})) } -async function loadChannels() { + function loadChannels() { // let tab = getById("channelTab") diff --git a/js/settings.js b/js/settings.js index 1df790b..6c8f033 100644 --- a/js/settings.js +++ b/js/settings.js @@ -1,4 +1,4 @@ -async function uploadFile() { + function uploadFile() { let file = document.getElementById("avatarUpl").files[0]; console.log(file); let formdata = new FormData(); diff --git a/routes/api/all.js b/routes/api/all.js index 43bfa94..057e93d 100644 --- a/routes/api/all.js +++ b/routes/api/all.js @@ -6,7 +6,7 @@ const HASHES_DB = config.cookies.server_hashes; const HASHES_COOKIE = config.cookies.client_hashes; const HASHES_DIFF = HASHES_DB - HASHES_COOKIE; export const setup = function (router, con, server) { - router.use("/*", async function (req, res, next) { + router.use("/*", function (req, res, next) { res.set("Access-Control-Allow-Origin", "*"); //we'll allow it for now let unsigned; if (req.body.user == undefined || req.body.pass == undefined) { @@ -49,7 +49,7 @@ export const setup = function (router, con, server) { }); }); - router.use("/api/*", async function (req, res, next) { + router.use("/api/*", function (req, res, next) { res.set("Access-Control-Allow-Origin", "*"); //we'll allow it for now if (config["allow_getotheruser_without_cookie"] && req.originalUrl.split("\?")[0] == "/api/getotheruser") { next(); diff --git a/routes/api/dms/PersonalMessages.js b/routes/api/dms/PersonalMessages.js index e8113fb..324cb90 100644 --- a/routes/api/dms/PersonalMessages.js +++ b/routes/api/dms/PersonalMessages.js @@ -1,7 +1,7 @@ //const web_version = require("unsafe_encrypt").web_version import { web_version } from "unsafe_encrypt"; export const setup = function (router, con, server) { - router.get("/api/getPersonalPosts", async function (req, res) { + router.get("/api/getPersonalPosts", function (req, res) { res.set("Access-Control-Allow-Origin", ""); let otherperson = encodeURIComponent(req.query.otherperson || ""); if (typeof otherperson != "string" || otherperson.length > 100 || otherperson == "") { @@ -21,7 +21,7 @@ export const setup = function (router, con, server) { res.json(result); }); }); - router.get("/api/dms/conversations", async function (req, res) { + router.get("/api/dms/conversations", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); const columns = [ "dms_user_name", "dms_receiver" @@ -34,12 +34,12 @@ export const setup = function (router, con, server) { res.json(result); }); }); - router.get("/api/dms/encrypt.js", async function (req, res) { + router.get("/api/dms/encrypt.js", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); res.send(web_version()); }); // - router.get("/api/dms/getDM", async function (req, res) { + router.get("/api/dms/getDM", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); let arg = req.query.id; let uriencusername = encodeURIComponent(res.locals.username); diff --git a/routes/api/dms/post.js b/routes/api/dms/post.js index 48666bc..dee6a8b 100644 --- a/routes/api/dms/post.js +++ b/routes/api/dms/post.js @@ -16,11 +16,11 @@ export const setup = function (router, con, server) { } - router.get("/api/dms/pid", async function (req, res) { + router.get("/api/dms/pid", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); res.json({ "pid": createPID() }); }); - router.post("/api/dms/post", async function (req, res) { + router.post("/api/dms/post", function (req, res) { if (!req.body.message) { res.json({ "error": "no message to post" }); return; diff --git a/routes/api/options.js b/routes/api/options.js index 3ac8b76..01a7cdc 100644 --- a/routes/api/options.js +++ b/routes/api/options.js @@ -1,5 +1,5 @@ function allowAllTraffic(router, str, type) { - router.options(str, async function (req, res, next) { + router.options(str, function (req, res, next) { res.set("Access-Control-Allow-Origin", "*"); //we'll allow it for now res.set("Access-Control-Allow-Methods", type || "GET"); res.set("Access-Control-Allow-Headers", "Content-Type"); diff --git a/routes/api/post.js b/routes/api/post.js index 0f19ef0..84bef34 100644 --- a/routes/api/post.js +++ b/routes/api/post.js @@ -14,11 +14,11 @@ export const setup = function (router, con, server) { return pid } - router.get("/api/pid", async function (req, res) { + router.get("/api/pid", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); res.json({ "pid": createPID() }); }); - router.post("/api/post", async function (req, res) { + router.post("/api/post", function (req, res) { if (!req.body.message) { res.json({ "error": "no message to post" }); return; @@ -89,7 +89,7 @@ export const setup = function (router, con, server) { data: post_obj }; let messagestr = JSON.stringify(message); - server.wss.clients.forEach(async function (ws) { + server.wss.clients.forEach( function (ws) { ws.send(messagestr); }); res.json({ "success": "successfully posted message" }); diff --git a/server.js b/server.js index b4b9df5..dc560c0 100644 --- a/server.js +++ b/server.js @@ -472,7 +472,7 @@ router.get("/api/getFileIcon/*",async function(req,res){ }) }) -router.get("/api/search", async function (req, res) { +router.get("/api/search", function (req, res) { res.set("Access-Control-Allow-Origin", ""); let type = req.query.type; let arg = encodeURIComponent(req.query.selector); @@ -551,10 +551,10 @@ router.post("/api/setavatar", function (req, res) { }) }); }); -router.get("/api/getuser", async function (req, res) { +router.get("/api/getuser", function (req, res) { res.json({ "username": res.locals.username, "bio": res.locals.bio, "avatar": res.locals.avatar }); }); -router.get("/api/getalluserinformation", async function (req, res) { +router.get("/api/getalluserinformation", function (req, res) { res.set("Access-Control-Allow-Origin", ""); //we don't want that here let unsigned = unsign.getunsigned(req, res); if (!unsigned) @@ -576,7 +576,7 @@ router.get("/api/getalluserinformation", async function (req, res) { } }); }); -router.get("/api/getotheruser", async function (req, res) { +router.get("/api/getotheruser", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); let username = req.query.user; let sql = `select User_Name,User_Bio,User_Avatar from ipost.users where User_Name=?;`; @@ -591,11 +591,11 @@ router.get("/api/getotheruser", async function (req, res) { } }); }); -router.get("/api/getPosts/*", async function (req, res) { +router.get("/api/getPosts/*", function (req, res) { res.set("Access-Control-Allow-Origin", ""); res.redirect("/api/getPosts"); }); -router.get("/api/getPosts", async function (req, res) { +router.get("/api/getPosts", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); if (req.query.channel != undefined) { let sql = `select post_user_name,post_text,post_time,post_special_text,post_id,post_from_bot,post_reply_id,User_Avatar from ipost.posts inner join ipost.users on (User_Name = post_user_name) where post_receiver_name = ? group by post_id order by post_id desc limit 30;`; @@ -614,7 +614,7 @@ router.get("/api/getPosts", async function (req, res) { }); } }); -router.get("/api/getPostsLowerThan", async function (req, res) { +router.get("/api/getPostsLowerThan", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); if (req.query.channel != undefined) { let sql = `select post_user_name,post_text,post_time,post_special_text,post_id,post_from_bot,post_reply_id from ipost.posts where ((post_receiver_name = ?) and (post_id < ?)) group by post_id order by post_id desc limit 30;`; @@ -633,7 +633,7 @@ router.get("/api/getPostsLowerThan", async function (req, res) { }); } }); -router.get("/api/getPost", async function (req, res) { +router.get("/api/getPost", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); let arg = req.query.id; let sql = `select post_user_name,post_text,post_time,post_special_text,post_id,post_from_bot,post_reply_id,post_receiver_name,User_Avatar from ipost.posts inner join ipost.users on (User_Name = post_user_name) where post_id=?;`; @@ -649,7 +649,7 @@ router.get("/api/getPost", async function (req, res) { } }); }); -router.get("/api/getChannels", async function (req, res) { +router.get("/api/getChannels", function (req, res) { res.set("Access-Control-Allow-Origin", "*"); let sql = `select post_receiver_name from ipost.posts where post_is_private = '0' group by post_receiver_name;`; con.query(sql, [], function (err, result) { @@ -658,7 +658,7 @@ router.get("/api/getChannels", async function (req, res) { res.json(result); }); }); -router.post("/api/setBio", async function (req, res) { +router.post("/api/setBio", function (req, res) { res.set("Access-Control-Allow-Origin", ""); let bio = req.body.Bio; if (!bio) { @@ -679,7 +679,7 @@ router.post("/api/setBio", async function (req, res) { res.json({ "success": "updated bio" }); }); }); -router.post("/api/changePW", async function (req, res) { +router.post("/api/changePW", function (req, res) { res.set("Access-Control-Allow-Origin", ""); if ((typeof req.body.newPW) != "string") { res.json({ "error": "incorrect password" }); @@ -724,7 +724,7 @@ router.post("/api/changePW", async function (req, res) { res.json({ "error": "timeout" }); }, 3000); }); -router.post("/api/changeUsername", async function (req, res) { +router.post("/api/changeUsername", function (req, res) { res.set("Access-Control-Allow-Origin", ""); if ((typeof req.body.newUsername) != "string") { res.status(400); @@ -791,7 +791,7 @@ router.post("/api/changeUsername", async function (req, res) { END /API/* */ -router.get("/users/*", async function (req, res) { +router.get("/users/*", function (req, res) { if (!increaseUSERCall(req, res)) return; res.sendFile(dir + "views/otheruser.html"); @@ -847,7 +847,7 @@ router.get("/avatars/*", (request, response, next) => { } response.status(404).send("No avatar with that name found"); }); -router.get("/logout", async function (req, res) { +router.get("/logout", function (req, res) { res.cookie("AUTH_COOKIE", "", { maxAge: 0, httpOnly: true, secure: DID_I_FINALLY_ADD_HTTPS }); res.redirect("/"); }); @@ -910,7 +910,7 @@ let global_page_variables = { cookiebanner: `` } -async function handleUserFiles(request, response, overrideurl) { + function handleUserFiles(request, response, overrideurl) { if (!increaseUSERCall(request, response))return; if(typeof overrideurl != "string")overrideurl = undefined; @@ -1000,7 +1000,7 @@ router.get("/", function (req, res) { router.get("/*", handleUserFiles); -router.post("/register", async function (req, res) { +router.post("/register", function (req, res) { for (let i = 0; i < 10; i++) { //don't want people spam registering if (!increaseAPICall(req, res)) return; @@ -1071,7 +1071,7 @@ router.post("/register", async function (req, res) { }); }); }); -router.post("/login", async function (req, res) { +router.post("/login", function (req, res) { if (!increaseAPICall(req, res)) return; if (!increaseAPICall(req, res))