mirror of
https://github.com/ajayyy/SponsorBlockServer.git
synced 2025-12-14 23:47:00 +03:00
Hostfix basic ip ban
This commit is contained in:
@@ -8,6 +8,7 @@ var getHash = require('../utils/getHash.js');
|
|||||||
|
|
||||||
module.exports = async function shadowBanUser(req, res) {
|
module.exports = async function shadowBanUser(req, res) {
|
||||||
let userID = req.query.userID;
|
let userID = req.query.userID;
|
||||||
|
let hashedIP = req.query.hashedIP;
|
||||||
let adminUserIDInput = req.query.adminUserID;
|
let adminUserIDInput = req.query.adminUserID;
|
||||||
|
|
||||||
let enabled = req.query.enabled;
|
let enabled = req.query.enabled;
|
||||||
@@ -20,7 +21,7 @@ module.exports = async function shadowBanUser(req, res) {
|
|||||||
//if enabled is false and the old submissions should be made visible again
|
//if enabled is false and the old submissions should be made visible again
|
||||||
let unHideOldSubmissions = req.query.unHideOldSubmissions !== "false";
|
let unHideOldSubmissions = req.query.unHideOldSubmissions !== "false";
|
||||||
|
|
||||||
if (adminUserIDInput == undefined || userID == undefined) {
|
if (adminUserIDInput == undefined || (userID == undefined && hashedIP == undefined)) {
|
||||||
//invalid request
|
//invalid request
|
||||||
res.sendStatus(400);
|
res.sendStatus(400);
|
||||||
return;
|
return;
|
||||||
@@ -35,27 +36,57 @@ module.exports = async function shadowBanUser(req, res) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//check to see if this user is already shadowbanned
|
if (userID) {
|
||||||
let row = privateDB.prepare('get', "SELECT count(*) as userCount FROM shadowBannedUsers WHERE userID = ?", [userID]);
|
//check to see if this user is already shadowbanned
|
||||||
|
let row = privateDB.prepare('get', "SELECT count(*) as userCount FROM shadowBannedUsers WHERE userID = ?", [userID]);
|
||||||
|
|
||||||
if (enabled && row.userCount == 0) {
|
if (enabled && row.userCount == 0) {
|
||||||
//add them to the shadow ban list
|
//add them to the shadow ban list
|
||||||
|
|
||||||
//add it to the table
|
//add it to the table
|
||||||
privateDB.prepare('run', "INSERT INTO shadowBannedUsers VALUES(?)", [userID]);
|
privateDB.prepare('run', "INSERT INTO shadowBannedUsers VALUES(?)", [userID]);
|
||||||
|
|
||||||
//find all previous submissions and hide them
|
//find all previous submissions and hide them
|
||||||
if (unHideOldSubmissions) {
|
if (unHideOldSubmissions) {
|
||||||
db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 1 WHERE userID = ?", [userID]);
|
db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 1 WHERE userID = ?", [userID]);
|
||||||
}
|
}
|
||||||
} else if (!enabled && row.userCount > 0) {
|
} else if (!enabled && row.userCount > 0) {
|
||||||
//remove them from the shadow ban list
|
//remove them from the shadow ban list
|
||||||
privateDB.prepare('run', "DELETE FROM shadowBannedUsers WHERE userID = ?", [userID]);
|
privateDB.prepare('run', "DELETE FROM shadowBannedUsers WHERE userID = ?", [userID]);
|
||||||
|
|
||||||
//find all previous submissions and unhide them
|
//find all previous submissions and unhide them
|
||||||
if (unHideOldSubmissions) {
|
if (unHideOldSubmissions) {
|
||||||
db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 0 WHERE userID = ?", [userID]);
|
db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 0 WHERE userID = ?", [userID]);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
} else if (hashedIP) {
|
||||||
|
//check to see if this user is already shadowbanned
|
||||||
|
// let row = privateDB.prepare('get', "SELECT count(*) as userCount FROM shadowBannedIPs WHERE hashedIP = ?", [hashedIP]);
|
||||||
|
|
||||||
|
// if (enabled && row.userCount == 0) {
|
||||||
|
if (enabled) {
|
||||||
|
//add them to the shadow ban list
|
||||||
|
|
||||||
|
//add it to the table
|
||||||
|
// privateDB.prepare('run', "INSERT INTO shadowBannedIPs VALUES(?)", [hashedIP]);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//find all previous submissions and hide them
|
||||||
|
if (unHideOldSubmissions) {
|
||||||
|
db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 1 WHERE timeSubmitted IN " +
|
||||||
|
"(SELECT privateDB.timeSubmitted FROM sponsorTimes LEFT JOIN privateDB.sponsorTimes as privateDB ON sponsorTimes.timeSubmitted=privateDB.timeSubmitted " +
|
||||||
|
"WHERE privateDB.hashedIP = ?)", [hashedIP]);
|
||||||
|
}
|
||||||
|
} else if (!enabled && row.userCount > 0) {
|
||||||
|
// //remove them from the shadow ban list
|
||||||
|
// privateDB.prepare('run', "DELETE FROM shadowBannedUsers WHERE userID = ?", [userID]);
|
||||||
|
|
||||||
|
// //find all previous submissions and unhide them
|
||||||
|
// if (unHideOldSubmissions) {
|
||||||
|
// db.prepare('run', "UPDATE sponsorTimes SET shadowHidden = 0 WHERE userID = ?", [userID]);
|
||||||
|
// }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
res.sendStatus(200);
|
res.sendStatus(200);
|
||||||
|
|||||||
Reference in New Issue
Block a user