From 389885893c6d1f1493f738831e76cb63057d3e0d Mon Sep 17 00:00:00 2001 From: Nanobyte Date: Thu, 15 Apr 2021 01:22:01 +0200 Subject: [PATCH 1/5] Only get enabled warnings --- src/routes/getUserInfo.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index ca1066c..eb96c48 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -52,8 +52,8 @@ async function dbGetViewsForUser(userID: string) { async function dbGetWarningsForUser(userID: string): Promise { try { - let rows = await db.prepare('all', `SELECT * FROM "warnings" WHERE "userID" = ?`, [userID]); - return rows.length; + let row = await db.prepare('get', `SELECT COUNT(1) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]); + return row?.total ?? 0; } catch (err) { Logger.error('Couldn\'t get warnings for user ' + userID + '. returning 0'); return 0; From 9b0ba9031ea819cf83ee0f39860dfccc83f0b0b0 Mon Sep 17 00:00:00 2001 From: Nanobyte Date: Thu, 15 Apr 2021 01:22:25 +0200 Subject: [PATCH 2/5] Optimize code --- src/routes/getUserInfo.ts | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index eb96c48..9960ece 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -5,7 +5,7 @@ import {Logger} from '../utils/logger' async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSaved: number, segmentCount: number }> { try { - let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved", count(*) as "segmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]); + let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved", count(1) as "segmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]); if (row.minutesSaved != null) { return { minutesSaved: row.minutesSaved, @@ -39,12 +39,7 @@ async function dbGetUsername(userID: string) { async function dbGetViewsForUser(userID: string) { try { let row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]); - //increase the view count by one - if (row.viewCount != null) { - return row.viewCount; - } else { - return 0; - } + return row?.viewCount ?? 0; } catch (err) { return false; } From 112b232f9ea1f61f564bfb0a2df9a738ee0e8d6a Mon Sep 17 00:00:00 2001 From: Nanobyte Date: Thu, 15 Apr 2021 23:03:50 +0200 Subject: [PATCH 3/5] Fix UserID types --- src/routes/getUserInfo.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index 9960ece..15f7e29 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -1,9 +1,10 @@ import {db} from '../databases/databases'; import {getHash} from '../utils/getHash'; import {Request, Response} from 'express'; -import {Logger} from '../utils/logger' +import {Logger} from '../utils/logger'; +import { HashedUserID, UserID } from '../types/user.model'; -async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSaved: number, segmentCount: number }> { +async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> { try { let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved", count(1) as "segmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]); if (row.minutesSaved != null) { @@ -22,7 +23,7 @@ async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSa } } -async function dbGetUsername(userID: string) { +async function dbGetUsername(userID: HashedUserID) { try { let row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]); if (row !== undefined) { @@ -36,7 +37,7 @@ async function dbGetUsername(userID: string) { } } -async function dbGetViewsForUser(userID: string) { +async function dbGetViewsForUser(userID: HashedUserID) { try { let row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]); return row?.viewCount ?? 0; @@ -45,7 +46,7 @@ async function dbGetViewsForUser(userID: string) { } } -async function dbGetWarningsForUser(userID: string): Promise { +async function dbGetWarningsForUser(userID: HashedUserID): Promise { try { let row = await db.prepare('get', `SELECT COUNT(1) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]); return row?.total ?? 0; @@ -56,7 +57,7 @@ async function dbGetWarningsForUser(userID: string): Promise { } export async function getUserInfo(req: Request, res: Response) { - let userID = req.query.userID as string; + let userID = req.query.userID as UserID; if (userID == undefined) { //invalid request From cb4ecea830a582dbb1b326a8a1587cbacaf9e4c2 Mon Sep 17 00:00:00 2001 From: Nanobyte Date: Thu, 15 Apr 2021 23:05:18 +0200 Subject: [PATCH 4/5] Add vip info to getUserInfo --- src/routes/getUserInfo.ts | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index 15f7e29..5f0c905 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -1,5 +1,6 @@ import {db} from '../databases/databases'; import {getHash} from '../utils/getHash'; +import {isUserVIP} from '../utils/isUserVIP'; import {Request, Response} from 'express'; import {Logger} from '../utils/logger'; import { HashedUserID, UserID } from '../types/user.model'; @@ -66,17 +67,18 @@ export async function getUserInfo(req: Request, res: Response) { } //hash the userID - userID = getHash(userID); + const hashedUserID: HashedUserID = getHash(userID); - const segmentsSummary = await dbGetSubmittedSegmentSummary(userID); + const segmentsSummary = await dbGetSubmittedSegmentSummary(hashedUserID); if (segmentsSummary) { res.send({ - userID, - userName: await dbGetUsername(userID), + userID: hashedUserID, + userName: await dbGetUsername(hashedUserID), minutesSaved: segmentsSummary.minutesSaved, segmentCount: segmentsSummary.segmentCount, - viewCount: await dbGetViewsForUser(userID), - warnings: await dbGetWarningsForUser(userID), + viewCount: await dbGetViewsForUser(hashedUserID), + warnings: await dbGetWarningsForUser(hashedUserID), + vip: await isUserVIP(hashedUserID), }); } else { res.status(400).send(); From a3db0a005aab5f2a013331e962b9f3ef389475c5 Mon Sep 17 00:00:00 2001 From: Ajay Ramachandran Date: Sun, 18 Apr 2021 15:53:19 -0400 Subject: [PATCH 5/5] Formatting plus count(*) https://www.citusdata.com/blog/2016/10/12/count-performance/ --- src/routes/getUserInfo.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/routes/getUserInfo.ts b/src/routes/getUserInfo.ts index 5f0c905..636d2ad 100644 --- a/src/routes/getUserInfo.ts +++ b/src/routes/getUserInfo.ts @@ -7,7 +7,9 @@ import { HashedUserID, UserID } from '../types/user.model'; async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> { try { - let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved", count(1) as "segmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]); + let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved", + count(*) as "segmentCount" FROM "sponsorTimes" + WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]); if (row.minutesSaved != null) { return { minutesSaved: row.minutesSaved, @@ -49,7 +51,7 @@ async function dbGetViewsForUser(userID: HashedUserID) { async function dbGetWarningsForUser(userID: HashedUserID): Promise { try { - let row = await db.prepare('get', `SELECT COUNT(1) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]); + let row = await db.prepare('get', `SELECT COUNT(*) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]); return row?.total ?? 0; } catch (err) { Logger.error('Couldn\'t get warnings for user ' + userID + '. returning 0');