Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-14 07:27:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

add option to get ban status from user info

Browse Source
This commit is contained in:
Ajay Ramachandran
2021-08-05 20:11:05 -04:00
parent 326f9e6e93
commit 71c01c0f3b
3 changed files with 46 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/routes/getUserInfo.ts
View File

@@ -98,6 +98,15 @@ async function dbGetActiveWarningReasonForUser(userID: HashedUserID): Promise<st
}
}
async function dbGetBanned(userID: HashedUserID): Promise<boolean> {
try {
const row = await db.prepare("get", `SELECT count(*) as "userCount" FROM "shadowBannedUsers" WHERE "userID" = ? LIMIT 1`, [userID]);
return row?.userCount > 0 ?? false;
} catch (err) {
return false;
}
}
type cases = Record<string, any>
const executeIfFunction = (f: any) =>
@@ -118,6 +127,7 @@ const dbGetValue = async (userID: HashedUserID, property: string): Promise<strin
ignoredViewCount: dbGetIgnoredViewsForUser(userID),
warnings: dbGetWarningsForUser(userID),
warningReason: dbGetActiveWarningReasonForUser(userID),
banned: dbGetBanned(userID),
reputation: getReputation(userID),
vip: isUserVIP(userID),
lastSegmentID: dbGetLastSegmentForUser(userID),
@@ -127,16 +137,17 @@ const dbGetValue = async (userID: HashedUserID, property: string): Promise<strin
export async function getUserInfo(req: Request, res: Response): Promise<Response> {
const userID = req.query.userID as UserID;
const hashedUserID: HashedUserID = userID ? getHash(userID) : req.query.publicUserID as HashedUserID;
const allProperties: string[] = ["userID", "userName", "minutesSaved", "segmentCount", "ignoredSegmentCount",
const defaultProperties: string[] = ["userID", "userName", "minutesSaved", "segmentCount", "ignoredSegmentCount",
"viewCount", "ignoredViewCount", "warnings", "warningReason", "reputation",
"vip", "lastSegmentID"];
const allProperties: string[] = [...defaultProperties, "banned"];
let paramValues: string[] = req.query.values
? JSON.parse(req.query.values as string)
: req.query.value
? Array.isArray(req.query.value)
? req.query.value
: [req.query.value]
: allProperties;
: defaultProperties;
if (!Array.isArray(paramValues)) {
return res.status(400).send("Invalid values JSON");
}

2
src/routes/postSkipSegments.ts
View File

@@ -616,7 +616,7 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
// }
//check to see if this user is shadowbanned
const shadowBanRow = await db.prepare("get", `SELECT count(*) as "userCount" FROM "shadowBannedUsers" WHERE "userID" = ?`, [userID]);
const shadowBanRow = await db.prepare("get", `SELECT count(*) as "userCount" FROM "shadowBannedUsers" WHERE "userID" = ? LIMIT 1`, [userID]);
let shadowBanned = shadowBanRow.userCount;

33
test/cases/getUserInfo.ts
View File

@@ -26,6 +26,9 @@ describe("getUserInfo", () => {
await db.prepare("run", insertWarningQuery, [getHash("getuserinfo_warning_2"), 40, "getuserinfo_vip", 0, "warning2-0"]);
await db.prepare("run", insertWarningQuery, [getHash("getuserinfo_warning_3"), 50, "getuserinfo_vip", 1, "warning3-0"]);
await db.prepare("run", insertWarningQuery, [getHash("getuserinfo_warning_3"), 60, "getuserinfo_vip", 0, "warning3-1"]);
const insertBanQuery = 'INSERT INTO "shadowBannedUsers" ("userID") VALUES (?)';
await db.prepare("run", insertBanQuery, [getHash("getuserinfo_ban_01")]);
});
it("Should be able to get a 200", (done: Done) => {
@@ -172,7 +175,7 @@ describe("getUserInfo", () => {
assert.strictEqual(res.status, 200);
const data = await res.json();
const expected = {
warningReason: "warning0-0"
warningReason: "warning0-0",
};
assert.ok(partialDeepEquals(data, expected));
done(); // pass
@@ -232,4 +235,32 @@ describe("getUserInfo", () => {
})
.catch(err => done(err));
});
it("Should get ban data for banned user (only appears when specifically requested)", (done: Done) => {
fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_ban_01&value=banned`)
.then(async res => {
assert.strictEqual(res.status, 200);
const data = await res.json();
const expected = {
banned: true
};
assert.ok(partialDeepEquals(data, expected));
done(); // pass
})
.catch(err => done(err));
});
it("Should get ban data for unbanned user (only appears when specifically requested)", (done: Done) => {
fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_notban_01&value=banned`)
.then(async res => {
assert.strictEqual(res.status, 200);
const data = await res.json();
const expected = {
banned: false
};
assert.ok(partialDeepEquals(data, expected));
done(); // pass
})
.catch(err => done(err));
});
});