fix error + format
This commit is contained in:
@@ -1,71 +1,94 @@
|
||||
//const web_version = require("unsafe_encrypt").web_version
|
||||
import { web_version } from "unsafe_encrypt";
|
||||
import { web_version } from 'unsafe_encrypt'
|
||||
export const setup = function (router, con, server) {
|
||||
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 === "") {
|
||||
res.status(410).json({ "error": "invalid otherperson given" });
|
||||
return;
|
||||
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 === ''
|
||||
) {
|
||||
res.status(410).json({ error: 'invalid otherperson given' })
|
||||
return
|
||||
}
|
||||
const columns = [
|
||||
"dms_user_name", "dms_text", "dms_time", "dms_special_text", "dms_id", "dms_from_bot", "dms_reply_id"
|
||||
];
|
||||
'dms_user_name',
|
||||
'dms_text',
|
||||
'dms_time',
|
||||
'dms_special_text',
|
||||
'dms_id',
|
||||
'dms_from_bot',
|
||||
'dms_reply_id',
|
||||
]
|
||||
//dms_user_name = sender
|
||||
//dms_receiver = receiver
|
||||
//if (sender == current and receiver == other) or (receiver == current and sender == other)
|
||||
let sql = `select ${columns.join(",")} from ipost.dms where ((dms_receiver = ? and dms_user_name = ?) or (dms_receiver = ? and dms_user_name = ?)) order by dms_id desc limit 50;`;
|
||||
con.query(sql, [otherperson, encodeURIComponent(res.locals.username), encodeURIComponent(res.locals.username), otherperson], function (err, result) {
|
||||
if (err)
|
||||
throw err;
|
||||
res.json(result);
|
||||
});
|
||||
let sql = `select ${columns.join(',')} from ipost.dms where ((dms_receiver = ? and dms_user_name = ?) or (dms_receiver = ? and dms_user_name = ?)) order by dms_id desc limit 50;`
|
||||
con.query(
|
||||
sql,
|
||||
[
|
||||
otherperson,
|
||||
encodeURIComponent(res.locals.username),
|
||||
encodeURIComponent(res.locals.username),
|
||||
otherperson,
|
||||
],
|
||||
function (err, result) {
|
||||
if (err) throw err
|
||||
res.json(result)
|
||||
}
|
||||
)
|
||||
/* #swagger.security = [{
|
||||
"appTokenAuthHeader": []
|
||||
}] */
|
||||
});
|
||||
router.get("/api/dms/conversations", function (req, res) {
|
||||
res.set("Access-Control-Allow-Origin", "*");
|
||||
let uriencusername = encodeURIComponent(res.locals.username);
|
||||
let sql = `select dms_user_name, dms_receiver from ipost.dms where ((dms_receiver = ?) or (dms_user_name = ?)) group by dms_receiver,dms_user_name;`;
|
||||
con.query(sql, [uriencusername, uriencusername], function (err, result) {
|
||||
if (err)
|
||||
throw err;
|
||||
res.json(result);
|
||||
});
|
||||
})
|
||||
router.get('/api/dms/conversations', function (req, res) {
|
||||
res.set('Access-Control-Allow-Origin', '*')
|
||||
let uriencusername = encodeURIComponent(res.locals.username)
|
||||
let sql = `select dms_user_name, dms_receiver from ipost.dms where ((dms_receiver = ?) or (dms_user_name = ?)) group by dms_receiver,dms_user_name;`
|
||||
con.query(
|
||||
sql,
|
||||
[uriencusername, uriencusername],
|
||||
function (err, result) {
|
||||
if (err) throw err
|
||||
res.json(result)
|
||||
}
|
||||
)
|
||||
/* #swagger.security = [{
|
||||
"appTokenAuthHeader": []
|
||||
}] */
|
||||
});
|
||||
router.get("/api/dms/encrypt.js", function (req, res) {
|
||||
res.set("Access-Control-Allow-Origin", "*");
|
||||
res.send(web_version());
|
||||
})
|
||||
router.get('/api/dms/encrypt.js', function (req, res) {
|
||||
res.set('Access-Control-Allow-Origin', '*')
|
||||
res.send(web_version())
|
||||
/* #swagger.security = [{
|
||||
"appTokenAuthHeader": []
|
||||
}] */
|
||||
});
|
||||
})
|
||||
//
|
||||
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);
|
||||
let sql = `select dms_user_name,dms_text,dms_time,dms_special_text,dms_id,dms_from_bot,dms_reply_id,dms_receiver from ipost.dms where dms_id=? and (dms_user_name=? or dms_receiver=?);`;
|
||||
con.query(sql, [arg, uriencusername, uriencusername], function (err, result) {
|
||||
if (err)
|
||||
throw err;
|
||||
if (result[0]) {
|
||||
res.set('Cache-Control', 'public, max-age=2592000'); //cache it for one month-ish
|
||||
res.json(result[0]);
|
||||
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)
|
||||
let sql = `select dms_user_name,dms_text,dms_time,dms_special_text,dms_id,dms_from_bot,dms_reply_id,dms_receiver from ipost.dms where dms_id=? and (dms_user_name=? or dms_receiver=?);`
|
||||
con.query(
|
||||
sql,
|
||||
[arg, uriencusername, uriencusername],
|
||||
function (err, result) {
|
||||
if (err) throw err
|
||||
if (result[0]) {
|
||||
res.set('Cache-Control', 'public, max-age=2592000') //cache it for one month-ish
|
||||
res.json(result[0])
|
||||
} else {
|
||||
res.json({ error: 'there is no such dm!' })
|
||||
}
|
||||
}
|
||||
else {
|
||||
res.json({ "error": "there is no such dm!" });
|
||||
}
|
||||
});
|
||||
)
|
||||
/* #swagger.security = [{
|
||||
"appTokenAuthHeader": []
|
||||
}] */
|
||||
});
|
||||
};
|
||||
})
|
||||
}
|
||||
export default {
|
||||
setup
|
||||
};
|
||||
setup,
|
||||
}
|
||||
|
||||
+70
-58
@@ -1,104 +1,116 @@
|
||||
import xor from "../../../extra_modules/xor.js";
|
||||
import xor from '../../../extra_modules/xor.js'
|
||||
export const setup = function (router, con, server) {
|
||||
const PIDS = {}; //[pid]: true/"already_used"
|
||||
const PIDS = {} //[pid]: true/"already_used"
|
||||
|
||||
function createPID(){
|
||||
let pid = server.genstring(10); //collision chance is low enough, but we'll check anyways
|
||||
function createPID() {
|
||||
let pid = server.genstring(10) //collision chance is low enough, but we'll check anyways
|
||||
while (PIDS[pid] !== undefined) {
|
||||
pid = server.genstring(10);
|
||||
console.log(5, "pid collision");
|
||||
pid = server.genstring(10)
|
||||
console.log(5, 'pid collision')
|
||||
}
|
||||
PIDS[pid] = true;
|
||||
setTimeout(function() {
|
||||
PIDS[pid] = undefined;
|
||||
}, 40000);
|
||||
PIDS[pid] = true
|
||||
setTimeout(function () {
|
||||
PIDS[pid] = undefined
|
||||
}, 40000)
|
||||
return pid
|
||||
}
|
||||
|
||||
|
||||
router.get("/api/dms/pid", function (req, res) {
|
||||
res.set("Access-Control-Allow-Origin", "*");
|
||||
res.json({ "pid": createPID() });
|
||||
router.get('/api/dms/pid', function (req, res) {
|
||||
res.set('Access-Control-Allow-Origin', '*')
|
||||
res.json({ pid: createPID() })
|
||||
/* #swagger.security = [{
|
||||
"appTokenAuthHeader": []
|
||||
}] */
|
||||
});
|
||||
router.post("/api/dms/post", function (req, res) {
|
||||
})
|
||||
router.post('/api/dms/post', function (req, res) {
|
||||
if (!req.body.message) {
|
||||
res.status(410)
|
||||
res.json({ "error": "no message to post" });
|
||||
return;
|
||||
res.json({ error: 'no message to post' })
|
||||
return
|
||||
}
|
||||
if ((typeof req.body.message) !== "string") {
|
||||
if (typeof req.body.message !== 'string') {
|
||||
res.status(411)
|
||||
res.json({ "error": "no message to post" });
|
||||
return;
|
||||
res.json({ error: 'no message to post' })
|
||||
return
|
||||
}
|
||||
if ((typeof req.body.pid) !== "string") {
|
||||
if (typeof req.body.pid !== 'string') {
|
||||
res.status(412)
|
||||
res.json({ "error": "no pid given" });
|
||||
return;
|
||||
res.json({ error: 'no pid given' })
|
||||
return
|
||||
}
|
||||
if (req.body.pid.length !== 10 || PIDS[req.body.pid] !== true) {
|
||||
res.status(413)
|
||||
res.json({ "error": "invalid pid given" });
|
||||
return;
|
||||
res.json({ error: 'invalid pid given' })
|
||||
return
|
||||
}
|
||||
PIDS[req.body.pid] = "already_used";
|
||||
let reply_id;
|
||||
PIDS[req.body.pid] = 'already_used'
|
||||
let reply_id
|
||||
if (!req.body.reply_id || req.body.reply_id < 0) {
|
||||
reply_id = 0;
|
||||
reply_id = 0
|
||||
} else {
|
||||
reply_id = req.body.reply_id
|
||||
}
|
||||
else {
|
||||
reply_id = req.body.reply_id;
|
||||
}
|
||||
if ((typeof reply_id) !== "number") {
|
||||
if (typeof reply_id !== 'number') {
|
||||
res.status(414)
|
||||
res.json({ "error": "no valid reply id given" });
|
||||
return;
|
||||
res.json({ error: 'no valid reply id given' })
|
||||
return
|
||||
}
|
||||
if (req.body.message.length > 1000) {
|
||||
res.status(415)
|
||||
res.json({ "error": "message too long" });
|
||||
return;
|
||||
res.json({ error: 'message too long' })
|
||||
return
|
||||
}
|
||||
req.body.message = encodeURIComponent(req.body.message.trim());
|
||||
req.body.message = encodeURIComponent(req.body.message.trim())
|
||||
if (req.body.message.length > 3000) {
|
||||
res.status(416)
|
||||
res.json({ "error": "message too long" }); //check again after URI encoding it
|
||||
return;
|
||||
res.json({ error: 'message too long' }) //check again after URI encoding it
|
||||
return
|
||||
}
|
||||
req.body.receiver = encodeURIComponent(req.body.receiver || "");
|
||||
if (req.body.receiver === "" || req.body.receiver === encodeURIComponent(res.locals.username) || req.body.receiver.length > 100) {
|
||||
res.status(417).json({ "error": "invalid receiver given" });
|
||||
return;
|
||||
req.body.receiver = encodeURIComponent(req.body.receiver || '')
|
||||
if (
|
||||
req.body.receiver === '' ||
|
||||
req.body.receiver === encodeURIComponent(res.locals.username) ||
|
||||
req.body.receiver.length > 100
|
||||
) {
|
||||
res.status(417).json({ error: 'invalid receiver given' })
|
||||
return
|
||||
}
|
||||
let otherperson = req.body.receiver;
|
||||
let otherperson = req.body.receiver
|
||||
if (!req.body.message) {
|
||||
res.status(418)
|
||||
res.json({ "error": "no message to post" });
|
||||
return;
|
||||
res.json({ error: 'no message to post' })
|
||||
return
|
||||
}
|
||||
let sql = `insert into ipost.dms (dms_user_name,dms_text,dms_time,dms_receiver,dms_from_bot,dms_reply_id) values (?,?,?,?,?,?);`;
|
||||
let values = [encodeURIComponent(res.locals.username), req.body.message, Date.now(), otherperson, res.locals.isbot, reply_id];
|
||||
let sql = `insert into ipost.dms (dms_user_name,dms_text,dms_time,dms_receiver,dms_from_bot,dms_reply_id) values (?,?,?,?,?,?);`
|
||||
let values = [
|
||||
encodeURIComponent(res.locals.username),
|
||||
req.body.message,
|
||||
Date.now(),
|
||||
otherperson,
|
||||
res.locals.isbot,
|
||||
reply_id,
|
||||
]
|
||||
con.query(sql, values, function (err, result) {
|
||||
if (err) {
|
||||
res.status(500)
|
||||
res.json({"error":"there's been an internal error"})
|
||||
res.json({ error: "there's been an internal error" })
|
||||
console.error(err)
|
||||
return;
|
||||
return
|
||||
}
|
||||
res.json({ "success": "successfully posted dm" });
|
||||
console.log(5, `posted new dm by ${res.locals.username} to ${otherperson} : ${xor(encodeURIComponent(res.locals.username), otherperson)}`);
|
||||
});
|
||||
res.json({ success: 'successfully posted dm' })
|
||||
console.log(
|
||||
5,
|
||||
`posted new dm by ${res.locals.username} to ${otherperson} : ${xor(encodeURIComponent(res.locals.username), otherperson)}`
|
||||
)
|
||||
})
|
||||
//TODO: bring dms up-to-date with normal posts
|
||||
|
||||
/* #swagger.security = [{
|
||||
"appTokenAuthHeader": []
|
||||
}] */
|
||||
});
|
||||
})
|
||||
return createPID
|
||||
};
|
||||
}
|
||||
export default {
|
||||
setup
|
||||
};
|
||||
setup,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user