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

Switch to postgres + promises

Browse Source
This commit is contained in:
Ajay Ramachandran
2021-03-01 20:40:31 -05:00
parent 9a9038d5e0
commit ff4af3786e
37 changed files with 424 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/routes/getUserInfo.ts
View File

@@ -3,9 +3,9 @@ import {getHash} from '../utils/getHash';
import {Request, Response} from 'express';
import {Logger} from '../utils/logger'
function dbGetSubmittedSegmentSummary(userID: string): any {
async function dbGetSubmittedSegmentSummary(userID: string): Promise<{ minutesSaved: number, segmentCount: number }> {
try {
let row = 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(*) as segmentCount FROM sponsorTimes WHERE userID = ? AND votes > -2 AND shadowHidden != 1", [userID]);
if (row.minutesSaved != null) {
return {
minutesSaved: row.minutesSaved,
@@ -18,13 +18,13 @@ function dbGetSubmittedSegmentSummary(userID: string): any {
};
}
} catch (err) {
return false;
return null;
}
}
function dbGetUsername(userID: string) {
async function dbGetUsername(userID: string) {
try {
let row = db.prepare('get', "SELECT userName FROM userNames WHERE userID = ?", [userID]);
let row = await db.prepare('get', "SELECT userName FROM userNames WHERE userID = ?", [userID]);
if (row !== undefined) {
return row.userName;
} else {
@@ -36,9 +36,9 @@ function dbGetUsername(userID: string) {
}
}
function dbGetViewsForUser(userID: string) {
async function dbGetViewsForUser(userID: string) {
try {
let row = db.prepare('get', "SELECT SUM(views) as viewCount FROM sponsorTimes WHERE userID = ? AND votes > -2 AND shadowHidden != 1", [userID]);
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;
@@ -50,9 +50,9 @@ function dbGetViewsForUser(userID: string) {
}
}
function dbGetWarningsForUser(userID: string): number {
async function dbGetWarningsForUser(userID: string): Promise<number> {
try {
let rows = db.prepare('all', "SELECT * FROM warnings WHERE userID = ?", [userID]);
let rows = await db.prepare('all', "SELECT * FROM warnings WHERE userID = ?", [userID]);
return rows.length;
} catch (err) {
Logger.error('Couldn\'t get warnings for user ' + userID + '. returning 0');
@@ -60,7 +60,7 @@ function dbGetWarningsForUser(userID: string): number {
}
}
export function getUserInfo(req: Request, res: Response) {
export async function getUserInfo(req: Request, res: Response) {
let userID = req.query.userID as string;
if (userID == undefined) {
@@ -72,13 +72,17 @@ export function getUserInfo(req: Request, res: Response) {
//hash the userID
userID = getHash(userID);
const segmentsSummary = dbGetSubmittedSegmentSummary(userID);
res.send({
userID,
userName: dbGetUsername(userID),
minutesSaved: segmentsSummary.minutesSaved,
segmentCount: segmentsSummary.segmentCount,
viewCount: dbGetViewsForUser(userID),
warnings: dbGetWarningsForUser(userID),
});
const segmentsSummary = await dbGetSubmittedSegmentSummary(userID);
if (segmentsSummary) {
res.send({
userID,
userName: await dbGetUsername(userID),
minutesSaved: segmentsSummary.minutesSaved,
segmentCount: segmentsSummary.segmentCount,
viewCount: await dbGetViewsForUser(userID),
warnings: await dbGetWarningsForUser(userID),
});
} else {
res.status(400).send();
}
}