From 607b7cbb0a7bf64899743049e255f69e4b635212 Mon Sep 17 00:00:00 2001 From: Michael C Date: Tue, 15 Jun 2021 15:50:41 -0400 Subject: [PATCH] add ignored counts --- src/routes/getUserInfo.ts | 21 ++++++++++++++++++++- test/cases/getUserInfo.ts | 4 ++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index 8ea8dda..4ade24e 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -27,6 +27,15 @@ async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ min } } +async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise<{ ignoredSegmentCount: number }> { + try { + let row = await db.prepare("get", `SELECT COUNT(*) as "ignoredSegmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID]); + return row?.ignoredSegmentCount ?? 0 + } catch (err) { + return null; + } +} + async function dbGetUsername(userID: HashedUserID) { try { let row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]); @@ -50,6 +59,15 @@ async function dbGetViewsForUser(userID: HashedUserID) { } } +async function dbGetIgnoredViewsForUser(userID: HashedUserID) { + try { + let row = await db.prepare('get', `SELECT SUM("views") as "ignoredViewCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID]); + return row?.ignoredViewCount ?? 0; + } catch (err) { + return false; + } +} + async function dbGetWarningsForUser(userID: HashedUserID): Promise { try { let row = await db.prepare('get', `SELECT COUNT(*) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]); @@ -70,7 +88,6 @@ export async function getUserInfo(req: Request, res: Response) { return; } - const segmentsSummary = await dbGetSubmittedSegmentSummary(hashedUserID); if (segmentsSummary) { res.send({ @@ -78,7 +95,9 @@ export async function getUserInfo(req: Request, res: Response) { userName: await dbGetUsername(hashedUserID), minutesSaved: segmentsSummary.minutesSaved, segmentCount: segmentsSummary.segmentCount, + ignoredSegmentCount: await dbGetIgnoredSegmentCount(hashedUserID), viewCount: await dbGetViewsForUser(hashedUserID), + ignoredViewCount: await dbGetIgnoredViewsForUser(hashedUserID), warnings: await dbGetWarningsForUser(hashedUserID), reputation: await getReputation(hashedUserID), vip: await isUserVIP(hashedUserID), diff --git a/test/cases/getUserInfo.ts b/test/cases/getUserInfo.ts index c809a49..f810d7a 100644 --- a/test/cases/getUserInfo.ts +++ b/test/cases/getUserInfo.ts @@ -54,8 +54,12 @@ describe('getUserInfo', () => { done('Returned incorrect minutesSaved "' + data.minutesSaved + '"'); } else if (data.viewCount !== 30) { done('Returned incorrect viewCount "' + data.viewCount + '"'); + } else if (data.ignoredViewCount !== 20) { + done('Returned incorrect ignoredViewCount "' + data.ignoredViewCount + '"'); } else if (data.segmentCount !== 3) { done('Returned incorrect segmentCount "' + data.segmentCount + '"'); + } else if (data.ignoredSegmentCount !== 2) { + done('Returned incorrect ignoredSegmentCount "' + data.ignoredSegmentCount + '"'); } else if (Math.abs(data.reputation - -0.928) > 0.001) { done('Returned incorrect reputation "' + data.reputation + '"'); } else {