From ecacb7568d27ab5a0c4a36bbae7e40907d2f390e Mon Sep 17 00:00:00 2001 From: Mystikfluu Date: Thu, 11 Aug 2022 00:06:52 +0200 Subject: [PATCH] conversations now returns all conversations doesn't just check if you had a conversation with a certain person --- routes/api/dms/PersonalMessages.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/routes/api/dms/PersonalMessages.js b/routes/api/dms/PersonalMessages.js index 3c19beb..5bc13a5 100644 --- a/routes/api/dms/PersonalMessages.js +++ b/routes/api/dms/PersonalMessages.js @@ -28,19 +28,12 @@ module.exports = { router.get("/api/dms/conversations", async function(req,res) { res.set("Access-Control-Allow-Origin","*") - let otherperson = encodeURIComponent(req.query.otherperson||"") - - if(typeof otherperson != "string" || otherperson.length > 100 || otherperson=="") { - res.status(400).json({"error": "invalid otherperson given"}) - return - } - const columns = [ "dms_user_name","dms_receiver" ] - let sql = `select ${columns.join(",")} from ipost.dms where ((dms_receiver = ? and dms_user_name = ?) or (dms_receiver = ? and dms_user_name = ?)) group by dms_receiver,dms_user_name;` - con.query(sql, [otherperson,encodeURIComponent(res.locals.username),encodeURIComponent(res.locals.username),otherperson], function (err, result) { + let sql = `select ${columns.join(",")} from ipost.dms where ((dms_receiver = ?) or (dms_user_name = ?)) group by dms_receiver,dms_user_name;` + con.query(sql, [encodeURIComponent(res.locals.username),encodeURIComponent(res.locals.username)], function (err, result) { if (err) throw err; res.json(result) });