Merge branch 'master' of https://github.com/ajayyy/SponsorBlockServer

.eslintrc.js

@@ -25,5 +25,7 @@ module.exports = {
         "quotes": ["warn", "double", { "avoidEscape": true, "allowTemplateLiterals": true }],
         "no-multiple-empty-lines": ["error", { max: 2, maxEOF: 0 }],
         "indent": ["warn", 4, { "SwitchCase": 1 }],
+        "object-curly-spacing": ["warn", "always"],
+        "require-await": "warn",
     },
 };

package-lock.json

@@ -10,6 +10,7 @@
       "license": "MIT",
       "dependencies": {
         "@ajayyy/lru-diskcache": "^1.1.9",
+        "axios": "^0.21.4",
         "better-sqlite3": "^7.4.3",
         "cron": "^1.8.2",
         "express": "^4.17.1",
@@ -1117,6 +1118,14 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
+    "node_modules/axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "dependencies": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
     "node_modules/babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -2578,6 +2587,25 @@
       "integrity": "sha512-XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A==",
       "dev": true
     },
+    "node_modules/follow-redirects": {
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "engines": {
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/form-data": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",
@@ -6674,6 +6702,14 @@
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
       "dev": true
     },
+    "axios": {
+      "version": "0.21.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
+      "integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
+      "requires": {
+        "follow-redirects": "^1.14.0"
+      }
+    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
@@ -7801,6 +7837,11 @@
       "integrity": "sha512-XprP7lDrVT+kE2c2YlfiV+IfS9zxukiIOvNamPNsImNhXadSsQEbosItdL9bUQlCZXR13SvPk20BjWSWLA7m4A==",
       "dev": true
     },
+    "follow-redirects": {
+      "version": "1.14.4",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.4.tgz",
+      "integrity": "sha512-zwGkiSXC1MUJG/qmeIFH2HBJx9u0V46QGUe3YR1fXG8bXQxq7fLj0RjLZQ5nubr9qNJUZrH+xUcwXEoXNpfS+g=="
+    },
     "form-data": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz",

package.json

@@ -17,6 +17,7 @@
   "license": "MIT",
   "dependencies": {
     "@ajayyy/lru-diskcache": "^1.1.9",
+    "axios": "^0.21.4",
     "better-sqlite3": "^7.4.3",
     "cron": "^1.8.2",
     "express": "^4.17.1",

src/app.ts

@@ -1,44 +1,44 @@
-import express, {Request, RequestHandler, Response, Router} from "express";
-import {config} from "./config";
-import {oldSubmitSponsorTimes} from "./routes/oldSubmitSponsorTimes";
-import {oldGetVideoSponsorTimes} from "./routes/oldGetVideoSponsorTimes";
-import {postSegmentShift} from "./routes/postSegmentShift";
-import {postWarning} from "./routes/postWarning";
-import {getIsUserVIP} from "./routes/getIsUserVIP";
-import {deleteLockCategoriesEndpoint} from "./routes/deleteLockCategories";
-import {postLockCategories} from "./routes/postLockCategories";
-import {endpoint as getUserInfo} from "./routes/getUserInfo";
-import {getDaysSavedFormatted} from "./routes/getDaysSavedFormatted";
-import {getTotalStats} from "./routes/getTotalStats";
-import {getTopUsers} from "./routes/getTopUsers";
-import {getViewsForUser} from "./routes/getViewsForUser";
-import {getSavedTimeForUser} from "./routes/getSavedTimeForUser";
-import {addUserAsVIP} from "./routes/addUserAsVIP";
-import {shadowBanUser} from "./routes/shadowBanUser";
-import {getUsername} from "./routes/getUsername";
-import {setUsername} from "./routes/setUsername";
-import {viewedVideoSponsorTime} from "./routes/viewedVideoSponsorTime";
-import {voteOnSponsorTime, getUserID as voteGetUserID} from "./routes/voteOnSponsorTime";
-import {getSkipSegmentsByHash} from "./routes/getSkipSegmentsByHash";
-import {postSkipSegments} from "./routes/postSkipSegments";
-import {endpoint as getSkipSegments} from "./routes/getSkipSegments";
-import {userCounter} from "./middleware/userCounter";
-import {loggerMiddleware} from "./middleware/logger";
-import {corsMiddleware} from "./middleware/cors";
-import {apiCspMiddleware} from "./middleware/apiCsp";
-import {rateLimitMiddleware} from "./middleware/requestRateLimit";
-import dumpDatabase, {redirectLink} from "./routes/dumpDatabase";
-import {endpoint as getSegmentInfo} from "./routes/getSegmentInfo";
-import {postClearCache} from "./routes/postClearCache";
+import express, { Request, RequestHandler, Response, Router } from "express";
+import { config } from "./config";
+import { oldSubmitSponsorTimes } from "./routes/oldSubmitSponsorTimes";
+import { oldGetVideoSponsorTimes } from "./routes/oldGetVideoSponsorTimes";
+import { postSegmentShift } from "./routes/postSegmentShift";
+import { postWarning } from "./routes/postWarning";
+import { getIsUserVIP } from "./routes/getIsUserVIP";
+import { deleteLockCategoriesEndpoint } from "./routes/deleteLockCategories";
+import { postLockCategories } from "./routes/postLockCategories";
+import { endpoint as getUserInfo } from "./routes/getUserInfo";
+import { getDaysSavedFormatted } from "./routes/getDaysSavedFormatted";
+import { getTotalStats } from "./routes/getTotalStats";
+import { getTopUsers } from "./routes/getTopUsers";
+import { getViewsForUser } from "./routes/getViewsForUser";
+import { getSavedTimeForUser } from "./routes/getSavedTimeForUser";
+import { addUserAsVIP } from "./routes/addUserAsVIP";
+import { shadowBanUser } from "./routes/shadowBanUser";
+import { getUsername } from "./routes/getUsername";
+import { setUsername } from "./routes/setUsername";
+import { viewedVideoSponsorTime } from "./routes/viewedVideoSponsorTime";
+import { voteOnSponsorTime, getUserID as voteGetUserID } from "./routes/voteOnSponsorTime";
+import { getSkipSegmentsByHash } from "./routes/getSkipSegmentsByHash";
+import { postSkipSegments } from "./routes/postSkipSegments";
+import { endpoint as getSkipSegments } from "./routes/getSkipSegments";
+import { userCounter } from "./middleware/userCounter";
+import { loggerMiddleware } from "./middleware/logger";
+import { corsMiddleware } from "./middleware/cors";
+import { apiCspMiddleware } from "./middleware/apiCsp";
+import { rateLimitMiddleware } from "./middleware/requestRateLimit";
+import dumpDatabase, { redirectLink } from "./routes/dumpDatabase";
+import { endpoint as getSegmentInfo } from "./routes/getSegmentInfo";
+import { postClearCache } from "./routes/postClearCache";
 import { addUnlistedVideo } from "./routes/addUnlistedVideo";
-import {postPurgeAllSegments} from "./routes/postPurgeAllSegments";
-import {getUserID} from "./routes/getUserID";
-import {getLockCategories} from "./routes/getLockCategories";
-import {getLockCategoriesByHash} from "./routes/getLockCategoriesByHash";
-import {endpoint as getSearchSegments } from "./routes/getSearchSegments";
-import {getStatus } from "./routes/getStatus";
+import { postPurgeAllSegments } from "./routes/postPurgeAllSegments";
+import { getUserID } from "./routes/getUserID";
+import { getLockCategories } from "./routes/getLockCategories";
+import { getLockCategoriesByHash } from "./routes/getLockCategoriesByHash";
+import { endpoint as getSearchSegments } from "./routes/getSearchSegments";
+import { getStatus } from "./routes/getStatus";
 import { getLockReason } from "./routes/getLockReason";
-import {getUserStats} from "./routes/getUserStats";
+import { getUserStats } from "./routes/getUserStats";
 import ExpressPromiseRouter from "express-promise-router";
 import { Server } from "http";
 import { youtubeApiProxy } from "./routes/youtubeApiProxy";
@@ -188,7 +188,7 @@ function setupRoutes(router: Router) {
         router.get("/database/*", redirectLink);
     } else {
         router.get("/database.db", function (req: Request, res: Response) {
-            res.sendFile("./databases/sponsorTimes.db", {root: "./"});
+            res.sendFile("./databases/sponsorTimes.db", { root: "./" });
         });
     }
 }

src/config.ts

@@ -1,5 +1,5 @@
 import fs from "fs";
-import {SBSConfig} from "./types/config.model";
+import { SBSConfig } from "./types/config.model";
 import packageJson from "../package.json";
 
 const isTestMode = process.env.npm_lifecycle_script === packageJson.scripts.test;

src/databases/Mysql.ts

@@ -1,5 +1,5 @@
-import {Logger} from "../utils/logger";
-import {IDatabase, QueryType} from "./IDatabase";
+import { Logger } from "../utils/logger";
+import { IDatabase, QueryType } from "./IDatabase";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import MysqlInterface from "sync-mysql";
@@ -10,6 +10,7 @@ export class Mysql implements IDatabase {
     constructor(private config: unknown) {
     }
 
+    // eslint-disable-next-line require-await
     async init(): Promise<void> {
         this.connection = new MysqlInterface(this.config);
     }

src/databases/Postgres.ts

@@ -57,7 +57,7 @@ export class Postgres implements IDatabase {
 
         try {
             const client = await this.pool.connect();
-            const queryResult = await client.query({text: query, values: params});
+            const queryResult = await client.query({ text: query, values: params });
             client.release();
 
             switch (type) {

src/databases/Sqlite.ts

@@ -1,9 +1,9 @@
-import {IDatabase, QueryType} from "./IDatabase";
-import Sqlite3, {Database, Database as SQLiteDatabase} from "better-sqlite3";
+import { IDatabase, QueryType } from "./IDatabase";
+import Sqlite3, { Database, Database as SQLiteDatabase } from "better-sqlite3";
 import fs from "fs";
 import path from "path";
-import {getHash} from "../utils/getHash";
-import {Logger} from "../utils/logger";
+import { getHash } from "../utils/getHash";
+import { Logger } from "../utils/logger";
 
 export class Sqlite implements IDatabase {
     private db: SQLiteDatabase;
@@ -12,6 +12,7 @@ export class Sqlite implements IDatabase {
     {
     }
 
+    // eslint-disable-next-line require-await
     async prepare(type: QueryType, query: string, params: any[] = []): Promise<any[]> {
         // Logger.debug(`prepare (sqlite): type: ${type}, query: ${query}, params: ${params}`);
         const preparedQuery = this.db.prepare(query);
@@ -30,13 +31,14 @@ export class Sqlite implements IDatabase {
         }
     }
 
+    // eslint-disable-next-line require-await
     async init(): Promise<void> {
         // Make dirs if required
         if (!fs.existsSync(path.join(this.config.dbPath, "../"))) {
             fs.mkdirSync(path.join(this.config.dbPath, "../"));
         }
 
-        this.db = new Sqlite3(this.config.dbPath, {readonly: this.config.readOnly, fileMustExist: !this.config.createDbIfNotExists});
+        this.db = new Sqlite3(this.config.dbPath, { readonly: this.config.readOnly, fileMustExist: !this.config.createDbIfNotExists });
 
         if (this.config.createDbIfNotExists && !this.config.readOnly && fs.existsSync(this.config.dbSchemaFileName)) {
             this.db.exec(Sqlite.processUpgradeQuery(fs.readFileSync(this.config.dbSchemaFileName).toString()));

src/databases/databases.ts

@@ -1,8 +1,8 @@
-import {config} from "../config";
-import {Sqlite} from "./Sqlite";
-import {Mysql} from "./Mysql";
-import {Postgres} from "./Postgres";
-import {IDatabase} from "./IDatabase";
+import { config } from "../config";
+import { Sqlite } from "./Sqlite";
+import { Mysql } from "./Mysql";
+import { Postgres } from "./Postgres";
+import { IDatabase } from "./IDatabase";
 
 
 let db: IDatabase;

src/index.ts

@@ -1,8 +1,8 @@
-import {config} from "./config";
-import {initDb} from "./databases/databases";
-import {createServer} from "./app";
-import {Logger} from "./utils/logger";
-import {startAllCrons} from "./cronjob";
+import { config } from "./config";
+import { initDb } from "./databases/databases";
+import { createServer } from "./app";
+import { Logger } from "./utils/logger";
+import { startAllCrons } from "./cronjob";
 import { getCommit } from "./utils/getCommit";
 
 async function init() {

src/middleware/apiCsp.ts

@@ -1,4 +1,4 @@
-import {NextFunction, Request, Response} from "express";
+import { NextFunction, Request, Response } from "express";
 
 export function apiCspMiddleware(req: Request, res: Response, next: NextFunction): void {
     res.header("Content-Security-Policy", "script-src 'none'; object-src 'none'");

src/middleware/cors.ts

@@ -1,4 +1,4 @@
-import {NextFunction, Request, Response} from "express";
+import { NextFunction, Request, Response } from "express";
 
 export function corsMiddleware(req: Request, res: Response, next: NextFunction): void {
     res.header("Access-Control-Allow-Origin", "*");

src/middleware/logger.ts

@@ -1,5 +1,5 @@
-import {Logger} from "../utils/logger";
-import {NextFunction, Request, Response} from "express";
+import { Logger } from "../utils/logger";
+import { NextFunction, Request, Response } from "express";
 
 export function loggerMiddleware(req: Request, res: Response, next: NextFunction): void {
     Logger.info(`Request received: ${req.method} ${req.url}`);

src/middleware/requestRateLimit.ts

@@ -1,8 +1,8 @@
-import {getIP} from "../utils/getIP";
-import {getHash} from "../utils/getHash";
+import { getIP } from "../utils/getIP";
+import { getHash } from "../utils/getHash";
 import rateLimit from "express-rate-limit";
-import {RateLimitConfig} from "../types/config.model";
-import {Request} from "express";
+import { RateLimitConfig } from "../types/config.model";
+import { Request } from "express";
 import { isUserVIP } from "../utils/isUserVIP";
 import { UserID } from "../types/user.model";
 

src/middleware/userCounter.ts

@@ -1,12 +1,12 @@
-import fetch from "node-fetch";
-import {Logger} from "../utils/logger";
-import {config} from "../config";
-import {getIP} from "../utils/getIP";
-import {getHash} from "../utils/getHash";
-import {NextFunction, Request, Response} from "express";
+import axios from "axios";
+import { Logger } from "../utils/logger";
+import { config } from "../config";
+import { getIP } from "../utils/getIP";
+import { getHash } from "../utils/getHash";
+import { NextFunction, Request, Response } from "express";
 
 export function userCounter(req: Request, res: Response, next: NextFunction): void {
-    fetch(`${config.userCounterURL}/api/v1/addIP?hashedIP=${getHash(getIP(req), 1)}`, {method: "POST"})
+    axios.post(`${config.userCounterURL}/api/v1/addIP?hashedIP=${getHash(getIP(req), 1)}`)
         .catch(() => Logger.debug(`Failing to connect to user counter at: ${config.userCounterURL}`));
 
     next();

src/routes/addUnlistedVideo.ts

@@ -1,4 +1,4 @@
-import {Request, Response} from "express";
+import { Request, Response } from "express";
 import { db } from "../databases/databases";
 import { Logger } from "../utils/logger";
 

src/routes/addUserAsVIP.ts

@@ -1,7 +1,7 @@
-import {getHash} from "../utils/getHash";
-import {db} from "../databases/databases";
-import {config} from "../config";
-import {Request, Response} from "express";
+import { getHash } from "../utils/getHash";
+import { db } from "../databases/databases";
+import { config } from "../config";
+import { Request, Response } from "express";
 import { isUserVIP } from "../utils/isUserVIP";
 import { HashedUserID } from "../types/user.model";
 

src/routes/deleteLockCategories.ts

@@ -1,7 +1,7 @@
-import {Request, Response} from "express";
-import {isUserVIP} from "../utils/isUserVIP";
-import {getHash} from "../utils/getHash";
-import {db} from "../databases/databases";
+import { Request, Response } from "express";
+import { isUserVIP } from "../utils/isUserVIP";
+import { getHash } from "../utils/getHash";
+import { db } from "../databases/databases";
 import { Category, VideoID } from "../types/segments.model";
 import { UserID } from "../types/user.model";
 
@@ -35,7 +35,7 @@ export async function deleteLockCategoriesEndpoint(req: Request, res: Response):
 
     await deleteLockCategories(videoID, categories);
 
-    return res.status(200).json({message: `Removed lock categories entrys for video ${videoID}`});
+    return res.status(200).json({ message: `Removed lock categories entrys for video ${videoID}` });
 }
 
 /**

src/routes/dumpDatabase.ts

@@ -1,6 +1,6 @@
-import {db} from "../databases/databases";
-import {Logger} from "../utils/logger";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { Logger } from "../utils/logger";
+import { Request, Response } from "express";
 import { config } from "../config";
 import util from "util";
 import fs from "fs";

src/routes/getDaysSavedFormatted.ts

@@ -1,5 +1,5 @@
-import {db} from "../databases/databases";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { Request, Response } from "express";
 
 export async function getDaysSavedFormatted(req: Request, res: Response): Promise<Response> {
     const row = await db.prepare("get", 'SELECT SUM(("endTime" - "startTime") / 60 / 60 / 24 * "views") as "daysSaved" from "sponsorTimes" where "shadowHidden" != 1', []);

src/routes/getIsUserVIP.ts

@@ -1,7 +1,7 @@
-import {Logger} from "../utils/logger";
-import {getHash} from "../utils/getHash";
-import {isUserVIP} from "../utils/isUserVIP";
-import {Request, Response} from "express";
+import { Logger } from "../utils/logger";
+import { getHash } from "../utils/getHash";
+import { isUserVIP } from "../utils/isUserVIP";
+import { Request, Response } from "express";
 import { HashedUserID, UserID } from "../types/user.model";
 
 export async function getIsUserVIP(req: Request, res: Response): Promise<Response> {

src/routes/getLockCategories.ts

@@ -1,6 +1,6 @@
-import {db} from "../databases/databases";
-import {Logger} from "../utils/logger";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { Logger } from "../utils/logger";
+import { Request, Response } from "express";
 import { Category, VideoID } from "../types/segments.model";
 
 export async function getLockCategories(req: Request, res: Response): Promise<Response> {

src/routes/getLockCategoriesByHash.ts

@@ -1,7 +1,7 @@
-import {db} from "../databases/databases";
-import {Logger} from "../utils/logger";
-import {Request, Response} from "express";
-import {hashPrefixTester} from "../utils/hashPrefixTester";
+import { db } from "../databases/databases";
+import { Logger } from "../utils/logger";
+import { Request, Response } from "express";
+import { hashPrefixTester } from "../utils/hashPrefixTester";
 import { Category, VideoID, VideoIDHash } from "../types/segments.model";
 
 interface LockResultByHash {

src/routes/getLockReason.ts

@@ -1,8 +1,8 @@
-import {db} from "../databases/databases";
-import {Logger} from "../utils/logger";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { Logger } from "../utils/logger";
+import { Request, Response } from "express";
 import { Category, VideoID } from "../types/segments.model";
-import {config} from "../config";
+import { config } from "../config";
 
 const possibleCategoryList = config.categoryList;
 interface lockArray {

src/routes/getSavedTimeForUser.ts

@@ -1,7 +1,7 @@
-import {db} from "../databases/databases";
-import {Request, Response} from "express";
-import {getHash} from "../utils/getHash";
-import {config} from "../config";
+import { db } from "../databases/databases";
+import { Request, Response } from "express";
+import { getHash } from "../utils/getHash";
+import { config } from "../config";
 import { Logger } from "../utils/logger";
 
 const maxRewardTimePerSegmentInSeconds = config.maxRewardTimePerSegmentInSeconds ?? 86400;

src/routes/getSearchSegments.ts

@@ -10,7 +10,7 @@ type searchSegmentResponse = {
     segments: DBSegment[]
 };
 
-async function getSegmentsFromDBByVideoID(videoID: VideoID, service: Service): Promise<DBSegment[]> {
+function getSegmentsFromDBByVideoID(videoID: VideoID, service: Service): Promise<DBSegment[]> {
     return db.prepare(
         "all",
         `SELECT "UUID", "timeSubmitted", "startTime", "endTime", "category", "actionType", "votes", "views", "locked", "hidden", "shadowHidden" FROM "sponsorTimes" 

src/routes/getSkipSegments.ts

@@ -13,7 +13,7 @@ import { getReputation } from "../utils/reputation";
 import { getService } from "../utils/getService";
 
 
-async function prepareCategorySegments(req: Request, videoID: VideoID, category: Category, segments: DBSegment[], cache: SegmentCache = {shadowHiddenSegmentIPs: {}}): Promise<Segment[]> {
+async function prepareCategorySegments(req: Request, videoID: VideoID, category: Category, segments: DBSegment[], cache: SegmentCache = { shadowHiddenSegmentIPs: {} }): Promise<Segment[]> {
     const shouldFilter: boolean[] = await Promise.all(segments.map(async (segment) => {
         if (segment.votes < -1 && !segment.required) {
             return false; //too untrustworthy, just ignore it
@@ -56,7 +56,7 @@ async function prepareCategorySegments(req: Request, videoID: VideoID, category:
 
 async function getSegmentsByVideoID(req: Request, videoID: VideoID, categories: Category[],
     actionTypes: ActionType[], requiredSegments: SegmentUUID[], service: Service): Promise<Segment[]> {
-    const cache: SegmentCache = {shadowHiddenSegmentIPs: {}};
+    const cache: SegmentCache = { shadowHiddenSegmentIPs: {} };
     const segments: Segment[] = [];
 
     try {
@@ -89,7 +89,7 @@ async function getSegmentsByVideoID(req: Request, videoID: VideoID, categories:
 
 async function getSegmentsByHash(req: Request, hashedVideoIDPrefix: VideoIDHash, categories: Category[],
     actionTypes: ActionType[], requiredSegments: SegmentUUID[], service: Service): Promise<SBRecord<VideoID, VideoData>> {
-    const cache: SegmentCache = {shadowHiddenSegmentIPs: {}};
+    const cache: SegmentCache = { shadowHiddenSegmentIPs: {} };
     const segments: SBRecord<VideoID, VideoData> = {};
 
     try {
@@ -182,7 +182,7 @@ function getWeightedRandomChoice<T extends VotableObject>(choices: T[], amountOf
         const weight = Math.exp(choice.votes * Math.max(1, choice.reputation + 1) + 3 + boost);
         totalWeight += Math.max(weight, 0);
 
-        return {...choice, weight};
+        return { ...choice, weight };
     });
 
     //iterate and find amountOfChoices choices
@@ -220,7 +220,7 @@ async function chooseSegments(segments: DBSegment[], max: number): Promise<DBSeg
     let cursor = -1; //-1 to make sure that, even if the 1st segment starts at 0, a new group is created
     for (const segment of segments) {
         if (segment.startTime >= cursor) {
-            currentGroup = {segments: [], votes: 0, reputation: 0, locked: false, required: false};
+            currentGroup = { segments: [], votes: 0, reputation: 0, locked: false, required: false };
             overlappingSegmentsGroups.push(currentGroup);
         }
 

src/routes/getSkipSegmentsByHash.ts

@@ -1,7 +1,7 @@
-import {hashPrefixTester} from "../utils/hashPrefixTester";
-import {getSegmentsByHash} from "./getSkipSegments";
-import {Request, Response} from "express";
-import { ActionType, Category, SegmentUUID, Service, VideoIDHash } from "../types/segments.model";
+import { hashPrefixTester } from "../utils/hashPrefixTester";
+import { getSegmentsByHash } from "./getSkipSegments";
+import { Request, Response } from "express";
+import { ActionType, Category, SegmentUUID, VideoIDHash, Service } from "../types/segments.model";
 import { getService } from "../utils/getService";
 
 export async function getSkipSegmentsByHash(req: Request, res: Response): Promise<Response> {

src/routes/getStatus.ts

@@ -1,6 +1,6 @@
-import {db} from "../databases/databases";
-import {Logger} from "../utils/logger";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { Logger } from "../utils/logger";
+import { Request, Response } from "express";
 
 export async function getStatus(req: Request, res: Response): Promise<Response> {
     const startTime = Date.now();

src/routes/getTopUsers.ts

@@ -1,7 +1,7 @@
-import {db} from "../databases/databases";
-import {createMemoryCache} from "../utils/createMemoryCache";
-import {config} from "../config";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { createMemoryCache } from "../utils/createMemoryCache";
+import { config } from "../config";
+import { Request, Response } from "express";
 
 const MILLISECONDS_IN_MINUTE = 60000;
 const getTopUsersWithCache = createMemoryCache(generateTopUsersStats, config.getTopUsersCacheTimeMinutes * MILLISECONDS_IN_MINUTE);

src/routes/getTotalStats.ts

@@ -1,8 +1,9 @@
-import {db} from "../databases/databases";
-import {config} from "../config";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { config } from "../config";
+import { Request, Response } from "express";
 import fetch from "node-fetch";
-import {Logger} from "../utils/logger";
+import axios from "axios";
+import { Logger } from "../utils/logger";
 
 // A cache of the number of chrome web store users
 let chromeUsersCache = 0;
@@ -44,10 +45,9 @@ export async function getTotalStats(req: Request, res: Response): Promise<void>
 
 function updateExtensionUsers() {
     if (config.userCounterURL) {
-        fetch(`${config.userCounterURL}/api/v1/userCount`)
-            .then(res => res.json() as Record<string, any>)
-            .then(data => {
-                apiUsersCache = Math.max(apiUsersCache, data.userCount);
+        axios.get(`${config.userCounterURL}/api/v1/userCount`)
+            .then(res => {
+                apiUsersCache = Math.max(apiUsersCache, res.data.userCount);
             })
             .catch(() => Logger.debug(`Failing to connect to user counter at: ${config.userCounterURL}`));
     }

src/routes/getUserID.ts

@@ -1,6 +1,6 @@
-import {db} from "../databases/databases";
-import {Request, Response} from "express";
-import {UserID} from "../types/user.model";
+import { db } from "../databases/databases";
+import { Request, Response } from "express";
+import { UserID } from "../types/user.model";
 
 function getFuzzyUserID(userName: string): Promise<{userName: string, userID: UserID }[]>  {
     // escape [_ % \] to avoid ReDOS

src/routes/getUserInfo.ts

@@ -1,12 +1,12 @@
-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 { 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";
 import { getReputation } from "../utils/reputation";
 import { SegmentUUID } from "../types/segments.model";
-import {config} from "../config";
+import { config } from "../config";
 const maxRewardTime = config.maxRewardTimePerSegmentInSeconds;
 
 async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> {
@@ -116,7 +116,7 @@ const objSwitch = (cases: cases) => (defaultCase: string) => (key: string) =>
 const functionSwitch = (cases: cases) => (defaultCase: string) => (key: string) =>
     executeIfFunction(objSwitch(cases)(defaultCase)(key));
 
-const dbGetValue = async (userID: HashedUserID, property: string): Promise<string|SegmentUUID|number> => {
+const dbGetValue = (userID: HashedUserID, property: string): Promise<string|SegmentUUID|number> => {
     return functionSwitch({
         userID,
         userName: dbGetUsername(userID),

src/routes/getUserStats.ts

@@ -1,8 +1,8 @@
-import {db} from "../databases/databases";
-import {getHash} from "../utils/getHash";
-import {Request, Response} from "express";
-import {HashedUserID, UserID} from "../types/user.model";
-import {config} from "../config";
+import { db } from "../databases/databases";
+import { getHash } from "../utils/getHash";
+import { Request, Response } from "express";
+import { HashedUserID, UserID } from "../types/user.model";
+import { config } from "../config";
 import { Logger } from "../utils/logger";
 type nestedObj = Record<string, Record<string, number>>;
 const maxRewardTimePerSegmentInSeconds = config.maxRewardTimePerSegmentInSeconds ?? 86400;

src/routes/getUsername.ts

@@ -1,7 +1,7 @@
-import {db} from "../databases/databases";
-import {getHash} from "../utils/getHash";
-import {Logger} from "../utils/logger";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { getHash } from "../utils/getHash";
+import { Logger } from "../utils/logger";
+import { Request, Response } from "express";
 
 export async function getUsername(req: Request, res: Response): Promise<Response> {
     let userID = req.query.userID as string;

src/routes/getViewsForUser.ts

@@ -1,7 +1,7 @@
-import {db} from "../databases/databases";
-import {Request, Response} from "express";
-import {getHash} from "../utils/getHash";
-import {Logger} from "../utils/logger";
+import { db } from "../databases/databases";
+import { Request, Response } from "express";
+import { getHash } from "../utils/getHash";
+import { Logger } from "../utils/logger";
 
 export async function getViewsForUser(req: Request, res: Response): Promise<Response> {
     let userID = req.query.userID as string;

src/routes/oldGetVideoSponsorTimes.ts

@@ -1,5 +1,5 @@
-import {handleGetSegments} from "./getSkipSegments";
-import {Request, Response} from "express";
+import { handleGetSegments } from "./getSkipSegments";
+import { Request, Response } from "express";
 
 export async function oldGetVideoSponsorTimes(req: Request, res: Response): Promise<Response> {
     const segments = await handleGetSegments(req, res);

src/routes/oldSubmitSponsorTimes.ts

@@ -1,7 +1,7 @@
-import {postSkipSegments} from "./postSkipSegments";
-import {Request, Response} from "express";
+import { postSkipSegments } from "./postSkipSegments";
+import { Request, Response } from "express";
 
-export async function oldSubmitSponsorTimes(req: Request, res: Response): Promise<Response> {
+export function oldSubmitSponsorTimes(req: Request, res: Response): Promise<Response> {
     req.query.category = "sponsor";
     return postSkipSegments(req, res);
 }

src/routes/postClearCache.ts

@@ -35,7 +35,7 @@ export async function postClearCache(req: Request, res: Response): Promise<Respo
     // Ensure user is a VIP
     if (!(await isUserVIP(hashedUserID))){
         Logger.warn(`Permission violation: User ${hashedUserID} attempted to clear cache for video ${videoID}.`);
-        return res.status(403).json({"message": "Not a VIP"});
+        return res.status(403).json({ "message": "Not a VIP" });
     }
 
     try {

src/routes/postLockCategories.ts

@@ -1,8 +1,8 @@
-import {Logger} from "../utils/logger";
-import {getHash} from "../utils/getHash";
-import {isUserVIP} from "../utils/isUserVIP";
-import {db} from "../databases/databases";
-import {Request, Response} from "express";
+import { Logger } from "../utils/logger";
+import { getHash } from "../utils/getHash";
+import { isUserVIP } from "../utils/isUserVIP";
+import { db } from "../databases/databases";
+import { Request, Response } from "express";
 import { VideoIDHash } from "../types/segments.model";
 
 export async function postLockCategories(req: Request, res: Response): Promise<string[]> {

src/routes/postPurgeAllSegments.ts

@@ -1,10 +1,10 @@
-import {Logger} from "../utils/logger";
-import {getHash} from "../utils/getHash";
-import {isUserVIP} from "../utils/isUserVIP";
-import {Request, Response} from "express";
-import {HashedUserID, UserID} from "../types/user.model";
-import {VideoID} from "../types/segments.model";
-import {db} from "../databases/databases";
+import { Logger } from "../utils/logger";
+import { getHash } from "../utils/getHash";
+import { isUserVIP } from "../utils/isUserVIP";
+import { Request, Response } from "express";
+import { HashedUserID, UserID } from "../types/user.model";
+import { VideoID } from "../types/segments.model";
+import { db } from "../databases/databases";
 
 export async function postPurgeAllSegments(req: Request, res: Response): Promise<Response> {
     const userID = req.body.userID as UserID;

src/routes/postSegmentShift.ts

@@ -1,48 +1,48 @@
-import {Request, Response} from "express";
-import {Logger} from "../utils/logger";
-import {isUserVIP} from "../utils/isUserVIP";
-import {getHash} from "../utils/getHash";
-import {db} from "../databases/databases";
+import { Request, Response } from "express";
+import { Logger } from "../utils/logger";
+import { isUserVIP } from "../utils/isUserVIP";
+import { getHash } from "../utils/getHash";
+import { db } from "../databases/databases";
 
 const ACTION_NONE = Symbol("none");
 const ACTION_UPDATE = Symbol("update");
 const ACTION_REMOVE = Symbol("remove");
 
 function shiftSegment(segment: any, shift: { startTime: any; endTime: any }) {
-    if (segment.startTime >= segment.endTime) return {action: ACTION_NONE, segment};
-    if (shift.startTime >= shift.endTime) return {action: ACTION_NONE, segment};
+    if (segment.startTime >= segment.endTime) return { action: ACTION_NONE, segment };
+    if (shift.startTime >= shift.endTime) return { action: ACTION_NONE, segment };
     const duration = shift.endTime - shift.startTime;
     if (shift.endTime < segment.startTime) {
         // Scenario #1 cut before segment
         segment.startTime -= duration;
         segment.endTime -= duration;
-        return {action: ACTION_UPDATE, segment};
+        return { action: ACTION_UPDATE, segment };
     }
     if (shift.startTime > segment.endTime) {
         // Scenario #2 cut after segment
-        return {action: ACTION_NONE, segment};
+        return { action: ACTION_NONE, segment };
     }
     if (segment.startTime < shift.startTime && segment.endTime > shift.endTime) {
         // Scenario #3 cut inside segment
         segment.endTime -= duration;
-        return {action: ACTION_UPDATE, segment};
+        return { action: ACTION_UPDATE, segment };
     }
     if (segment.startTime >= shift.startTime && segment.endTime > shift.endTime) {
         // Scenario #4 cut overlap startTime
         segment.startTime = shift.startTime;
         segment.endTime -= duration;
-        return {action: ACTION_UPDATE, segment};
+        return { action: ACTION_UPDATE, segment };
     }
     if (segment.startTime < shift.startTime && segment.endTime <= shift.endTime) {
         // Scenario #5 cut overlap endTime
         segment.endTime = shift.startTime;
-        return {action: ACTION_UPDATE, segment};
+        return { action: ACTION_UPDATE, segment };
     }
     if (segment.startTime >= shift.startTime && segment.endTime <= shift.endTime) {
         // Scenario #6 cut overlap startTime and endTime
-        return {action: ACTION_REMOVE, segment};
+        return { action: ACTION_REMOVE, segment };
     }
-    return {action: ACTION_NONE, segment};
+    return { action: ACTION_NONE, segment };
 }
 
 export async function postSegmentShift(req: Request, res: Response): Promise<Response> {

src/routes/postSkipSegments.ts

@@ -1,15 +1,15 @@
-import {config} from "../config";
-import {Logger} from "../utils/logger";
-import {db, privateDB} from "../databases/databases";
-import {getMaxResThumbnail, YouTubeAPI} from "../utils/youtubeApi";
-import {getSubmissionUUID} from "../utils/getSubmissionUUID";
+import { config } from "../config";
+import { Logger } from "../utils/logger";
+import { db, privateDB } from "../databases/databases";
+import { getMaxResThumbnail, YouTubeAPI } from "../utils/youtubeApi";
+import { getSubmissionUUID } from "../utils/getSubmissionUUID";
 import fetch from "node-fetch";
-import {getHash} from "../utils/getHash";
-import {getIP} from "../utils/getIP";
-import {getFormattedTime} from "../utils/getFormattedTime";
-import {isUserTrustworthy} from "../utils/isUserTrustworthy";
-import {dispatchEvent} from "../utils/webhookUtils";
-import {Request, Response} from "express";
+import { getHash } from "../utils/getHash";
+import { getIP } from "../utils/getIP";
+import { getFormattedTime } from "../utils/getFormattedTime";
+import { isUserTrustworthy } from "../utils/isUserTrustworthy";
+import { dispatchEvent } from "../utils/webhookUtils";
+import { Request, Response } from "express";
 import { ActionType, Category, CategoryActionType, IncomingSegment, SegmentUUID, Service, VideoDuration, VideoID } from "../types/segments.model";
 import { deleteLockCategories } from "./deleteLockCategories";
 import { getCategoryActionType } from "../utils/categoryInfo";
@@ -33,7 +33,7 @@ const CHECK_PASS: CheckResult = {
     errorCode: 0
 };
 
-async function sendWebhookNotification(userID: string, videoID: string, UUID: string, submissionCount: number, youtubeData: APIVideoData, {submissionStart, submissionEnd}: { submissionStart: number; submissionEnd: number; }, segmentInfo: any) {
+async function sendWebhookNotification(userID: string, videoID: string, UUID: string, submissionCount: number, youtubeData: APIVideoData, { submissionStart, submissionEnd }: { submissionStart: number; submissionEnd: number; }, segmentInfo: any) {
     const row = await db.prepare("get", `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
     const userName = row !== undefined ? row.userName : null;
 
@@ -66,7 +66,7 @@ async function sendWebhooks(apiVideoInfo: APIVideoInfo, userID: string, videoID:
     if (apiVideoInfo && service == Service.YouTube) {
         const userSubmissionCountRow = await db.prepare("get", `SELECT count(*) as "submissionCount" FROM "sponsorTimes" WHERE "userID" = ?`, [userID]);
 
-        const {data, err} = apiVideoInfo;
+        const { data, err } = apiVideoInfo;
         if (err) return;
 
         const startTime = parseFloat(segmentInfo.segment[0]);
@@ -182,7 +182,7 @@ async function sendWebhooksNB(userID: string, videoID: string, UUID: string, sta
 async function autoModerateSubmission(apiVideoInfo: APIVideoInfo,
     submission: { videoID: VideoID; userID: UserID; segments: IncomingSegment[] }) {
     if (apiVideoInfo) {
-        const {err, data} = apiVideoInfo;
+        const { err, data } = apiVideoInfo;
         if (err) return false;
 
         const duration = apiVideoInfo?.data?.lengthSeconds;
@@ -274,7 +274,7 @@ async function autoModerateSubmission(apiVideoInfo: APIVideoInfo,
     }
 }
 
-async function getYouTubeVideoInfo(videoID: VideoID, ignoreCache = false): Promise<APIVideoInfo> {
+function getYouTubeVideoInfo(videoID: VideoID, ignoreCache = false): Promise<APIVideoInfo> {
     if (config.newLeafURLs !== null) {
         return YouTubeAPI.listVideos(videoID, ignoreCache);
     } else {
@@ -355,11 +355,11 @@ async function checkEachSegmentValid(userID: string, videoID: VideoID,
     for (let i = 0; i < segments.length; i++) {
         if (segments[i] === undefined || segments[i].segment === undefined || segments[i].category === undefined) {
             //invalid request
-            return { pass: false, errorMessage: "One of your segments are invalid", errorCode: 400};
+            return { pass: false, errorMessage: "One of your segments are invalid", errorCode: 400 };
         }
 
         if (!config.categoryList.includes(segments[i].category)) {
-            return { pass: false, errorMessage: "Category doesn't exist.", errorCode: 400};
+            return { pass: false, errorMessage: "Category doesn't exist.", errorCode: 400 };
         }
 
         // Reject segment if it's in the locked categories list
@@ -392,24 +392,24 @@ async function checkEachSegmentValid(userID: string, videoID: VideoID,
                 || (getCategoryActionType(segments[i].category) === CategoryActionType.Skippable && startTime === endTime)
                 || (getCategoryActionType(segments[i].category) === CategoryActionType.POI && startTime !== endTime)) {
             //invalid request
-            return { pass: false, errorMessage: "One of your segments times are invalid (too short, startTime before endTime, etc.)", errorCode: 400};
+            return { pass: false, errorMessage: "One of your segments times are invalid (too short, startTime before endTime, etc.)", errorCode: 400 };
         }
 
         // Check for POI segments before some seconds
         if (!isVIP && getCategoryActionType(segments[i].category) === CategoryActionType.POI && startTime < config.poiMinimumStartTime) {
-            return { pass: false, errorMessage: `POI cannot be that early`, errorCode: 400};
+            return { pass: false, errorMessage: `POI cannot be that early`, errorCode: 400 };
         }
 
         if (!isVIP && segments[i].category === "sponsor" && Math.abs(startTime - endTime) < 1) {
             // Too short
-            return { pass: false, errorMessage: "Sponsors must be longer than 1 second long", errorCode: 400};
+            return { pass: false, errorMessage: "Sponsors must be longer than 1 second long", errorCode: 400 };
         }
 
         //check if this info has already been submitted before
         const duplicateCheck2Row = await db.prepare("get", `SELECT COUNT(*) as count FROM "sponsorTimes" WHERE "startTime" = ?
             and "endTime" = ? and "category" = ? and "actionType" = ? and "videoID" = ? and "service" = ?`, [startTime, endTime, segments[i].category, segments[i].actionType, videoID, service]);
         if (duplicateCheck2Row.count > 0) {
-            return { pass: false, errorMessage: "Sponsors has already been submitted before.", errorCode: 409};
+            return { pass: false, errorMessage: "Sponsors has already been submitted before.", errorCode: 409 };
         }
     }
 
@@ -419,7 +419,7 @@ async function checkEachSegmentValid(userID: string, videoID: VideoID,
 async function checkByAutoModerator(videoID: any, userID: any, segments: Array<any>, isVIP: boolean, service:string, apiVideoInfo: APIVideoInfo, decreaseVotes: number): Promise<CheckResult & { decreaseVotes: number; } > {
     // Auto moderator check
     if (!isVIP && service == Service.YouTube) {
-        const autoModerateResult = await autoModerateSubmission(apiVideoInfo, {userID, videoID, segments});//startTime, endTime, category: segments[i].category});
+        const autoModerateResult = await autoModerateSubmission(apiVideoInfo, { userID, videoID, segments });//startTime, endTime, category: segments[i].category});
         if (autoModerateResult == "Rejected based on NeuralBlock predictions.") {
             // If NB automod rejects, the submission will start with -2 votes.
             // Note, if one submission is bad all submissions will be affected.
@@ -570,7 +570,7 @@ function preprocessInput(req: Request) {
 
     const userAgent = req.query.userAgent ?? req.body.userAgent ?? parseUserAgent(req.get("user-agent")) ?? "";
 
-    return {videoID, userID, service, videoDuration, videoDurationParam, segments, userAgent};
+    return { videoID, userID, service, videoDuration, videoDurationParam, segments, userAgent };
 }
 
 export async function postSkipSegments(req: Request, res: Response): Promise<Response> {
@@ -579,7 +579,7 @@ export async function postSkipSegments(req: Request, res: Response): Promise<Res
     }
 
     // eslint-disable-next-line prefer-const
-    let {videoID, userID, service, videoDuration, videoDurationParam, segments, userAgent} = preprocessInput(req);
+    let { videoID, userID, service, videoDuration, videoDurationParam, segments, userAgent } = preprocessInput(req);
 
     const invalidCheckResult = checkInvalidFields(videoID, userID, segments);
     if (!invalidCheckResult.pass) {

src/routes/postWarning.ts

@@ -1,8 +1,8 @@
-import {Request, Response} from "express";
-import {Logger} from "../utils/logger";
-import {db} from "../databases/databases";
-import {isUserVIP} from "../utils/isUserVIP";
-import {getHash} from "../utils/getHash";
+import { Request, Response } from "express";
+import { Logger } from "../utils/logger";
+import { db } from "../databases/databases";
+import { isUserVIP } from "../utils/isUserVIP";
+import { getHash } from "../utils/getHash";
 import { HashedUserID, UserID } from "../types/user.model";
 import { config } from "../config";
 
@@ -23,7 +23,7 @@ function checkExpiredWarning(warning: warningEntry): boolean {
 
 export async function postWarning(req: Request, res: Response): Promise<Response> {
     // exit early if no body passed in
-    if (!req.body.userID && !req.body.issuerUserID) return res.status(400).json({"message": "Missing parameters"});
+    if (!req.body.userID && !req.body.issuerUserID) return res.status(400).json({ "message": "Missing parameters" });
     // Collect user input data
     const issuerUserID: HashedUserID = getHash(<UserID> req.body.issuerUserID);
     const userID: UserID = req.body.userID;
@@ -34,7 +34,7 @@ export async function postWarning(req: Request, res: Response): Promise<Response
     // Ensure user is a VIP
     if (!await isUserVIP(issuerUserID)) {
         Logger.warn(`Permission violation: User ${issuerUserID} attempted to warn user ${userID}.`);
-        return res.status(403).json({"message": "Not a VIP"});
+        return res.status(403).json({ "message": "Not a VIP" });
     }
 
     let resultStatus = "";

src/routes/setUsername.ts

@@ -1,10 +1,10 @@
-import {config} from "../config";
-import {Logger} from "../utils/logger";
-import {db, privateDB} from "../databases/databases";
-import {getHash} from "../utils/getHash";
-import {Request, Response} from "express";
+import { config } from "../config";
+import { Logger } from "../utils/logger";
+import { db, privateDB } from "../databases/databases";
+import { getHash } from "../utils/getHash";
+import { Request, Response } from "express";
 
-async function logUserNameChange(userID: string, newUserName: string, oldUserName: string, updatedByAdmin: boolean): Promise<Response>  {
+function logUserNameChange(userID: string, newUserName: string, oldUserName: string, updatedByAdmin: boolean): Promise<Response>  {
     return privateDB.prepare("run",
         `INSERT INTO "userNameLogs"("userID", "newUserName", "oldUserName", "updatedByAdmin", "updatedAt") VALUES(?, ?, ?, ?, ?)`,
         [userID, newUserName, oldUserName, + updatedByAdmin, new Date().getTime()]

src/routes/shadowBanUser.ts

@@ -1,6 +1,6 @@
-import {db} from "../databases/databases";
-import {getHash} from "../utils/getHash";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { getHash } from "../utils/getHash";
+import { Request, Response } from "express";
 import { config } from "../config";
 import { Category, Service, VideoID, VideoIDHash } from "../types/segments.model";
 import { UserID } from "../types/user.model";

src/routes/viewedVideoSponsorTime.ts

@@ -1,5 +1,5 @@
-import {db} from "../databases/databases";
-import {Request, Response} from "express";
+import { db } from "../databases/databases";
+import { Request, Response } from "express";
 
 export async function viewedVideoSponsorTime(req: Request, res: Response): Promise<Response> {
     const UUID = req.query.UUID;

src/routes/voteOnSponsorTime.ts

@@ -1,14 +1,14 @@
-import {Request, Response} from "express";
-import {Logger} from "../utils/logger";
-import {isUserVIP} from "../utils/isUserVIP";
+import { Request, Response } from "express";
+import { Logger } from "../utils/logger";
+import { isUserVIP } from "../utils/isUserVIP";
 import fetch from "node-fetch";
-import {getMaxResThumbnail, YouTubeAPI} from "../utils/youtubeApi";
-import {db, privateDB} from "../databases/databases";
-import {dispatchEvent, getVoteAuthor, getVoteAuthorRaw} from "../utils/webhookUtils";
-import {getFormattedTime} from "../utils/getFormattedTime";
-import {getIP} from "../utils/getIP";
-import {getHash} from "../utils/getHash";
-import {config} from "../config";
+import { getMaxResThumbnail, YouTubeAPI } from "../utils/youtubeApi";
+import { db, privateDB } from "../databases/databases";
+import { dispatchEvent, getVoteAuthor, getVoteAuthorRaw } from "../utils/webhookUtils";
+import { getFormattedTime } from "../utils/getFormattedTime";
+import { getIP } from "../utils/getIP";
+import { getHash } from "../utils/getHash";
+import { config } from "../config";
 import { UserID } from "../types/user.model";
 import { Category, CategoryActionType, HashedIP, IPAddress, SegmentUUID, Service, VideoID, VideoIDHash, Visibility } from "../types/segments.model";
 import { getCategoryActionType } from "../utils/categoryInfo";
@@ -459,6 +459,6 @@ export async function voteOnSponsorTime(req: Request, res: Response): Promise<Re
         return res.status(finalResponse.finalStatus).send(finalResponse.finalMessage ?? undefined);
     } catch (err) {
         Logger.error(err as string);
-        return res.status(500).json({error: "Internal error creating segment vote"});
+        return res.status(500).json({ error: "Internal error creating segment vote" });
     }
 }

src/utils/getIP.ts

@@ -1,5 +1,5 @@
-import {config} from "../config";
-import {Request} from "express";
+import { config } from "../config";
+import { Request } from "express";
 import { IPAddress } from "../types/segments.model";
 
 export function getIP(req: Request): IPAddress {

src/utils/getSubmissionUUID.ts

@@ -1,4 +1,4 @@
-import {getHash} from "./getHash";
+import { getHash } from "./getHash";
 import { HashedValue } from "../types/hash.model";
 import { ActionType, VideoID } from "../types/segments.model";
 import { UserID } from "../types/user.model";

src/utils/hashPrefixTester.ts

@@ -1,4 +1,4 @@
-import {config} from "../config";
+import { config } from "../config";
 
 const minimumPrefix = config.minimumPrefix || "3";
 const maximumPrefix = config.maximumPrefix || "32"; // Half the hash.

src/utils/isUserTrustworthy.ts

@@ -1,4 +1,4 @@
-import {db} from "../databases/databases";
+import { db } from "../databases/databases";
 
 /**
  * Returns true if the user is considered trustworthy. This happens after a user has made 5 submissions and has less than 60% downvoted submissions

src/utils/isUserVIP.ts

@@ -1,4 +1,4 @@
-import {db} from "../databases/databases";
+import { db } from "../databases/databases";
 import { HashedUserID } from "../types/user.model";
 
 export async function isUserVIP(userID: HashedUserID): Promise<boolean> {

src/utils/logger.ts

@@ -1,4 +1,4 @@
-import {config} from "../config";
+import { config } from "../config";
 
 const enum LogLevel {
     ERROR = "ERROR",

src/utils/queryCacher.ts

@@ -5,7 +5,7 @@ import { Service, VideoID, VideoIDHash } from "../types/segments.model";
 import { UserID } from "../types/user.model";
 
 async function get<T>(fetchFromDB: () => Promise<T>, key: string): Promise<T> {
-    const {err, reply} = await redis.getAsync(key);
+    const { err, reply } = await redis.getAsync(key);
 
     if (!err && reply) {
         try {

src/utils/redis.ts

@@ -1,6 +1,6 @@
-import {config} from "../config";
-import {Logger} from "./logger";
-import redis, {Callback} from "redis";
+import { config } from "../config";
+import { Logger } from "./logger";
+import redis, { Callback } from "redis";
 
 interface RedisSB {
     get(key: string, callback?: Callback<string | null>): void;
@@ -13,10 +13,10 @@ interface RedisSB {
 let exportObject: RedisSB = {
     get: (key, callback?) => callback(null, undefined),
     getAsync: () =>
-        new Promise((resolve) => resolve({err: null, reply: undefined})),
+        new Promise((resolve) => resolve({ err: null, reply: undefined })),
     set: (key, value, callback) => callback(null, undefined),
     setAsync: () =>
-        new Promise((resolve) => resolve({err: null, reply: undefined})),
+        new Promise((resolve) => resolve({ err: null, reply: undefined })),
     delAsync: () =>
         new Promise((resolve) => resolve(null)),
 };
@@ -26,8 +26,8 @@ if (config.redis) {
     const client = redis.createClient(config.redis);
     exportObject = client;
 
-    exportObject.getAsync = (key) => new Promise((resolve) => client.get(key, (err, reply) => resolve({err, reply})));
-    exportObject.setAsync = (key, value) => new Promise((resolve) => client.set(key, value, (err, reply) => resolve({err, reply})));
+    exportObject.getAsync = (key) => new Promise((resolve) => client.get(key, (err, reply) => resolve({ err, reply })));
+    exportObject.setAsync = (key, value) => new Promise((resolve) => client.set(key, value, (err, reply) => resolve({ err, reply })));
     exportObject.delAsync = (...keys) => new Promise((resolve) => client.del(keys, (err) => resolve(err)));
 
     client.on("error", function(error) {

src/utils/webhookUtils.ts

@@ -1,5 +1,5 @@
-import {config} from "../config";
-import {Logger} from "../utils/logger";
+import { config } from "../config";
+import { Logger } from "../utils/logger";
 import fetch from "node-fetch";
 
 function getVoteAuthorRaw(submissionCount: number, isVIP: boolean, isOwnSubmission: boolean): string {

src/utils/youtubeApi.ts

@@ -1,6 +1,6 @@
 import fetch from "node-fetch";
-import {config} from "../config";
-import {Logger} from "./logger";
+import { config } from "../config";
+import { Logger } from "./logger";
 import { APIVideoData, APIVideoInfo } from "../types/youtubeApi.model";
 import DiskCache from "./diskCache";
 
@@ -24,7 +24,7 @@ export class YouTubeAPI {
             }
         }
 
-        if (!config.newLeafURLs || config.newLeafURLs.length <= 0) return {err: "NewLeaf URL not found", data: null};
+        if (!config.newLeafURLs || config.newLeafURLs.length <= 0) return { err: "NewLeaf URL not found", data: null };
 
         try {
             const result = await fetch(`${config.newLeafURLs[Math.floor(Math.random() * config.newLeafURLs.length)]}/api/v1/videos/${videoID}`, { method: "GET" });
@@ -45,7 +45,7 @@ export class YouTubeAPI {
                 return { err: result.statusText, data: null };
             }
         } catch (err) {
-            return {err: err as string | boolean, data: null};
+            return { err: err as string | boolean, data: null };
         }
     }
 }

test/cases/dbUpgrade.ts

@@ -1,6 +1,6 @@
 import assert from "assert";
 
-import {db, privateDB} from "../../src/databases/databases";
+import { db, privateDB } from "../../src/databases/databases";
 
 describe("dbUpgrade", () => {
     it("Should update the database version when starting the application", async () => {

test/cases/downvoteSegmentArchiveJob.ts

@@ -1,40 +1,43 @@
-import assert from "assert";
-
+import { strictEqual, ok } from "assert";
 import { db } from "../../src/databases/databases";
-import { getHash } from "../../src/utils/getHash";
 import { archiveDownvoteSegment } from "../../src/cronjob/downvoteSegmentArchiveJob";
 import { DBSegment } from "../../src/types/segments.model";
 
+const oct2021 = new Date("October 1, 2021").getTime();
+const nov2021 = new Date("November 1, 2021").getTime();
+const dec2021 = new Date("December 17, 2021").getTime();
+const dec2022 = new Date("December 17, 2022").getTime();
+
 const records = [
-    ["testtesttest", 1, 11, 2, 0, "1-uuid-0", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 100, 0, 0, getHash("testtesttest", 1)],
-    ["testtesttest2", 1, 11, 2, 0, "1-uuid-0-1", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 120, 0, 0, getHash("testtesttest2", 1)],
-    ["testtesttest", 12, 14, 2, 0, "1-uuid-0-2", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "mute", "ytb", 100, 0, 0, getHash("testtesttest", 1)],
-    ["testtesttest", 20, 33, 2, 0, "1-uuid-2", "testman", new Date("December 17, 2021").getTime(), 50, "intro", "skip", "ytb", 101, 0, 0, getHash("testtesttest", 1)],
-    ["testtesttest,test", 1, 11, 2, 0, "1-uuid-1", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 140, 0, 0, getHash("testtesttest,test", 1)],
+    ["dsajVideo0", 0, 0, 2, 0, "dsaj00", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo0", 0, 0, 2, 0, "dsaj01", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo0", 0, 0, 2, 0, "dsaj02", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo0", 0, 0, 2, 0, "dsaj03", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo0", 0, 0, 2, 0, "dsaj04", "dsajUser", dec2021, 0, 0, 0,],
 
-    ["test3", 1, 11, 2, 0, "1-uuid-4", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 200, 0, 0, getHash("test3", 1)],
-    ["test3", 7, 22, -3, 0, "1-uuid-5", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 300, 0, 0, getHash("test3", 1)],
+    ["dsajVideo1", 0, 0, 2, 0, "dsaj10", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo1", 0, 0, -3, 0, "dsaj11", "dsajUser", dec2021, 0, 0, 0],
 
-    ["multiple", 1, 11, 2, 0, "1-uuid-6", "testman", new Date("December 17, 2021").getTime(), 50, "intro", "skip", "ytb", 400, 0, 0, getHash("multiple", 1)],
-    ["multiple", 20, 33, -4, 0, "1-uuid-7", "testman", new Date("October 1, 2021").getTime(), 50, "intro", "skip", "ytb", 500, 0, 0, getHash("multiple", 1)],
+    ["dsajVideo2", 0, 0, 2, 0, "dsaj20", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo2", 0, 0, -4, 0, "dsaj21", "dsajUser", oct2021, 0, 0, 0],
 
-    ["locked", 20, 33, 2, 1, "1-uuid-locked-8", "testman", new Date("December 17, 2021").getTime(), 50, "intro", "skip", "ytb", 230, 0, 0, getHash("locked", 1)],
-    ["locked", 20, 34, 100000, 0, "1-uuid-9", "testman", new Date("December 17, 2021").getTime(), 50, "intro", "skip", "ytb", 190, 0, 0, getHash("locked", 1)],
+    ["dsajVideo3", 0, 0, 2, 1, "dsaj30", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo3", 0, 0, 100000, 0, "dsaj31", "dsajUser", dec2021, 0, 0, 0],
 
-    ["onlyHiddenSegments", 20, 34, 100000, 0, "onlyHiddenSegments", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 190, 1, 0, getHash("onlyHiddenSegments", 1)],
+    ["dsajVideo4", 0, 0, 100000, 0, "dsaj40", "dsajUser", dec2021, 0, 1, 0],
 
-    ["requiredSegmentVid-raw", 60, 70, 2, 0, "requiredSegmentVid-raw-1", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)],
-    ["requiredSegmentVid-raw", 60, 70, -1, 0, "requiredSegmentVid-raw-2", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)],
-    ["requiredSegmentVid-raw", 80, 90, -2, 0, "requiredSegmentVid-raw-3", "testman", new Date("November 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)],
-    ["requiredSegmentVid-raw", 80, 90, 2, 0, "requiredSegmentVid-raw-4", "testman", new Date("December 17, 2021").getTime(), 50, "sponsor", "skip", "ytb", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)]
+    ["dsajVideo5", 0, 0, 2, 0, "dsaj50", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo5", 0, 0, -1, 0, "dsaj51", "dsajUser", dec2021, 0, 0, 0],
+    ["dsajVideo5", 0, 0, -2, 0, "dsaj52", "dsajUser", nov2021, 0, 0, 0],
+    ["dsajVideo5", 0, 0, 2, 0, "dsaj53", "dsajUser", dec2021, 0, 0, 0]
 ];
 
 describe("downvoteSegmentArchiveJob", () => {
     beforeEach(async () => {
-        const query = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", views, category, "actionType", "service", "videoDuration", "hidden", "shadowHidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+        const query = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "hidden", "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
 
-        for (let i = 0; i < records.length; i += 1) {
-            await db.prepare("run", query, records[i]);
+        for (const record of records) {
+            await db.prepare("run", query, record);
         }
 
         return;
@@ -42,7 +45,7 @@ describe("downvoteSegmentArchiveJob", () => {
 
     it("Should update the database version when starting the application", async () => {
         const version = (await db.prepare("get", "SELECT key, value FROM config where key = ?", ["version"])).value;
-        assert.ok(version >= 21, "version should be greater or equal to 21");
+        ok(version >= 21, "version should be greater or equal to 21");
     });
 
     afterEach(async () => {
@@ -50,12 +53,10 @@ describe("downvoteSegmentArchiveJob", () => {
         await db.prepare("run", 'DELETE FROM "archivedSponsorTimes"');
     });
 
-    const getArchivedSegment = (): Promise<DBSegment[]> => {
-        return db.prepare("all", 'SELECT * FROM "archivedSponsorTimes"');
-    };
+    const getArchivedSegment = (): Promise<DBSegment[]> => db.prepare("all", 'SELECT * FROM "archivedSponsorTimes"');
 
-    const getSegmentsInMainTable = (dayLimit: number, voteLimit: number, now: number): Promise<DBSegment[]> => {
-        return db.prepare(
+    const getSegmentsInMainTable = (dayLimit: number, voteLimit: number, now: number): Promise<DBSegment[]> =>
+        db.prepare(
             "all",
             'SELECT * FROM "sponsorTimes" WHERE "votes" < ? AND (? - "timeSubmitted") > ?',
             [
@@ -64,109 +65,107 @@ describe("downvoteSegmentArchiveJob", () => {
                 dayLimit * 86400000,
             ]
         );
-    };
 
-    const countSegmentInMainTable = (): Promise<number> => {
-        return db.prepare(
+    const countSegmentInMainTable = (): Promise<number> =>
+        db.prepare(
             "get",
             'SELECT COUNT(*) as count FROM "sponsorTimes"'
         ).then(res => res.count);
-    };
 
     it("Should archive all records match", async () => {
         const dayLimit = 20;
         const voteLimit = 0;
-        const time = new Date("December 17, 2022").getTime();
+        const time = dec2022;
         const res = await archiveDownvoteSegment(dayLimit, voteLimit, time);
-        assert.strictEqual(res, 0, "Expection in archiveDownvoteSegment");
+        strictEqual(res, 0, "Expection in archiveDownvoteSegment");
 
         // check segments in archived table
         const archivedSegment = await getArchivedSegment();
-        assert.strictEqual(archivedSegment.length, 4, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 4`);
+        strictEqual(archivedSegment.length, 4, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 4`);
 
         // check segments not in main table
         const segments = await getSegmentsInMainTable(dayLimit, voteLimit, time);
-        assert.strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
+        strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
 
         // check number segments remain in main table
-        assert.strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
+        strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
     });
 
     it("Should archive records with vote < -1 match", async () => {
         const dayLimit = 20;
         const voteLimit = -1;
-        const time = new Date("December 17, 2022").getTime();
+        const time = dec2022;
         const res = await archiveDownvoteSegment(dayLimit, voteLimit, time);
-        assert.strictEqual(res, 0, "");
+        strictEqual(res, 0, "");
 
         // check segments in archived table
         const archivedSegment = await getArchivedSegment();
-        assert.strictEqual(archivedSegment.length, 3, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 3`);
+        strictEqual(archivedSegment.length, 3, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 3`);
 
         // check segments not in main table
         const segments = await getSegmentsInMainTable(dayLimit, voteLimit, time);
-        assert.strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
+        strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
 
         // check number segments remain in main table
-        assert.strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
+        strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
     });
 
     it("Should archive records with vote < -2 and day < 30 match", async () => {
         const dayLimit = 30;
         const voteLimit = -2;
-        const time = new Date("December 17, 2021").getTime();
+        const time = dec2021;
         const res = await archiveDownvoteSegment(dayLimit, voteLimit, time);
-        assert.strictEqual(res, 0, "");
+        strictEqual(res, 0, "");
 
         // check segments in archived table
         const archivedSegment = await getArchivedSegment();
-        assert.strictEqual(archivedSegment.length, 1, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 1`);
+        strictEqual(archivedSegment.length, 1, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 1`);
 
-        assert.strictEqual(archivedSegment[0].votes, -4, `Incorrect segment vote in archiveTable: ${archivedSegment[0].votes} instead of -4`);
+        strictEqual(archivedSegment[0].votes, -4, `Incorrect segment vote in archiveTable: ${archivedSegment[0].votes} instead of -4`);
 
         // check segments not in main table
         const segments = await getSegmentsInMainTable(dayLimit, voteLimit, time);
-        assert.strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
+        strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
 
         // check number segments remain in main table
-        assert.strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
+        strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
     });
 
     it("Should archive records with vote < -2 and day < 300 match", async () => {
         const dayLimit = 300;
         const voteLimit = -2;
-        const time = new Date("December 17, 2022").getTime();
+        const time = dec2022;
         const res = await archiveDownvoteSegment(dayLimit, voteLimit, time);
-        assert.strictEqual(res, 0, "");
+        strictEqual(res, 0, "");
 
         // check segments in archived table
         const archivedSegment = await getArchivedSegment();
-        assert.strictEqual(archivedSegment.length, 2, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 2`);
+        strictEqual(archivedSegment.length, 2, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 2`);
 
         // check segments not in main table
         const segments = await getSegmentsInMainTable(dayLimit, voteLimit, time);
-        assert.strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
+        strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
 
         // check number segments remain in main table
-        assert.strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
+        strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
     });
 
     it("Should not archive any", async () => {
         const dayLimit = 300;
         const voteLimit = -2;
-        const time = new Date("December 17, 2021").getTime();
+        const time = dec2021;
         const res = await archiveDownvoteSegment(dayLimit, voteLimit, time);
-        assert.strictEqual(res, 0, "");
+        strictEqual(res, 0, "");
 
         // check segments in archived table
         const archivedSegment = await getArchivedSegment();
-        assert.strictEqual(archivedSegment.length, 0, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 0`);
+        strictEqual(archivedSegment.length, 0, `Incorrect segment in archiveTable: ${archivedSegment.length} instead of 0`);
 
         // check segments not in main table
         const segments = await getSegmentsInMainTable(dayLimit, voteLimit, time);
-        assert.strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
+        strictEqual(segments.length, 0, `Incorrect segment in main table: ${segments.length} instead of 0`);
 
         // check number segments remain in main table
-        assert.strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
+        strictEqual(await countSegmentInMainTable(), records.length - archivedSegment.length ,"Incorrect segment remain in main table");
     });
 });

test/cases/getHash.ts

@@ -1,33 +1,33 @@
-import {getHash} from "../../src/utils/getHash";
-import assert from "assert";
+import { getHash } from "../../src/utils/getHash";
+import { notStrictEqual, strictEqual } from "assert";
 
 describe("getHash", () => {
     it("Should not output the input string", () => {
-        assert(getHash("test") !== "test");
-        assert(getHash("test", -1) !== "test");
-        assert(getHash("test", 0) !== "test");
-        assert(getHash("test", null) !== "test");
+        notStrictEqual(getHash("test"), "test");
+        notStrictEqual(getHash("test", -1), "test");
+        notStrictEqual(getHash("test", 0), "test");
+        notStrictEqual(getHash("test", null), "test");
     });
 
     it("Should return a hashed value", () => {
-        assert.strictEqual(getHash("test"), "2f327ef967ade1ebf4319163f7debbda9cc17bb0c8c834b00b30ca1cf1c256ee");
+        strictEqual(getHash("test"), "2f327ef967ade1ebf4319163f7debbda9cc17bb0c8c834b00b30ca1cf1c256ee");
     });
 
     it("Should be able to output the same has the DB upgrade script will output", () => {
-        assert.strictEqual(getHash("vid", 1), "1ff838dc6ca9680d88455341118157d59a055fe6d0e3870f9c002847bebe4663");
+        strictEqual(getHash("vid", 1), "1ff838dc6ca9680d88455341118157d59a055fe6d0e3870f9c002847bebe4663");
     });
 
     it("Should take a variable number of passes", () => {
-        assert.strictEqual(getHash("test", 1), "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08");
-        assert.strictEqual(getHash("test", 2), "7b3d979ca8330a94fa7e9e1b466d8b99e0bcdea1ec90596c0dcc8d7ef6b4300c");
-        assert.strictEqual(getHash("test", 3), "5b24f7aa99f1e1da5698a4f91ae0f4b45651a1b625c61ed669dd25ff5b937972");
+        strictEqual(getHash("test", 1), "9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08");
+        strictEqual(getHash("test", 2), "7b3d979ca8330a94fa7e9e1b466d8b99e0bcdea1ec90596c0dcc8d7ef6b4300c");
+        strictEqual(getHash("test", 3), "5b24f7aa99f1e1da5698a4f91ae0f4b45651a1b625c61ed669dd25ff5b937972");
     });
 
     it("Should default to 5000 passes", () => {
-        assert.strictEqual(getHash("test"), getHash("test", 5000));
+        strictEqual(getHash("test"), getHash("test", 5000));
     });
 
     it("Should not take a negative number of passes", () => {
-        assert.strictEqual(getHash("test", -1), "");
+        strictEqual(getHash("test", -1), "");
     });
 });

test/cases/getIsUserVIP.ts

@@ -1,16 +1,20 @@
-import fetch from "node-fetch";
-import {getbaseURL, Done} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { client } from "../utils/httpClient";
 import assert from "assert";
 
+const VIPUser = "isUserVIPVIP";
+const normalUser = "isUserVIPNormal";
+const endpoint = "/api/isUserVIP";
+const vipUserRequest = (userID: string) => client.get(endpoint, { params: { userID } });
+
 describe("getIsUserVIP", () => {
-    before((done: Done) => {
-        db.prepare("run", 'INSERT INTO "vipUsers" ("userID") VALUES (?)', [getHash("supertestman")]).then(done);
+    before(() => {
+        db.prepare("run", 'INSERT INTO "vipUsers" ("userID") VALUES (?)', [getHash(VIPUser)]);
     });
 
-    it("Should be able to get a 200", (done: Done) => {
-        fetch(`${getbaseURL()}/api/isUserVIP?userID=supertestman`)
+    it("Should be able to get a 200", (done) => {
+        vipUserRequest(VIPUser)
             .then(res => {
                 assert.strictEqual(res.status, 200, "response should be 200");
                 done();
@@ -19,8 +23,8 @@ describe("getIsUserVIP", () => {
     });
 
 
-    it("Should get a 400 if no userID", (done: Done) => {
-        fetch(`${getbaseURL()}/api/isUserVIP`)
+    it("Should get a 400 if no userID", (done) => {
+        client.get(endpoint)
             .then(res => {
                 assert.strictEqual(res.status, 400, "response should be 400");
                 done();
@@ -28,23 +32,21 @@ describe("getIsUserVIP", () => {
             .catch(err => done(err));
     });
 
-    it("Should say a VIP is a VIP", (done: Done) => {
-        fetch(`${getbaseURL()}/api/isUserVIP?userID=supertestman`)
-            .then(async res => {
+    it("Should say a VIP is a VIP", (done) => {
+        vipUserRequest(VIPUser)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.strictEqual(data.vip, true);
+                assert.strictEqual(res.data.vip, true);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should say a normal user is not a VIP", (done: Done) => {
-        fetch(`${getbaseURL()}/api/isUserVIP?userID=regulartestman`)
-            .then(async res => {
+    it("Should say a normal user is not a VIP", (done) => {
+        vipUserRequest(normalUser)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.strictEqual(data.vip, false);
+                assert.strictEqual(res.data.vip, false);
                 done();
             })
             .catch(err => done(err));

test/cases/getLockCategories.ts

@@ -1,35 +1,33 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {getHash} from "../../src/utils/getHash";
-import {db} from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
 import assert from "assert";
-
+import { client } from "../utils/httpClient";
+const endpoint = "/api/lockCategories";
+const getLockCategories = (videoID: string) => client.get(endpoint, { params: { videoID } });
 
 describe("getLockCategories", () => {
     before(async () => {
         const insertVipUserQuery = 'INSERT INTO "vipUsers" ("userID") VALUES (?)';
-        await db.prepare("run", insertVipUserQuery, [getHash("VIPUser-getLockCategories")]);
+        await db.prepare("run", insertVipUserQuery, [getHash("getLockCategoriesVIP")]);
 
         const insertLockCategoryQuery = 'INSERT INTO "lockCategories" ("userID", "videoID", "category", "reason") VALUES (?, ?, ?, ?)';
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLock-1", "sponsor", "1-short"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLock-1", "interaction", "1-longer-reason"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesVIP"), "getLock1", "sponsor", "1-short"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesVIP"), "getLock1", "interaction", "1-longer-reason"]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLock-2", "preview", "2-reason"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesVIP"), "getLock2", "preview", "2-reason"]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLock-3", "nonmusic", "3-reason"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesVIP"), "getLock3", "nonmusic", "3-reason"]);
     });
 
     it("Should update the database version when starting the application", async () => {
         const version = (await db.prepare("get", "SELECT key, value FROM config where key = ?", ["version"])).value;
-        if (version > 20) return;
-        else return `Version isn't greater than 20. Version is ${version}`;
+        assert.ok(version > 20, `Version isn't greater than 20. Version is ${version}`);
     });
 
-    it("Should be able to get multiple locks", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories?videoID=getLock-1`)
-            .then(async res => {
+    it("Should be able to get multiple locks", (done) => {
+        getLockCategories("getLock1")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     categories: [
                         "sponsor",
@@ -37,31 +35,30 @@ describe("getLockCategories", () => {
                     ],
                     reason: "1-longer-reason"
                 };
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get single locks", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories?videoID=getLock-2`)
-            .then(async res => {
+    it("Should be able to get single locks", (done) => {
+        getLockCategories("getLock2")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     categories: [
                         "preview"
                     ],
                     reason: "2-reason"
                 };
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should return 404 if no lock exists", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories?videoID=getLock-0`)
+    it("should return 404 if no lock exists", (done) => {
+        getLockCategories("getLockNull")
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -69,8 +66,8 @@ describe("getLockCategories", () => {
             .catch(err => done(err));
     });
 
-    it("should return 400 if no videoID specified", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories`)
+    it("should return 400 if no videoID specified", (done) => {
+        client.get(endpoint)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();

test/cases/getLockCategoriesByHash.ts

@@ -1,25 +1,28 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {getHash} from "../../src/utils/getHash";
-import {db} from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
 import assert from "assert";
+import { client } from "../utils/httpClient";
+
+const fakeHash = "b05a20424f24a53dac1b059fb78d861ba9723645026be2174c93a94f9106bb35";
+const endpoint = "/api/lockCategories";
+const getLockCategories = (hash: string) => client.get(`${endpoint}/${hash}`);
 
 describe("getLockCategoriesByHash", () => {
     before(async () => {
         const insertVipUserQuery = 'INSERT INTO "vipUsers" ("userID") VALUES (?)';
-        await db.prepare("run", insertVipUserQuery, [getHash("VIPUser-getLockCategories")]);
+        await db.prepare("run", insertVipUserQuery, [getHash("getLockCategoriesHashVIP")]);
 
         const insertLockCategoryQuery = 'INSERT INTO "lockCategories" ("userID", "videoID", "category", "reason", "hashedVideoID") VALUES (?, ?, ?, ?, ?)';
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLockHash-1", "sponsor", "1-reason-short", "67a654898fda3a5541774aea345796c7709982bb6018cb08d22a18eeddccc1d0"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLockHash-1", "interaction", "1-reason-longer", "67a654898fda3a5541774aea345796c7709982bb6018cb08d22a18eeddccc1d0"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesHashVIP"), "getLockHash1", "sponsor", "1-reason-short", getHash("getLockHash1", 1)]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesHashVIP"), "getLockHash1", "interaction", "1-reason-longer", getHash("getLockHash1", 1)]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLockHash-2", "preview", "2-reason", "dff09120437b4bd594dffae5f3cde3cfc5f6099fb01d0ef4051919b2908d9a50"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesHashVIP"), "getLockHash2", "preview", "2-reason", getHash("getLockHash2", 1)]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "getLockHash-3", "nonmusic", "3-reason", "bf1b122fd5630e0df8626d00c4a95c58954ad715e5595b0f75a19ac131e28928"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesHashVIP"), "getLockHash3", "nonmusic", "3-reason", getHash("getLockHash3", 1)]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "fakehash-1", "outro", "fake1-reason", "b05a20424f24a53dac1b059fb78d861ba9723645026be2174c93a94f9106bb35"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "fakehash-2", "intro", "fake2-longer-reason", "b05acd1cd6ec7dffe5ffea64ada91ae7469d6db2ce21c7e30ad7fa62075d450"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), "fakehash-2", "preview", "fake2-short", "b05acd1cd6ec7dffe5ffea64ada91ae7469d6db2ce21c7e30ad7fa62075d450"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesHashVIP"), "fakehash-1", "outro", "fake1-reason", fakeHash]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesHashVIP"), "fakehash-2", "intro", "fake2-longer-reason", fakeHash]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("getLockCategoriesHashVIP"), "fakehash-2", "preview", "fake2-short", fakeHash]);
     });
 
     it("Database should be greater or equal to version 20", async () => {
@@ -29,93 +32,95 @@ describe("getLockCategoriesByHash", () => {
             `Version isn't greater than 20. Version is ${version}`);
     });
 
-    it("Should be able to get multiple locks in one object", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/67a65`)
-            .then(async res => {
+    it("Should be able to get multiple locks in one object", (done) => {
+        const videoID = "getLockHash1";
+        const hash = getHash(videoID, 1);
+        getLockCategories(hash.substring(0,4))
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "getLockHash-1",
-                    hash: getHash("getLockHash-1", 1),
+                    videoID,
+                    hash,
                     categories: [
                         "sponsor",
                         "interaction"
                     ],
                     reason: "1-reason-longer"
                 }];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get single lock", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/dff09`)
-            .then(async res => {
+    it("Should be able to get single lock", (done) => {
+        const videoID = "getLockHash2";
+        const hash = getHash(videoID, 1);
+        getLockCategories(hash.substring(0,6))
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "getLockHash-2",
-                    hash: getHash("getLockHash-2", 1),
+                    videoID,
+                    hash,
                     categories: [
                         "preview"
                     ],
                     reason: "2-reason"
                 }];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get by half full hash", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/bf1b122fd5630e0df8626d00c4a95c58`)
-            .then(async res => {
+    it("Should be able to get by half full hash", (done) => {
+        const videoID = "getLockHash3";
+        const hash = getHash(videoID, 1);
+        getLockCategories(hash.substring(0,32))
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "getLockHash-3",
-                    hash: getHash("getLockHash-3", 1),
+                    videoID,
+                    hash,
                     categories: [
                         "nonmusic"
                     ],
                     reason: "3-reason"
                 }];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get multiple by similar hash with multiple categories", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/b05a`)
-            .then(async res => {
+    it("Should be able to get multiple by similar hash with multiple categories", (done) => {
+        getLockCategories(fakeHash.substring(0,5))
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
                     videoID: "fakehash-1",
-                    hash: "b05a20424f24a53dac1b059fb78d861ba9723645026be2174c93a94f9106bb35",
+                    hash: fakeHash,
                     categories: [
                         "outro"
                     ],
                     reason: "fake1-reason"
                 }, {
                     videoID: "fakehash-2",
-                    hash: "b05acd1cd6ec7dffe5ffea64ada91ae7469d6db2ce21c7e30ad7fa62075d450",
+                    hash: fakeHash,
                     categories: [
                         "intro",
                         "preview"
                     ],
                     reason: "fake2-longer-reason"
                 }];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should return 404 once hash prefix varies", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/b05aa`)
+    it("should return 404 once hash prefix varies", (done) => {
+        getLockCategories("b05aa")
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -123,8 +128,8 @@ describe("getLockCategoriesByHash", () => {
             .catch(err => done(err));
     });
 
-    it("should return 404 if no lock exists", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/aaaaaa`)
+    it("should return 404 if no lock exists", (done) => {
+        getLockCategories("aaaaaa")
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -132,8 +137,8 @@ describe("getLockCategoriesByHash", () => {
             .catch(err => done(err));
     });
 
-    it("should return 400 if no videoID specified", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/`)
+    it("should return 400 if full hash sent", (done) => {
+        getLockCategories(fakeHash)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -141,8 +146,8 @@ describe("getLockCategoriesByHash", () => {
             .catch(err => done(err));
     });
 
-    it("should return 400 if full hash sent", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/b05a20424f24a53dac1b059fb78d861ba9723645026be2174c93a94f9106bb35`)
+    it("should return 400 if hash too short", (done) => {
+        getLockCategories("00")
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -150,17 +155,8 @@ describe("getLockCategoriesByHash", () => {
             .catch(err => done(err));
     });
 
-    it("should return 400 if hash too short", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/00`)
-            .then(res => {
-                assert.strictEqual(res.status, 400);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("should return 400 if no hash specified", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories/`)
+    it("should return 400 if no hash specified", (done) => {
+        getLockCategories("")
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();

test/cases/getLockReason.ts

@@ -1,10 +1,9 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {getHash} from "../../src/utils/getHash";
-import {db} from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
-const endpoint = `${getbaseURL()}/api/lockReason`;
+const endpoint = "/api/lockReason";
 
 describe("getLockReason", () => {
     before(async () => {
@@ -27,71 +26,65 @@ describe("getLockReason", () => {
         else return `Version isn't greater than 20. Version is ${version}`;
     });
 
-    it("Should be able to get single reason", (done: Done) => {
-        fetch(`${endpoint}?videoID=getLockReason&category=sponsor`)
-            .then(async res => {
+    it("Should be able to get single reason", (done) => {
+        client.get(endpoint, { params: { videoID: "getLockReason", category: "sponsor" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [
                     { category: "sponsor", locked: 1, reason: "sponsor-reason" }
                 ];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get empty locks", (done: Done) => {
-        fetch(`${endpoint}?videoID=getLockReason&category=intro`)
-            .then(async res => {
+    it("Should be able to get empty locks", (done) => {
+        client.get(endpoint, { params: { videoID: "getLockReason", category: "intro" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [
                     { category: "intro", locked: 0, reason: "" }
                 ];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should get multiple locks with array", (done: Done) => {
-        fetch(`${endpoint}?videoID=getLockReason&categories=["intro","sponsor"]`)
-            .then(async res => {
+    it("should get multiple locks with array", (done) => {
+        client.get(endpoint, { params: { videoID: "getLockReason", categories: `["intro","sponsor"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [
                     { category: "sponsor", locked: 1, reason: "sponsor-reason" },
-                    { category: "intro", locked: 0, reason: ""}
+                    { category: "intro", locked: 0, reason: "" }
                 ];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should get multiple locks with repeated category", (done: Done) => {
-        fetch(`${endpoint}?videoID=getLockReason&category=interaction&category=music_offtopic&category=intro`)
-            .then(async res => {
+    it("should get multiple locks with repeated category", (done) => {
+        client.get(`${endpoint}?videoID=getLockReason&category=interaction&category=music_offtopic&category=intro`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [
                     { category: "interaction", locked: 1, reason: "interaction-reason" },
                     { category: "music_offtopic", locked: 1, reason: "nonmusic-reason" },
                     { category: "intro", locked: 0, reason: "" }
                 ];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should return all categories if none specified", (done: Done) => {
-        fetch(`${endpoint}?videoID=getLockReason`)
-            .then(async res => {
+    it("should return all categories if none specified", (done) => {
+        client.get(endpoint, { params: { videoID: "getLockReason" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                console.log(data);
                 const expected = [
                     { category: "sponsor", locked: 1, reason: "sponsor-reason" },
                     { category: "interaction", locked: 1, reason: "interaction-reason" },
@@ -102,14 +95,14 @@ describe("getLockReason", () => {
                     { category: "outro", locked: 0, reason: "" },
                     { category: "poi_highlight", locked: 0, reason: "" }
                 ];
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should return 400 if no videoID specified", (done: Done) => {
-        fetch(endpoint)
+    it("should return 400 if no videoID specified", (done) => {
+        client.get(endpoint)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();

test/cases/getSavedTimeForUser.ts

@@ -1,27 +1,27 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
-import assert from "assert";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { deepStrictEqual } from "assert";
+import { client } from "../utils/httpClient";
+const endpoint = "/api/getSavedTimeForUser";
 
 describe("getSavedTimeForUser", () => {
+    const user1 = "getSavedTimeForUserUser";
     before(async () => {
-        const startOfQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden", "hashedVideoID") VALUES';
-        await db.prepare("run", `${startOfQuery}(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-            ["getSavedTimeForUser", 1, 11, 2, "abc1239999", getHash("testman"), 0, 50, "sponsor", 0, getHash("getSavedTimeForUser", 0)]);
+        const startOfQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", "views", "shadowHidden") VALUES';
+        await db.prepare("run", `${startOfQuery}(?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+            ["getSavedTimeForUser", 1, 11, 2, "gstfu0", getHash(user1), 0, 50, 0]);
         return;
     });
 
-    it("Should be able to get a 200", (done: Done) => {
-        fetch(`${getbaseURL()}/api/getSavedTimeForUser?userID=testman`)
-            .then(async res => {
-                const data = await res.json();
+    it("Should be able to get a 200", (done) => {
+        client.get(endpoint, { params: { userID: user1 } })
+            .then(res => {
                 // (end-start)*minute * views
                 const savedMinutes = ((11-1)/60) * 50;
                 const expected = {
                     timeSaved: savedMinutes
                 };
-                assert.deepStrictEqual(data, expected);
+                deepStrictEqual(res.data, expected);
                 done();
             })
             .catch((err) => done(err));

test/cases/getSearchSegments.ts

@@ -1,42 +1,42 @@
-import fetch from "node-fetch";
-import {db} from "../../src/databases/databases";
-import {Done, getbaseURL} from "../utils";
+import { db } from "../../src/databases/databases";
+import { client } from "../utils/httpClient";
 import assert from "assert";
 
 describe("getSearchSegments", () => {
+    const endpoint = "/api/searchSegments";
     before(async () => {
         const query = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "views", "locked", "hidden", "shadowHidden", "timeSubmitted", "UUID", "userID", "category", "actionType") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        await db.prepare("run", query, ["searchTest0", 0, 1,    2, 0,   0, 0, 0, 1, "search-normal", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest0", 0, 2,    -2, 0,  0, 0, 0, 2, "search-downvote", "testman", "selfpromo", "skip",]);
-        await db.prepare("run", query, ["searchTest0", 0, 3,    1, 0,   1, 0, 0, 3, "search-locked", "testman", "interaction", "skip"]);
-        await db.prepare("run", query, ["searchTest0", 0, 4,    1, 0,   0, 1, 0, 4, "search-hidden", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest0", 0, 5,    1, 0,   0, 0, 1, 5, "search-shadowhidden", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest1", 1, 2,    1, 5,   0, 0, 0, 6, "search-lowview", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest1", 1, 3,    1, 50,  0, 0, 0, 7, "search-highview", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest2", 1, 4,    -1, 0,  0, 0, 0, 8, "search-lowvote", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest2", 2, 3,    0, 0,   0, 0, 0, 9, "search-zerovote", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest2", 2, 4,    50, 0,  0, 0, 0, 10, "search-highvote", "testman", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest0", 0, 1,    2, 0,   0, 0, 0, 1, "search-normal",        "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest0", 0, 2,    -2, 0,  0, 0, 0, 2, "search-downvote",      "searchTestUser", "selfpromo", "skip",]);
+        await db.prepare("run", query, ["searchTest0", 0, 3,    1, 0,   1, 0, 0, 3, "search-locked",        "searchTestUser", "interaction", "skip"]);
+        await db.prepare("run", query, ["searchTest0", 0, 4,    1, 0,   0, 1, 0, 4, "search-hidden",        "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest0", 0, 5,    1, 0,   0, 0, 1, 5, "search-shadowhidden",  "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest1", 1, 2,    1, 5,   0, 0, 0, 6, "search-lowview",       "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest1", 1, 3,    1, 50,  0, 0, 0, 7, "search-highview",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest2", 1, 4,    -1, 0,  0, 0, 0, 8, "search-lowvote",       "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest2", 2, 3,    0, 0,   0, 0, 0, 9, "search-zerovote",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest2", 2, 4,    50, 0,  0, 0, 0, 10, "search-highvote",     "searchTestUser", "sponsor", "skip"]);
         // page
-        await db.prepare("run", query, ["searchTest4", 3, 4,    1, 0,   0, 0, 0, 10, "search-page1-1", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 5,    1, 0,   0, 0, 0, 11, "search-page1-2", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 6,    1, 0,   0, 0, 0, 12, "search-page1-3", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 7,    1, 0,   0, 0, 0, 13, "search-page1-4", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 8,    1, 0,   0, 0, 0, 14, "search-page1-5", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 9,    1, 0,   0, 0, 0, 15, "search-page1-6", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 10,   1, 0,   0, 0, 0, 16, "search-page1-7", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 11,   1, 0,   0, 0, 0, 17, "search-page1-8", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 12,   1, 0,   0, 0, 0, 18, "search-page1-9", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 13,   1, 0,   0, 0, 0, 19, "search-page1-10", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 14,   1, 0,   0, 0, 0, 20, "search-page2-1", "testman", "sponsor", "skip"]);
-        await db.prepare("run", query, ["searchTest4", 3, 15,   1, 0,   0, 0, 0, 21, "search-page2-2", "testman", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 4,    1, 0,   0, 0, 0, 10, "search-page1-1",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 5,    1, 0,   0, 0, 0, 11, "search-page1-2",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 6,    1, 0,   0, 0, 0, 12, "search-page1-3",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 7,    1, 0,   0, 0, 0, 13, "search-page1-4",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 8,    1, 0,   0, 0, 0, 14, "search-page1-5",       "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 9,    1, 0,   0, 0, 0, 15, "search-page1-6",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 10,   1, 0,   0, 0, 0, 16, "search-page1-7",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 11,   1, 0,   0, 0, 0, 17, "search-page1-8",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 12,   1, 0,   0, 0, 0, 18, "search-page1-9",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 13,   1, 0,   0, 0, 0, 19, "search-page1-10",     "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 14,   1, 0,   0, 0, 0, 20, "search-page2-1",      "searchTestUser", "sponsor", "skip"]);
+        await db.prepare("run", query, ["searchTest4", 3, 15,   1, 0,   0, 0, 0, 21, "search-page2-2",      "searchTestUser", "sponsor", "skip"]);
         return;
     });
 
-    it("Should be able to show all segments under searchTest0", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest0`)
-            .then(async res => {
+    it("Should be able to show all segments under searchTest0", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest0" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 5);
                 assert.strictEqual(data.page, 0);
@@ -50,11 +50,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter by category", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest0&category=selfpromo`)
-            .then(async res => {
+    it("Should be able to filter by category", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest0", category: "selfpromo" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 1);
                 assert.strictEqual(data.page, 0);
@@ -64,11 +64,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter by category", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest0&category=selfpromo`)
-            .then(async res => {
+    it("Should be able to filter by category", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest0", category: "selfpromo" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 1);
                 assert.strictEqual(data.page, 0);
@@ -78,11 +78,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter by lock status", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest0&locked=false`)
-            .then(async res => {
+    it("Should be able to filter by lock status", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest0", locked: false } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 4);
                 assert.strictEqual(data.page, 0);
@@ -95,11 +95,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter by hide status", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest0&hidden=false`)
-            .then(async res => {
+    it("Should be able to filter by hide status", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest0", hidden: false } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 4);
                 assert.strictEqual(data.page, 0);
@@ -112,11 +112,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter by ignored status", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest0&ignored=false`)
-            .then(async res => {
+    it("Should be able to filter by ignored status", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest0", ignored: false } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 3);
                 assert.strictEqual(data.page, 0);
@@ -128,11 +128,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter segments by min views", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest1&minViews=6`)
-            .then(async res => {
+    it("Should be able to filter segments by min views", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest1", minViews: 6 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 1);
                 assert.strictEqual(data.page, 0);
@@ -142,11 +142,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter segments by max views", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest1&maxViews=10`)
-            .then(async res => {
+    it("Should be able to filter segments by max views", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest1", maxViews: 10 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 1);
                 assert.strictEqual(data.page, 0);
@@ -156,11 +156,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter segments by min and max views", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest1&maxViews=10&minViews=1`)
-            .then(async res => {
+    it("Should be able to filter segments by min and max views", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest1", maxViews: 10, minViews: 1 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 1);
                 assert.strictEqual(data.page, 0);
@@ -170,11 +170,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter segments by min votes", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest2&minVotes=0`)
-            .then(async res => {
+    it("Should be able to filter segments by min votes", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest2", minVotes: 0 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 2);
                 assert.strictEqual(data.page, 0);
@@ -185,11 +185,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter segments by max votes", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest2&maxVotes=10`)
-            .then(async res => {
+    it("Should be able to filter segments by max votes", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest2", maxVotes: 10 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 2);
                 assert.strictEqual(data.page, 0);
@@ -200,11 +200,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to filter segments by both min and max votes", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest2&maxVotes=10&minVotes=0`)
-            .then(async res => {
+    it("Should be able to filter segments by both min and max votes", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest2", maxVotes: 10, minVotes: 0 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 1);
                 assert.strictEqual(data.page, 0);
@@ -214,11 +214,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get first page of results", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest4`)
-            .then(async res => {
+    it("Should be able to get first page of results", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest4" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 12);
                 assert.strictEqual(data.page, 0);
@@ -237,11 +237,11 @@ describe("getSearchSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get second page of results", (done: Done) => {
-        fetch(`${getbaseURL()}/api/searchSegments?videoID=searchTest4&page=1`)
-            .then(async res => {
+    it("Should be able to get second page of results", (done) => {
+        client.get(endpoint, { params: { videoID: "searchTest4", page: 1 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const segments = data.segments;
                 assert.strictEqual(data.segmentCount, 12);
                 assert.strictEqual(data.page, 1);

test/cases/getSegmentInfo.ts

@@ -1,8 +1,7 @@
-import fetch from "node-fetch";
-import {db} from "../../src/databases/databases";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {getHash} from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 const ENOENTID =        "0".repeat(64);
 const upvotedID =       `a${"0".repeat(63)}`;
@@ -26,181 +25,175 @@ const userAgents = {
     blank: ""
 };
 
+const endpoint = "/api/segmentInfo";
+const singleUUIDLookup = (UUID: string) => client.get(endpoint, { params: { UUID } });
+
 describe("getSegmentInfo", () => {
     before(async () => {
         const insertQuery = `INSERT INTO 
             "sponsorTimes"("videoID", "startTime", "endTime", "votes", "locked",
-            "UUID", "userID", "timeSubmitted", "views", "category", "service",
-            "videoDuration", "hidden", "shadowHidden", "hashedVideoID", "userAgent") 
-            VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
-        await db.prepare("run", insertQuery, ["upvoted", 1, 10, 2, 0, upvotedID, "testman", 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash("upvoted", 1), userAgents.vanced]);
-        await db.prepare("run", insertQuery, ["downvoted", 1, 10, -2, 0, downvotedID, "testman", 0, 50, "sponsor", "YouTube", 120, 0, 0, getHash("downvoted", 1), userAgents.meabot]);
-        await db.prepare("run", insertQuery, ["locked-up", 1, 10, 2, 1, lockedupID, "testman", 0, 50, "sponsor", "YouTube", 101, 0, 0, getHash("locked-up", 1), userAgents.mpv]);
-        await db.prepare("run", insertQuery, ["infvotes", 1, 10, 100000, 0, infvotesID, "testman", 0, 50, "sponsor", "YouTube", 101, 0, 0, getHash("infvotes", 1), userAgents.nodesb]);
-        await db.prepare("run", insertQuery, ["hidden", 1, 10, 2, 0, hiddenID, "testman", 0, 50, "sponsor", "YouTube", 140, 1, 0, getHash("hidden", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["shadowhidden", 1, 10, 2, 0, shadowhiddenID, "testman", 0, 50, "sponsor", "YouTube", 140, 0, 1, getHash("shadowhidden", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["locked-down", 1, 10, -2, 1, lockeddownID, "testman", 0, 50, "sponsor", "YouTube", 200, 0, 0, getHash("locked-down", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["oldID", 1, 10, 1, 0, oldID, "testman", 0, 50, "sponsor", "YouTube", 300, 0, 0, getHash("oldID", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["filler", 1, 2, 1, 0, fillerID1, "testman", 0, 50, "sponsor", "YouTube", 300, 0, 0, getHash("filler", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["filler", 2, 3, 1, 0, fillerID2, "testman", 0, 50, "sponsor", "YouTube", 300, 0, 0, getHash("filler", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["filler", 3, 4, 1, 0, fillerID3, "testman", 0, 50, "sponsor", "YouTube", 300, 0, 0, getHash("filler", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["filler", 4, 5, 1, 0, fillerID4, "testman", 0, 50, "sponsor", "YouTube", 300, 0, 0, getHash("filler", 1), userAgents.blank]);
-        await db.prepare("run", insertQuery, ["filler", 5, 6, 1, 0, fillerID5, "testman", 0, 50, "sponsor", "YouTube", 300, 0, 0, getHash("filler", 1), userAgents.blank]);
+            "UUID", "userID", "timeSubmitted", "views", "hidden", "shadowHidden", "userAgent") 
+            VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
+        await db.prepare("run", insertQuery, ["segmentInfoUpvoted", 1, 10, 2, 0, upvotedID,             "segmentInfoUser", 0, 50, 0, 0, userAgents.vanced]);
+        await db.prepare("run", insertQuery, ["segmentInfoDownvoted", 1, 10, -2, 0, downvotedID,        "segmentInfoUser", 0, 50, 0, 0, userAgents.meabot]);
+        await db.prepare("run", insertQuery, ["segmentInfoLockedup", 1, 10, 2, 1, lockedupID,           "segmentInfoUser", 0, 50, 0, 0, userAgents.mpv]);
+        await db.prepare("run", insertQuery, ["segmentInfoInfvotes", 1, 10, 100000, 0, infvotesID,      "segmentInfoUser", 0, 50, 0, 0, userAgents.nodesb]);
+        await db.prepare("run", insertQuery, ["segmentInfoHidden", 1, 10, 2, 0, hiddenID,               "segmentInfoUser", 0, 50, 1, 0, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoShadowhidden", 1, 10, 2, 0, shadowhiddenID,   "segmentInfoUser", 0, 50, 0, 1, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoLockedown", 1, 10, -2, 1, lockeddownID,       "segmentInfoUser", 0, 50, 0, 0, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoOldID", 1, 10, 1, 0, oldID,                   "segmentInfoUser", 0, 50, 0, 0, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoUpvoted", 1, 2, 1, 0, fillerID1,              "segmentInfoUser", 0, 50, 0, 0, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoFiller", 2, 3, 1, 0, fillerID2,               "segmentInfoUser", 0, 50, 0, 0, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoFiller", 3, 4, 1, 0, fillerID3,               "segmentInfoUser", 0, 50, 0, 0, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoFiller", 4, 5, 1, 0, fillerID4,               "segmentInfoUser", 0, 50, 0, 0, userAgents.blank]);
+        await db.prepare("run", insertQuery, ["segmentInfoFiller", 5, 6, 1, 0, fillerID5,               "segmentInfoUser", 0, 50, 0, 0, userAgents.blank]);
     });
 
-    it("Should be able to retreive upvoted segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${upvotedID}`)
-            .then(async res => {
+    it("Should be able to retreive upvoted segment", (done) => {
+        singleUUIDLookup(upvotedID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "upvoted",
+                    videoID: "segmentInfoUpvoted",
                     votes: 2,
                     userAgent: userAgents.vanced,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive downvoted segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${downvotedID}`)
-            .then(async res => {
+    it("Should be able to retreive downvoted segment", (done) => {
+        singleUUIDLookup(downvotedID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "downvoted",
+                    videoID: "segmentInfoDownvoted",
                     votes: -2,
                     userAgent: userAgents.meabot,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive locked up segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${lockedupID}`)
-            .then(async res => {
+    it("Should be able to retreive locked up segment", (done) => {
+        singleUUIDLookup(lockedupID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "locked-up",
+                    videoID: "segmentInfoLockedup",
                     locked: 1,
                     votes: 2,
                     userAgent: userAgents.mpv,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive infinite vote segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${infvotesID}`)
-            .then(async res => {
+    it("Should be able to retreive infinite vote segment", (done) => {
+        singleUUIDLookup(infvotesID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "infvotes",
+                    videoID: "segmentInfoInfvotes",
                     votes: 100000,
                     userAgent: userAgents.nodesb,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive shadowhidden segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${shadowhiddenID}`)
-            .then(async res => {
+    it("Should be able to retreive shadowhidden segment", (done) => {
+        singleUUIDLookup(shadowhiddenID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "shadowhidden",
+                    videoID: "segmentInfoShadowhidden",
                     shadowHidden: 1,
                     userAgent: userAgents.blank,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive locked down segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${lockeddownID}`)
-            .then(async res => {
+    it("Should be able to retreive locked down segment", (done) => {
+        singleUUIDLookup(lockeddownID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "locked-down",
+                    videoID: "segmentInfoLockedown",
                     locked: 1,
                     votes: -2,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive hidden segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${hiddenID}`)
-            .then(async res => {
+    it("Should be able to retreive hidden segment", (done) => {
+        singleUUIDLookup(hiddenID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "hidden",
+                    videoID: "segmentInfoHidden",
                     hidden: 1,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive segment with old ID", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${oldID}`)
-            .then(async res => {
+    it("Should be able to retreive segment with old ID", (done) => {
+        singleUUIDLookup(oldID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "oldID",
+                    videoID: "segmentInfoOldID",
                     votes: 1,
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive single segment in array", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUIDs=["${upvotedID}"]`)
-            .then(async res => {
+    it("Should be able to retreive single segment in array", (done) => {
+        client.get(endpoint, { params: { UUIDs: `["${upvotedID}"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
-                    videoID: "upvoted",
+                    videoID: "segmentInfoUpvoted",
                     votes: 2,
                 }];
                 assert.strictEqual(data.length, 1);
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive multiple segments in array", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUIDs=["${upvotedID}", "${downvotedID}"]`)
-            .then(async res => {
+    it("Should be able to retreive multiple segments in array", (done) => {
+        client.get(endpoint, { params: { UUIDs: `["${upvotedID}", "${downvotedID}"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
-                    videoID: "upvoted",
+                    videoID: "segmentInfoUpvoted",
                     votes: 2,
                 }, {
-                    videoID: "downvoted",
+                    videoID: "segmentInfoDownvoted",
                     votes: -2,
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -210,13 +203,13 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should be possible to send unexpected query parameters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${upvotedID}&fakeparam=hello&category=sponsor`)
-            .then(async res => {
+    it("Should be possible to send unexpected query parameters", (done) => {
+        client.get(endpoint, { params: { UUID: upvotedID, fakeparam: "hello", category: "sponsor" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
-                    videoID: "upvoted",
+                    videoID: "segmentInfoUpvoted",
                     votes: 2,
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -225,8 +218,8 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 if array passed to UUID", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=["${upvotedID}", "${downvotedID}"]`)
+    it("Should return 400 if array passed to UUID", (done) => {
+        client.get(`${endpoint}?UUID=["${upvotedID}", "${downvotedID}"]`)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -234,8 +227,8 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 if bad array passed to UUIDs", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUIDs=[not-quoted,not-quoted]`)
+    it("Should return 400 if bad array passed to UUIDs", (done) => {
+        client.get(`${endpoint}?UUIDs=[not-quoted,not-quoted]`)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -243,8 +236,8 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 if bad UUID passed", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=notarealuuid`)
+    it("Should return 400 if bad UUID passed", (done) => {
+        client.get(`${endpoint}?UUID=notarealuuid`)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -252,8 +245,8 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 if bad UUIDs passed in array", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUIDs=["notarealuuid", "anotherfakeuuid"]`)
+    it("Should return 400 if bad UUIDs passed in array", (done) => {
+        client.get(`${endpoint}?UUIDs=["notarealuuid", "anotherfakeuuid"]`)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -261,13 +254,13 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should return good UUID when mixed with bad UUIDs", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUIDs=["${upvotedID}", "anotherfakeuuid"]`)
-            .then(async res => {
+    it("Should return good UUID when mixed with bad UUIDs", (done) => {
+        client.get(`${endpoint}?UUIDs=["${upvotedID}", "anotherfakeuuid"]`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
-                    videoID: "upvoted",
+                    videoID: "segmentInfoUpvoted",
                     votes: 2,
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -277,53 +270,52 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should cut off array at 10", function(done: Done) {
+    it("Should cut off array at 10", function(done) {
         this.timeout(10000);
         const filledIDArray = `["${upvotedID}", "${downvotedID}", "${lockedupID}", "${shadowhiddenID}", "${lockeddownID}", "${hiddenID}", "${fillerID1}", "${fillerID2}", "${fillerID3}", "${fillerID4}", "${fillerID5}"]`;
-        fetch(`${getbaseURL()}/api/segmentInfo?UUIDs=${filledIDArray}`)
-            .then(async res => {
+        client.get(endpoint, { params: { UUIDs: filledIDArray } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 10);
-                assert.strictEqual(data[0].videoID, "upvoted");
+                assert.strictEqual(data[0].videoID, "segmentInfoUpvoted");
                 assert.strictEqual(data[0].votes, 2);
-                assert.strictEqual(data[9].videoID, "filler");
+                assert.strictEqual(data[9].videoID, "segmentInfoFiller");
                 assert.strictEqual(data[9].UUID, fillerID4);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not duplicate reponses", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUIDs=["${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${downvotedID}"]`)
-            .then(async res => {
+    it("Should not duplicate reponses", (done) => {
+        client.get(`${endpoint}?UUIDs=["${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${upvotedID}", "${downvotedID}"]`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.strictEqual(data.length, 2);
+                assert.strictEqual(res.data.length, 2);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should return 400 if UUID not found", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${ENOENTID}`)
+    it("Should return 400 if UUID not found", (done) => {
+        client.get(endpoint, { params: { UUID: ENOENTID } })
             .then(res => {
-                if (res.status !== 400) done(`non 400 respone code: ${res.status}`);
+                if (res.status !== 400) done(`non 400 response code: ${res.status}`);
                 else done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to retreive multiple segments with multiple parameters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${upvotedID}&UUID=${downvotedID}`)
-            .then(async res => {
+    it("Should be able to retreive multiple segments with multiple parameters", (done) => {
+        client.get(`${endpoint}?UUID=${upvotedID}&UUID=${downvotedID}`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
-                    videoID: "upvoted",
+                    videoID: "segmentInfoUpvoted",
                     votes: 2,
                 }, {
-                    videoID: "downvoted",
+                    videoID: "segmentInfoDownvoted",
                     votes: -2,
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -333,16 +325,15 @@ describe("getSegmentInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should not parse repeated UUID if UUIDs present", (done: Done) => {
-        fetch(`${getbaseURL()}/api/segmentInfo?UUID=${downvotedID}&UUID=${lockedupID}&UUIDs=["${upvotedID}"]`)
-            .then(async res => {
+    it("Should not parse repeated UUID if UUIDs present", (done) => {
+        client.get(`${endpoint}?UUID=${downvotedID}&UUID=${lockedupID}&UUIDs=["${upvotedID}"]`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = [{
-                    videoID: "upvoted",
+                    videoID: "segmentInfoUpvoted",
                     votes: 2
                 }];
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));

test/cases/getService.ts

@@ -1,6 +1,5 @@
 import { getService } from "../../src/utils/getService";
 import { Service } from "../../src/types/segments.model";
-
 import assert from "assert";
 
 describe("getService", () => {

test/cases/getSkipSegments.ts

@@ -1,57 +1,56 @@
-import fetch from "node-fetch";
-import {db} from "../../src/databases/databases";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {getHash} from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 describe("getSkipSegments", () => {
+    const endpoint = "/api/skipSegments";
     before(async () => {
-        const query = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", views, category, "actionType", "service", "videoDuration", "hidden", "shadowHidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        await db.prepare("run", query, ["testtesttest", 1, 11, 2, 0, "1-uuid-0", "testman", 0, 50, "sponsor", "skip", "YouTube", 100, 0, 0, getHash("testtesttest", 1)]);
-        await db.prepare("run", query, ["testtesttest2", 1, 11, 2, 0, "1-uuid-0-1", "testman", 0, 50, "sponsor", "skip", "PeerTube", 120, 0, 0, getHash("testtesttest2", 1)]);
-        await db.prepare("run", query, ["testtesttest", 12, 14, 2, 0, "1-uuid-0-2", "testman", 0, 50, "sponsor", "mute", "YouTube", 100, 0, 0, getHash("testtesttest", 1)]);
-        await db.prepare("run", query, ["testtesttest", 20, 33, 2, 0, "1-uuid-2", "testman", 0, 50, "intro", "skip", "YouTube", 101, 0, 0, getHash("testtesttest", 1)]);
-        await db.prepare("run", query, ["testtesttest,test", 1, 11, 2, 0, "1-uuid-1", "testman", 0, 50, "sponsor", "skip", "YouTube", 140, 0, 0, getHash("testtesttest,test", 1)]);
-        await db.prepare("run", query, ["test3", 1, 11, 2, 0, "1-uuid-4", "testman", 0, 50, "sponsor", "skip", "YouTube", 200, 0, 0, getHash("test3", 1)]);
-        await db.prepare("run", query, ["test3", 7, 22, -3, 0, "1-uuid-5", "testman", 0, 50, "sponsor", "skip", "YouTube", 300, 0, 0, getHash("test3", 1)]);
-        await db.prepare("run", query, ["multiple", 1, 11, 2, 0, "1-uuid-6", "testman", 0, 50, "intro", "skip", "YouTube", 400, 0, 0, getHash("multiple", 1)]);
-        await db.prepare("run", query, ["multiple", 20, 33, 2, 0, "1-uuid-7", "testman", 0, 50, "intro", "skip", "YouTube", 500, 0, 0, getHash("multiple", 1)]);
-        await db.prepare("run", query, ["locked", 20, 33, 2, 1, "1-uuid-locked-8", "testman", 0, 50, "intro", "skip", "YouTube", 230, 0, 0, getHash("locked", 1)]);
-        await db.prepare("run", query, ["locked", 20, 34, 100000, 0, "1-uuid-9", "testman", 0, 50, "intro", "skip", "YouTube", 190, 0, 0, getHash("locked", 1)]);
-        await db.prepare("run", query, ["onlyHiddenSegments", 20, 34, 100000, 0, "onlyHiddenSegments", "testman", 0, 50, "sponsor", "skip", "YouTube", 190, 1, 0, getHash("onlyHiddenSegments", 1)]);
-        await db.prepare("run", query, ["requiredSegmentVid-raw", 60, 70, 2, 0, "requiredSegmentVid-raw-1", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)]);
-        await db.prepare("run", query, ["requiredSegmentVid-raw", 60, 70, -2, 0, "requiredSegmentVid-raw-2", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)]);
-        await db.prepare("run", query, ["requiredSegmentVid-raw", 80, 90, -2, 0, "requiredSegmentVid-raw-3", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)]);
-        await db.prepare("run", query, ["requiredSegmentVid-raw", 80, 90, 2, 0, "requiredSegmentVid-raw-4", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0, getHash("requiredSegmentVid-raw", 1)]);
+        const query = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "category", "actionType", "service", "videoDuration", "hidden", "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+        await db.prepare("run", query, ["getSkipSegmentID0", 1, 11, 2, 0, "uuid01", "testman", 0, 50, "sponsor", "skip", "YouTube", 100, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID0", 12, 14, 2, 0, "uuid02", "testman", 0, 50, "sponsor", "mute", "YouTube", 100, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID0", 20, 33, 2, 0, "uuid03", "testman", 0, 50, "intro", "skip", "YouTube", 101, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID1", 1, 11, 2, 0, "uuid10", "testman", 0, 50, "sponsor", "skip", "PeerTube", 120, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID2", 1, 11, 2, 0, "uuid20", "testman", 0, 50, "sponsor", "skip", "YouTube", 140, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID3", 1, 11, 2, 0, "uuid30", "testman", 0, 50, "sponsor", "skip", "YouTube", 200, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID3", 7, 22, -3, 0, "uuid31", "testman", 0, 50, "sponsor", "skip", "YouTube", 300, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentMultiple", 1, 11, 2, 0, "uuid40", "testman", 0, 50, "intro", "skip", "YouTube", 400, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentMultiple", 20, 33, 2, 0, "uuid41", "testman", 0, 50, "intro", "skip", "YouTube", 500, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentLocked", 20, 33, 2, 1, "uuid50", "testman", 0, 50, "intro", "skip", "YouTube", 230, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentLocked", 20, 34, 100000, 0, "uuid51", "testman", 0, 50, "intro", "skip", "YouTube", 190, 0, 0]);
+        await db.prepare("run", query, ["getSkipSegmentID6", 20, 34, 100000, 0, "uuid60", "testman", 0, 50, "sponsor", "skip", "YouTube", 190, 1, 0]);
+        await db.prepare("run", query, ["requiredSegmentVid", 60, 70, 2, 0, "requiredSegmentVid1", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0]);
+        await db.prepare("run", query, ["requiredSegmentVid", 60, 70, -2, 0, "requiredSegmentVid2", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0]);
+        await db.prepare("run", query, ["requiredSegmentVid", 80, 90, -2, 0, "requiredSegmentVid3", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0]);
+        await db.prepare("run", query, ["requiredSegmentVid", 80, 90, 2, 0, "requiredSegmentVid4", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, 0]);
         return;
     });
 
-
-    it("Should be able to get a time by category 1", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&category=sponsor`)
-            .then(async res => {
+    it("Should be able to get a time by category 1", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", category: "sponsor" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 assert.strictEqual(data[0].segment[0], 1);
                 assert.strictEqual(data[0].segment[1], 11);
                 assert.strictEqual(data[0].category, "sponsor");
-                assert.strictEqual(data[0].UUID, "1-uuid-0");
+                assert.strictEqual(data[0].UUID, "uuid01");
                 assert.strictEqual(data[0].videoDuration, 100);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get a time by category and action type", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&category=sponsor&actionType=mute`)
-            .then(async res => {
+    it("Should be able to get a time by category and action type", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", category: "sponsor", actionType: "mute" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
                     segment: [12, 14],
                     category: "sponsor",
-                    UUID: "1-uuid-0-2",
+                    UUID: "uuid02",
                     videoDuration: 100
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -61,18 +60,18 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get a time by category and multiple action types", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&category=sponsor&actionType=mute&actionType=skip`)
-            .then(async res => {
+    it("Should be able to get a time by category and getSkipSegmentMultiple action types", (done) => {
+        client.get(`${endpoint}?videoID=getSkipSegmentID0&category=sponsor&actionType=mute&actionType=skip`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-0",
+                    UUID: "uuid01",
                     videoDuration: 100
                 }, {
-                    UUID: "1-uuid-0-2"
+                    UUID: "uuid02"
                 }];
                 assert.strictEqual(data.length, 2);
                 assert.ok(partialDeepEquals(data, expected));
@@ -81,18 +80,18 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get a time by category and multiple action types (JSON array)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&category=sponsor&actionTypes=["mute","skip"]`)
-            .then(async res => {
+    it("Should be able to get a time by category and getSkipSegmentMultiple action types (JSON array)", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", category: "sponsor", actionTypes: `["mute","skip"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-0",
+                    UUID: "uuid01",
                     videoDuration: 100
                 }, {
-                    UUID: "1-uuid-0-2"
+                    UUID: "uuid02"
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -100,15 +99,15 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get a time by category for a different service 1", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest2&category=sponsor&service=PeerTube`)
-            .then(async res => {
+    it("Should be able to get a time by category for a different service 1", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID1", category: "sponsor", service: "PeerTube" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-0-1",
+                    UUID: "uuid10",
                     videoDuration: 120
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -118,61 +117,61 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get a time by category 2", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&category=intro`)
-            .then(async res => {
+    it("Should be able to get a time by category 2", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", category: "intro" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
+                assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [20, 33],
                     category: "intro",
-                    UUID: "1-uuid-2"
+                    UUID: "uuid03"
                 }];
                 assert.ok(partialDeepEquals(data, expected));
-                assert.strictEqual(data.length, 1);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get a time by categories array", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&categories=["sponsor"]`)
-            .then(async res => {
+    it("Should be able to get a time by categories array", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", categories: `["sponsor"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
+                assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-0",
+                    UUID: "uuid01",
                     videoDuration: 100
                 }];
                 assert.ok(partialDeepEquals(data, expected));
-                assert.strictEqual(data.length, 1);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get a time by categories array 2", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&categories=["intro"]`)
-            .then(async res => {
+    it("Should be able to get a time by categories array 2", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", categories: `["intro"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
+                assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [20, 33],
                     category: "intro",
-                    UUID: "1-uuid-2",
+                    UUID: "uuid03",
                     videoDuration: 101
                 }];
                 assert.ok(partialDeepEquals(data, expected));
-                assert.strictEqual(data.length, 1);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should return 404 if all submissions are hidden", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=onlyHiddenSegments`)
+    it("Should return 404 if all submissions are hidden", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID6" } })
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -180,20 +179,20 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get multiple times by category", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=multiple&categories=["intro"]`)
-            .then(async res => {
+    it("Should be able to get getSkipSegmentMultiple times by category", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentMultiple",  categories: `["intro"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 const expected = [{
                     segment: [1, 11],
                     category: "intro",
-                    UUID: "1-uuid-6",
+                    UUID: "uuid40",
                 }, {
                     segment: [20, 33],
                     category: "intro",
-                    UUID: "1-uuid-7",
+                    UUID: "uuid41",
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -201,37 +200,20 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get multiple times by multiple categories", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&categories=["sponsor", "intro"]`)
-            .then(async res => {
+    it("Should be able to get getSkipSegmentMultiple times by getSkipSegmentMultiple categories", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", categories: `["sponsor", "intro"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                const expected = [{
-                    segment: [1, 11],
-                    category: "sponsor",
-                    UUID: "1-uuid-0",
-                }, {
-                    segment: [20, 33],
-                    category: "intro",
-                    UUID: "1-uuid-2",
-                }];
-                assert.ok(partialDeepEquals(data, expected));
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("Should be possible to send unexpected query parameters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&fakeparam=hello&category=sponsor`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-0",
+                    UUID: "uuid01",
+                }, {
+                    segment: [20, 33],
+                    category: "intro",
+                    UUID: "uuid03",
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -239,16 +221,16 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Low voted submissions should be hidden", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=test3&category=sponsor`)
-            .then(async res => {
+    it("Should be possible to send unexpected query parameters", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", fakeparam: "hello", category: "sponsor" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-4",
+                    UUID: "uuid01",
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -256,8 +238,25 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 404 if no segment found", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=notarealvideo`)
+    it("Low voted submissions should be hidden", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID3", category: "sponsor" } })
+            .then(res => {
+                assert.strictEqual(res.status, 200);
+                const data = res.data;
+                assert.strictEqual(data.length, 1);
+                const expected = [{
+                    segment: [1, 11],
+                    category: "sponsor",
+                    UUID: "uuid30",
+                }];
+                assert.ok(partialDeepEquals(data, expected));
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Should return 404 if no segment found", (done) => {
+        client.get(endpoint, { params: { videoID: "notarealvideo" } })
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -265,8 +264,8 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 if bad categories argument", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&categories=[not-quoted,not-quoted]`)
+    it("Should return 400 if bad categories argument", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID0", categories: `[not-quoted,not-quoted]` } })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -274,16 +273,16 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able send a comma in a query param", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest,test&category=sponsor`)
-            .then(async res => {
+    it("Should be able send a comma in a query param", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentID2", category: "sponsor" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-1",
+                    UUID: "uuid20",
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -291,16 +290,16 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should always get locked segment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=locked&category=intro`)
-            .then(async res => {
+    it("Should always get getSkipSegmentLocked segment", (done) => {
+        client.get(endpoint, { params: { videoID: "getSkipSegmentLocked", category: "intro" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [20, 33],
                     category: "intro",
-                    UUID: "1-uuid-locked-8",
+                    UUID: "uuid50",
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -308,20 +307,20 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get multiple categories with repeating parameters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&category=sponsor&category=intro`)
-            .then(async res => {
+    it("Should be able to get getSkipSegmentMultiple categories with repeating parameters", (done) => {
+        client.get(`${endpoint}?category=sponsor&category=intro`, { params: { videoID: "getSkipSegmentID0" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-0",
+                    UUID: "uuid01",
                 }, {
                     segment: [20, 33],
                     category: "intro",
-                    UUID: "1-uuid-2",
+                    UUID: "uuid03",
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -329,16 +328,16 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get, categories param overriding repeating category", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=testtesttest&categories=["sponsor"]&category=intro`)
-            .then(async res => {
+    it("Should be able to get, categories param overriding repeating category", (done) => {
+        client.get(`${endpoint}?videoID=getSkipSegmentID0&categories=["sponsor"]&category=intro`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 const expected = [{
                     segment: [1, 11],
                     category: "sponsor",
-                    UUID: "1-uuid-0",
+                    UUID: "uuid01",
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -346,16 +345,18 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get specific segments with requiredSegments", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=requiredSegmentVid-raw&requiredSegments=["requiredSegmentVid-raw-2","requiredSegmentVid-raw-3"]`)
-            .then(async res => {
+    it("Should be able to get specific segments with requiredSegments", (done) => {
+        const required2 = "requiredSegmentVid2";
+        const required3 = "requiredSegmentVid3";
+        client.get(endpoint, { params: { videoID: "requiredSegmentVid", requiredSegments: `["${required2}","${required3}"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 const expected = [{
-                    UUID: "requiredSegmentVid-raw-2",
+                    UUID: required2,
                 }, {
-                    UUID: "requiredSegmentVid-raw-3",
+                    UUID: required3,
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -363,16 +364,18 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get specific segments with repeating requiredSegment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments?videoID=requiredSegmentVid-raw&requiredSegment=requiredSegmentVid-raw-2&requiredSegment=requiredSegmentVid-raw-3`)
-            .then(async res => {
+    it("Should be able to get specific segments with repeating requiredSegment", (done) => {
+        const required2 = "requiredSegmentVid2";
+        const required3 = "requiredSegmentVid3";
+        client.get(`${endpoint}?videoID=requiredSegmentVid&requiredSegment=${required2}&requiredSegment=${required3}`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 const expected = [{
-                    UUID: "requiredSegmentVid-raw-2",
+                    UUID: required2,
                 }, {
-                    UUID: "requiredSegmentVid-raw-3",
+                    UUID: required3,
                 }];
                 assert.ok(partialDeepEquals(data, expected));
                 done();
@@ -380,9 +383,9 @@ describe("getSkipSegments", () => {
             .catch(err => done(err));
     });
 
-    it("Should get 400 if no videoID passed in", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments`)
-            .then(async res => {
+    it("Should get 400 if no videoID passed in", (done) => {
+        client.get(endpoint)
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })

test/cases/getSkipSegmentsByHash.ts

@@ -1,36 +1,39 @@
-import fetch from "node-fetch";
-import {db} from "../../src/databases/databases";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {getHash} from "../../src/utils/getHash";
-import {ImportMock,} from "ts-mock-imports";
+import { db } from "../../src/databases/databases";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
+import { getHash } from "../../src/utils/getHash";
+import { ImportMock, } from "ts-mock-imports";
 import * as YouTubeAPIModule from "../../src/utils/youtubeApi";
-import {YouTubeApiMock} from "../youtubeMock";
+import { YouTubeApiMock } from "../youtubeMock";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 const mockManager = ImportMock.mockStaticClass(YouTubeAPIModule, "YouTubeAPI");
 const sinonStub = mockManager.mock("listVideos");
 sinonStub.callsFake(YouTubeApiMock.listVideos);
 
 describe("getSkipSegmentsByHash", () => {
+    const endpoint = "/api/skipSegments";
+    const getSegmentsByHash0Hash = "fdaff4dee1043451faa7398324fb63d8618ebcd11bddfe0491c488db12c6c910";
+    const requiredSegmentVidHash = "d51822c3f681e07aef15a8855f52ad12db9eb9cf059e65b16b64c43359557f61";
     before(async () => {
         const query = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "actionType", "service", "hidden", "shadowHidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        await db.prepare("run", query, ["getSegmentsByHash-0", 1, 10, 2, "getSegmentsByHash-0-0", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, "fdaff4dee1043451faa7398324fb63d8618ebcd11bddfe0491c488db12c6c910"]);
-        await db.prepare("run", query, ["getSegmentsByHash-0", 1, 10, 2, "getSegmentsByHash-0-0-1", "testman", 0, 50, "sponsor", "skip", "PeerTube", 0, 0, "fdaff4dee1043451faa7398324fb63d8618ebcd11bddfe0491c488db12c6c910"]);
-        await db.prepare("run", query, ["getSegmentsByHash-0", 20, 30, 2, "getSegmentsByHash-0-1", "testman", 100, 150, "intro", "skip", "YouTube", 0, 0, "fdaff4dee1043451faa7398324fb63d8618ebcd11bddfe0491c488db12c6c910"]);
-        await db.prepare("run", query, ["getSegmentsByHash-0", 40, 50, 2, "getSegmentsByHash-0-2", "testman", 0, 50, "sponsor", "mute", "YouTube", 0, 0, "fdaff4dee1043451faa7398324fb63d8618ebcd11bddfe0491c488db12c6c910"]);
+        await db.prepare("run", query, ["getSegmentsByHash-0", 1, 10, 2, "getSegmentsByHash-01", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, getSegmentsByHash0Hash]);
+        await db.prepare("run", query, ["getSegmentsByHash-0", 1, 10, 2, "getSegmentsByHash-02", "testman", 0, 50, "sponsor", "skip", "PeerTube", 0, 0, getSegmentsByHash0Hash]);
+        await db.prepare("run", query, ["getSegmentsByHash-0", 20, 30, 2, "getSegmentsByHash-03", "testman", 100, 150, "intro", "skip", "YouTube", 0, 0, getSegmentsByHash0Hash]);
+        await db.prepare("run", query, ["getSegmentsByHash-0", 40, 50, 2, "getSegmentsByHash-04", "testman", 0, 50, "sponsor", "mute", "YouTube", 0, 0, getSegmentsByHash0Hash]);
         await db.prepare("run", query, ["getSegmentsByHash-noMatchHash", 40, 50, 2, "getSegmentsByHash-noMatchHash", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, "fdaffnoMatchHash"]);
         await db.prepare("run", query, ["getSegmentsByHash-1", 60, 70, 2, "getSegmentsByHash-1", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, "3272fa85ee0927f6073ef6f07ad5f3146047c1abba794cfa364d65ab9921692b"]);
         await db.prepare("run", query, ["onlyHidden", 60, 70, 2, "onlyHidden", "testman", 0, 50, "sponsor", "skip", "YouTube", 1, 0, "f3a199e1af001d716cdc6599360e2b062c2d2b3fa2885f6d9d2fd741166cbbd3"]);
         await db.prepare("run", query, ["highlightVid", 60, 60, 2, "highlightVid-1", "testman", 0, 50, "poi_highlight", "skip", "YouTube", 0, 0, getHash("highlightVid", 1)]);
         await db.prepare("run", query, ["highlightVid", 70, 70, 2, "highlightVid-2", "testman", 0, 50, "poi_highlight", "skip", "YouTube", 0, 0, getHash("highlightVid", 1)]);
-        await db.prepare("run", query, ["requiredSegmentVid", 60, 70, 2, "requiredSegmentVid-1", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, "d51822c3f681e07aef15a8855f52ad12db9eb9cf059e65b16b64c43359557f61"]);
-        await db.prepare("run", query, ["requiredSegmentVid", 60, 70, -2, "requiredSegmentVid-2", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, "d51822c3f681e07aef15a8855f52ad12db9eb9cf059e65b16b64c43359557f61"]);
-        await db.prepare("run", query, ["requiredSegmentVid", 80, 90, -2, "requiredSegmentVid-3", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, "d51822c3f681e07aef15a8855f52ad12db9eb9cf059e65b16b64c43359557f61"]);
-        await db.prepare("run", query, ["requiredSegmentVid", 80, 90, 2, "requiredSegmentVid-4", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, "d51822c3f681e07aef15a8855f52ad12db9eb9cf059e65b16b64c43359557f61"]);
+        await db.prepare("run", query, ["requiredSegmentVid", 60, 70, 2, "requiredSegmentVid-1", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, requiredSegmentVidHash]);
+        await db.prepare("run", query, ["requiredSegmentVid", 60, 70, -2, "requiredSegmentVid-2", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, requiredSegmentVidHash]);
+        await db.prepare("run", query, ["requiredSegmentVid", 80, 90, -2, "requiredSegmentVid-3", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, requiredSegmentVidHash]);
+        await db.prepare("run", query, ["requiredSegmentVid", 80, 90, 2, "requiredSegmentVid-4", "testman", 0, 50, "sponsor", "skip", "YouTube", 0, 0, requiredSegmentVidHash]);
     });
 
-    it("Should be able to get a 200", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/3272f?categories=["sponsor", "intro"]`)
+    it("Should be able to get a 200", (done) => {
+        client.get(`${endpoint}/3272f`, { params: { categories: `["sponsor", "intro"]` } })
             .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
@@ -38,46 +41,42 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 404 if no segments are found even if a video for the given hash is known", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/3272f?categories=["shilling"]`)
-            .then(async res => {
+    it("Should return 404 if no segments are found even if a video for the given hash is known", (done) => {
+        client.get(`${endpoint}/3272f`, { params: { categories: `["shilling"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 404);
-                const expected = "[]";
-                const body = await res.text();
-                assert.strictEqual(body, expected);
+                assert.equal(res.data.length, 0);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get an empty array if no videos", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/11111?categories=["shilling"]`)
-            .then(async res => {
+    it("Should be able to get an empty array if no videos", (done) => {
+        client.get(`${endpoint}/11111`, { params: { categories: `["shilling"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 404);
-                const body = await res.text();
-                const expected = "[]";
-                assert.strictEqual(JSON.parse(body).length, 0);
-                assert.strictEqual(body, expected);
+                const body = res.data;
+                assert.strictEqual(body.length, 0);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get an empty array if only hidden videos", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/f3a1?categories=["sponsor"]`)
-            .then(async res => {
+    it("Should be able to get an empty array if only hidden videos", (done) => {
+        client.get(`${endpoint}/f3a1`, { params: { categories:`["sponsor"]` } })
+            .then(res => {
                 if (res.status !== 404) done(`non 404 status code, was ${res.status}`);
                 else {
-                    const body = await res.text();
-                    if (JSON.parse(body).length === 0 && body === "[]") done(); // pass
+                    const body = res.data;
+                    if (body.length === 0) done(); // pass
                     else done("non empty array returned");
                 }
             })
             .catch(err => done(err));
     });
 
-    it("Should return 400 prefix too short", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/11?categories=["shilling"]`)
+    it("Should return 400 prefix too short", (done) => {
+        client.get(`${endpoint}/11`, { params: { categories: `["shilling"]` } })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -85,10 +84,10 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 prefix too long", (done: Done) => {
+    it("Should return 400 prefix too long", (done) => {
         const prefix = "1".repeat(50);
         assert.ok(prefix.length > 33, "failed to generate long enough string");
-        fetch(`${getbaseURL()}/api/skipSegments/${prefix}?categories=["shilling"]`)
+        client.get(`${endpoint}/${prefix}`, { params: { categories: `["shilling"]` } })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -96,9 +95,9 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 404 prefix in range", (done: Done) => {
+    it("Should return 404 prefix in range", (done) => {
         const prefix = "1".repeat(5);
-        fetch(`${getbaseURL()}/api/skipSegments/${prefix}?categories=["shilling"]`)
+        client.get(`${endpoint}/${prefix}`, { params: { categories: `["shilling"]` } })
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -106,8 +105,8 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 for no hash", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/?categories=["shilling"]`)
+    it("Should return 400 for no hash", (done) => {
+        client.get(`${endpoint}`, { params: { categories: `["shilling"]` } })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -115,8 +114,8 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 for bad format categories", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaf?categories=shilling`)
+    it("Should return 400 for bad format categories", (done) => {
+        client.get(`${endpoint}/fdaf`, { params: { categories: "shilling" } })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -124,11 +123,11 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get multiple videos", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaf?categories=["sponsor","intro"]`)
-            .then(async res => {
+    it("Should be able to get multiple videos", (done) => {
+        client.get(`${endpoint}/fdaf`, { params: { categories: `["sponsor","intro"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 assert.strictEqual(data[0].segments.length, 2);
                 assert.strictEqual(data[1].segments.length, 1);
@@ -137,22 +136,22 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get 200 for no categories (default sponsor)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaf`)
-            .then(async res => {
+    it("Should be able to get 200 for no categories (default sponsor)", (done) => {
+        client.get(`${endpoint}/fdaf`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.strictEqual(data.length, 2);
+                const data = res.data;
                 const expected = [{
                     segments: [{
                         category: "sponsor",
-                        UUID: "getSegmentsByHash-0-0",
+                        UUID: "getSegmentsByHash-01",
                     }]
                 }, {
                     segments: [{
                         category: "sponsor",
                     }]
                 }];
+                assert.strictEqual(data.length, 2);
                 assert.ok(partialDeepEquals(data, expected));
                 assert.strictEqual(data[0].segments.length, 1);
                 assert.strictEqual(data[1].segments.length, 1);
@@ -161,18 +160,18 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get 200 for no categories (default sponsor) with action type", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaf?actionType=skip`)
-            .then(async res => {
+    it("Should be able to get 200 for no categories (default sponsor) with action type", (done) => {
+        client.get(`${endpoint}/fdaf`, { params: { actionType: "skip" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 assert.strictEqual(data[0].segments.length, 1);
                 assert.strictEqual(data[1].segments.length, 1);
                 const expected = [{
                     segments: [{
                         category: "sponsor",
-                        UUID: "getSegmentsByHash-0-0",
+                        UUID: "getSegmentsByHash-01",
                     }]
                 }, {
                     segments: [{
@@ -185,20 +184,20 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get 200 for no categories (default sponsor) with multiple action types", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaf?actionType=skip&actionType=mute`)
-            .then(async res => {
+    it("Should be able to get 200 for no categories (default sponsor) with multiple action types", (done) => {
+        client.get(`${endpoint}/fdaf?actionType=skip&actionType=mute`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 assert.strictEqual(data[0].segments.length, 2);
                 assert.strictEqual(data[1].segments.length, 1);
                 const expected = [{
                     segments: [{
                         category: "sponsor",
-                        UUID: "getSegmentsByHash-0-0",
+                        UUID: "getSegmentsByHash-01",
                     }, {
-                        UUID: "getSegmentsByHash-0-2",
+                        UUID: "getSegmentsByHash-04",
                     }]
                 }, {
                     segments: [{
@@ -211,18 +210,18 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get 200 for no categories (default sponsor) with multiple action types (JSON array)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaf?actionTypes=["skip","mute"]`)
-            .then(async res => {
+    it("Should be able to get 200 for no categories (default sponsor) with multiple action types (JSON array)", (done) => {
+        client.get(`${endpoint}/fdaf?actionTypes=["skip","mute"]`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 2);
                 const expected = [{
                     segments: [{
                         category: "sponsor",
-                        UUID: "getSegmentsByHash-0-0",
+                        UUID: "getSegmentsByHash-01",
                     }, {
-                        UUID: "getSegmentsByHash-0-2",
+                        UUID: "getSegmentsByHash-04",
                     }]
                 }, {
                     segments: [{
@@ -235,15 +234,15 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get 200 for no categories (default sponsor) for a non YouTube service", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaf?service=PeerTube`)
-            .then(async res => {
+    it("Should be able to get 200 for no categories (default sponsor) for a non YouTube service", (done) => {
+        client.get(`${endpoint}/fdaf`, { params: { service: "PeerTube" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 const expected = [{
                     segments: [{
-                        UUID: "getSegmentsByHash-0-0-1"
+                        UUID: "getSegmentsByHash-02"
                     }]
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -253,11 +252,11 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should only return one segment when fetching highlight segments", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/c962?category=poi_highlight`)
-            .then(async res => {
+    it("Should only return one segment when fetching highlight segments", (done) => {
+        client.get(`${endpoint}/c962`, { params: { category: "poi_highlight" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 assert.strictEqual(data[0].segments.length, 1);
                 done();
@@ -265,27 +264,21 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to post a segment and get it using endpoint", (done: Done) => {
+    it("Should be able to post a segment and get it using endpoint", (done) => {
         const testID = "abc123goodVideo";
-        fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                userID: "test-qwertyuiopasdfghjklzxcvbnm",
-                videoID: testID,
-                segments: [{
-                    segment: [13, 17],
-                    category: "sponsor",
-                }],
-            }),
+        client.post("/api/skipSegments", {
+            userID: "test-qwertyuiopasdfghjklzxcvbnm",
+            videoID: testID,
+            segments: [{
+                segment: [13, 17],
+                category: "sponsor",
+            }],
         })
-            .then(async () => {
-                fetch(`${getbaseURL()}/api/skipSegments/${getHash(testID, 1).substring(0, 3)}`)
-                    .then(async res => {
+            .then(() => {
+                client.get(`${endpoint}/${getHash(testID, 1).substring(0, 3)}`)
+                    .then(res => {
                         assert.strictEqual(res.status, 200);
-                        const data = await res.json();
+                        const data = res.data;
                         assert.strictEqual(data.length, 1);
                         const expected = [{
                             segments: [{
@@ -301,21 +294,21 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(`(post) ${err}`));
     });
 
-    it("Should be able to get multiple categories with repeating parameters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/fdaff4?&category=sponsor&category=intro`)
-            .then(async res => {
+    it("Should be able to get multiple categories with repeating parameters", (done) => {
+        client.get(`${endpoint}/fdaff4?&category=sponsor&category=intro`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 const expected = [{
                     segments: [{
                         segment: [1, 10],
                         category: "sponsor",
-                        UUID: "getSegmentsByHash-0-0",
+                        UUID: "getSegmentsByHash-01",
                     }, {
                         segment: [20, 30],
                         category: "intro",
-                        UUID: "getSegmentsByHash-0-1",
+                        UUID: "getSegmentsByHash-03",
                     }]
                 }];
                 assert.ok(partialDeepEquals(data, expected));
@@ -324,11 +317,11 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get specific segments with requiredSegments", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/d518?requiredSegments=["requiredSegmentVid-2","requiredSegmentVid-3"]`)
-            .then(async res => {
+    it("Should be able to get specific segments with requiredSegments", (done) => {
+        client.get(`${endpoint}/d518?requiredSegments=["requiredSegmentVid-2","requiredSegmentVid-3"]`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 const expected = [{
                     segments: [{
@@ -344,11 +337,11 @@ describe("getSkipSegmentsByHash", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get specific segments with repeating requiredSegment", (done: Done) => {
-        fetch(`${getbaseURL()}/api/skipSegments/d518?requiredSegment=requiredSegmentVid-2&requiredSegment=requiredSegmentVid-3`)
-            .then(async res => {
+    it("Should be able to get specific segments with repeating requiredSegment", (done) => {
+        client.get(`${endpoint}/d518?requiredSegment=requiredSegmentVid-2&requiredSegment=requiredSegmentVid-3`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.strictEqual(data.length, 1);
                 assert.strictEqual(data[0].segments.length, 2);
                 const expected = [{

test/cases/getStatus.ts

@@ -1,20 +1,19 @@
 import assert from "assert";
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-
-import {db} from "../../src/databases/databases";
+import { db } from "../../src/databases/databases";
+import { client } from "../utils/httpClient";
 let dbVersion: number;
 
 describe("getStatus", () => {
+    const endpoint = "/api/status";
     before(async () => {
         dbVersion = (await db.prepare("get", "SELECT key, value FROM config where key = ?", ["version"])).value;
     });
 
-    it("Should be able to get status", (done: Done) => {
-        fetch(`${getbaseURL()}/api/status`)
-            .then(async res => {
+    it("Should be able to get status", (done) => {
+        client.get(endpoint)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.ok(data.uptime); // uptime should be greater than 1s
                 assert.strictEqual(data.commit, "test");
                 assert.strictEqual(data.db, Number(dbVersion));
@@ -25,57 +24,52 @@ describe("getStatus", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get uptime only", (done: Done) => {
-        fetch(`${getbaseURL()}/api/status/uptime`)
-            .then(async res => {
+    it("Should be able to get uptime only", (done) => {
+        client.get(`${endpoint}/uptime`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.text();
-                assert.ok(Number(data) >= 1); // uptime should be greater than 1s
+                assert.ok(Number(res.data) >= 1); // uptime should be greater than 1s
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get commit only", (done: Done) => {
-        fetch(`${getbaseURL()}/api/status/commit`)
-            .then(async res => {
+    it("Should be able to get commit only", (done) => {
+        client.get(`${endpoint}/commit`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.text();
-                assert.strictEqual(data, "test"); // commit should be test
+                assert.strictEqual(res.data, "test"); // commit should be test
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get db only", (done: Done) => {
-        fetch(`${getbaseURL()}/api/status/db`)
-            .then(async res => {
+    it("Should be able to get db only", (done) => {
+        client.get(`${endpoint}/db`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.text();
-                assert.strictEqual(Number(data), Number(dbVersion)); // commit should be test
+                assert.strictEqual(Number(res.data), Number(dbVersion)); // commit should be test
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get startTime only", (done: Done) => {
-        fetch(`${getbaseURL()}/api/status/startTime`)
-            .then(async res => {
+    it("Should be able to get startTime only", (done) => {
+        client.get(`${endpoint}/startTime`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.text();
                 const now = Date.now();
-                assert.ok(Number(data) <= now); // startTime should be more than now
+                assert.ok(Number(res.data) <= now); // startTime should be more than now
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get processTime only", (done: Done) => {
-        fetch(`${getbaseURL()}/api/status/processTime`)
-            .then(async res => {
+    it("Should be able to get processTime only", (done) => {
+        client.get(`${endpoint}/processTime`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.text();
-                assert.ok(Number(data) >= 0);
+                assert.ok(Number(res.data) >= 0);
                 done();
             })
             .catch(err => done(err));

test/cases/getSubmissionUUID.ts

@@ -1,4 +1,4 @@
-import {getSubmissionUUID} from "../../src/utils/getSubmissionUUID";
+import { getSubmissionUUID } from "../../src/utils/getSubmissionUUID";
 import assert from "assert";
 import { ActionType, VideoID } from "../../src/types/segments.model";
 import { UserID } from "../../src/types/user.model";

test/cases/getUserID.ts

@@ -1,8 +1,11 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
+import { client } from "../utils/httpClient";
+import { AxiosResponse } from "axios";
+
+const endpoint = "/api/userID";
+const getUserName = (username: string): Promise<AxiosResponse> => client.get(endpoint, { params: { username } });
 
 describe("getUserID", () => {
     before(async () => {
@@ -21,17 +24,17 @@ describe("getUserID", () => {
         await db.prepare("run", insertUserNameQuery, [getHash("getuserid_user_12"), "a"]);
     });
 
-    it("Should be able to get a 200", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=fuzzy+user+01`)
-            .then(async res => {
+    it("Should be able to get a 200", (done) => {
+        getUserName("fuzzy user 01")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get a 400 (No username parameter)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID`)
+    it("Should be able to get a 400 (No username parameter)", (done) => {
+        client.get(endpoint)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -39,17 +42,17 @@ describe("getUserID", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get a 200 (username is public id)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=${getHash("getuserid_user_06")}`)
-            .then(async res => {
+    it("Should be able to get a 200 (username is public id)", (done) => {
+        client.get(endpoint, { params: { username: getHash("getuserid_user_06") } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get a 400 (username longer than 64 chars)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=${getHash("getuserid_user_06")}0`)
+    it("Should be able to get a 400 (username longer than 64 chars)", (done) => {
+        client.get(endpoint, { params: { username: `${getHash("getuserid_user_06")}0` } })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -57,24 +60,23 @@ describe("getUserID", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get single username", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=fuzzy+user+01`)
-            .then(async res => {
+    it("Should be able to get single username", (done) => {
+        client.get(endpoint, { params: { username: "fuzzy user 01" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "fuzzy user 01",
                     userID: getHash("getuserid_user_01")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get multiple fuzzy user info from start", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=fuzzy+user`)
-            .then(async res => {
+    it("Should be able to get multiple fuzzy user info from start", (done) => {
+        getUserName("fuzzy user")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "fuzzy user 01",
@@ -83,16 +85,15 @@ describe("getUserID", () => {
                     userName: "fuzzy user 02",
                     userID: getHash("getuserid_user_02")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get multiple fuzzy user info from middle", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=user`)
-            .then(async res => {
+    it("Should be able to get multiple fuzzy user info from middle", (done) => {
+        getUserName("user")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "fuzzy user 01",
@@ -104,48 +105,45 @@ describe("getUserID", () => {
                     userName: "specific user 03",
                     userID: getHash("getuserid_user_03")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get with public ID", (done: Done) => {
+    it("Should be able to get with public ID", (done) => {
         const userID = getHash("getuserid_user_06");
-        fetch(`${getbaseURL()}/api/userID?username=${userID}`)
-            .then(async res => {
+        getUserName(userID)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: userID,
                     userID
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get with fuzzy public ID", (done: Done) => {
+    it("Should be able to get with fuzzy public ID", (done) => {
         const userID = getHash("getuserid_user_06");
-        fetch(`${getbaseURL()}/api/userID?username=${userID.substr(10,60)}`)
-            .then(async res => {
+        getUserName(userID.substr(10,60))
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: userID,
                     userID
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get repeating username", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=repeating`)
-            .then(async res => {
+    it("Should be able to get repeating username", (done) => {
+        getUserName("repeating")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "repeating",
@@ -154,16 +152,15 @@ describe("getUserID", () => {
                     userName: "repeating",
                     userID: getHash("getuserid_user_05")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get repeating fuzzy username", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=peat`)
-            .then(async res => {
+    it("Should be able to get repeating fuzzy username", (done) => {
+        getUserName("peat")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "repeating",
@@ -172,45 +169,42 @@ describe("getUserID", () => {
                     userName: "repeating",
                     userID: getHash("getuserid_user_05")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should avoid ReDOS with _", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=_redos_`)
-            .then(async res => {
+    it("should avoid ReDOS with _", (done) => {
+        getUserName("_redos_")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "_redos_",
                     userID: getHash("getuserid_user_09")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should avoid ReDOS with %", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=%redos%`)
-            .then(async res => {
+    it("should avoid ReDOS with %", (done) => {
+        getUserName("%redos%")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "%redos%",
                     userID: getHash("getuserid_user_08")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should return 404 if escaped backslashes present", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=%redos\\\\_`)
+    it("should return 404 if escaped backslashes present", (done) => {
+        getUserName("%redos\\\\_")
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -218,8 +212,8 @@ describe("getUserID", () => {
             .catch(err => done(err));
     });
 
-    it("should return 404 if backslashes present", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=\\%redos\\_`)
+    it("should return 404 if backslashes present", (done) => {
+        getUserName(`\\%redos\\_`)
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -227,23 +221,22 @@ describe("getUserID", () => {
             .catch(err => done(err));
     });
 
-    it("should return user if just backslashes", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=\\\\\\`)
-            .then(async res => {
+    it("should return user if just backslashes", (done) => {
+        getUserName(`\\\\\\`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "\\\\\\",
                     userID: getHash("getuserid_user_11")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should not allow usernames more than 64 characters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=${"0".repeat(65)}`)
+    it("should not allow usernames more than 64 characters", (done) => {
+        getUserName("0".repeat(65))
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -251,8 +244,8 @@ describe("getUserID", () => {
             .catch(err => done(err));
     });
 
-    it("should not allow usernames less than 3 characters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=aa`)
+    it("should not allow usernames less than 3 characters", (done) => {
+        getUserName("aa")
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -260,24 +253,23 @@ describe("getUserID", () => {
             .catch(err => done(err));
     });
 
-    it("should allow exact match", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=a&exact=true`)
-            .then(async res => {
+    it("should allow exact match", (done) => {
+        client.get(endpoint, { params: { username: "a", exact: true } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "a",
                     userID: getHash("getuserid_user_12")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get repeating username with exact username", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=repeating&exact=true`)
-            .then(async res => {
+    it("Should be able to get repeating username with exact username", (done) => {
+        client.get(endpoint, { params: { username: "repeating", exact: true } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "repeating",
@@ -286,16 +278,15 @@ describe("getUserID", () => {
                     userName: "repeating",
                     userID: getHash("getuserid_user_05")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not get exact unless explicitly set to true", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID?username=user&exact=1`)
-            .then(async res => {
+    it("Should not get exact unless explicitly set to true", (done) => {
+        client.get(endpoint, { params: { username: "user", exact: 1 } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = [{
                     userName: "fuzzy user 01",
@@ -307,15 +298,14 @@ describe("getUserID", () => {
                     userName: "specific user 03",
                     userID: getHash("getuserid_user_03")
                 }];
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should return 400 if no username parameter specified", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userID`)
+    it("should return 400 if no username parameter specified", (done) => {
+        client.get(endpoint)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();

test/cases/getUserInfo.ts

@@ -1,24 +1,26 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 describe("getUserInfo", () => {
+    const endpoint = "/api/userInfo";
     before(async () => {
         const insertUserNameQuery = 'INSERT INTO "userNames" ("userID", "userName") VALUES(?, ?)';
         await db.prepare("run", insertUserNameQuery, [getHash("getuserinfo_user_01"), "Username user 01"]);
 
         const sponsorTimesQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        await db.prepare("run", sponsorTimesQuery, ["xxxyyyzzz", 1, 11, 2, "uuid000001", getHash("getuserinfo_user_01"), 1, 10, "sponsor", 0]);
-        await db.prepare("run", sponsorTimesQuery, ["xxxyyyzzz", 1, 11, 2, "uuid000002", getHash("getuserinfo_user_01"), 2, 10, "sponsor", 0]);
-        await db.prepare("run", sponsorTimesQuery, ["yyyxxxzzz", 1, 11, -1, "uuid000003", getHash("getuserinfo_user_01"), 3, 10, "sponsor", 0]);
-        await db.prepare("run", sponsorTimesQuery, ["yyyxxxzzz", 1, 11, -2, "uuid000004", getHash("getuserinfo_user_01"), 4, 10, "sponsor", 1]);
-        await db.prepare("run", sponsorTimesQuery, ["xzzzxxyyy", 1, 11, -5, "uuid000005", getHash("getuserinfo_user_01"), 5, 10, "sponsor", 1]);
-        await db.prepare("run", sponsorTimesQuery, ["zzzxxxyyy", 1, 11, 2, "uuid000006", getHash("getuserinfo_user_02"), 6, 10, "sponsor", 0]);
-        await db.prepare("run", sponsorTimesQuery, ["xxxyyyzzz", 1, 11, 2, "uuid000007", getHash("getuserinfo_user_02"), 7, 10, "sponsor", 1]);
-        await db.prepare("run", sponsorTimesQuery, ["xxxyyyzzz", 1, 11, 2, "uuid000008", getHash("getuserinfo_user_02"), 8, 10, "sponsor", 1]);
-        await db.prepare("run", sponsorTimesQuery, ["xxxyyyzzz", 0, 36000, 2, "uuid000009", getHash("getuserinfo_user_03"), 8, 2, "sponsor", 0]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2,   "uuid000001", getHash("getuserinfo_user_01"), 1, 10, "sponsor", 0]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2,   "uuid000002", getHash("getuserinfo_user_01"), 2, 10, "sponsor", 0]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo1", 1, 11, -1,  "uuid000003", getHash("getuserinfo_user_01"), 3, 10, "sponsor", 0]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo1", 1, 11, -2,  "uuid000004", getHash("getuserinfo_user_01"), 4, 10, "sponsor", 1]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo2", 1, 11, -5,  "uuid000005", getHash("getuserinfo_user_01"), 5, 10, "sponsor", 1]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2,   "uuid000007", getHash("getuserinfo_user_02"), 7, 10, "sponsor", 1]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 1, 11, 2,   "uuid000008", getHash("getuserinfo_user_02"), 8, 10, "sponsor", 1]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo0", 0, 36000, 2,"uuid000009", getHash("getuserinfo_user_03"), 8, 10, "sponsor", 0]);
+        await db.prepare("run", sponsorTimesQuery, ["getUserInfo3", 1, 11, 2,   "uuid000006", getHash("getuserinfo_user_02"), 6, 10, "sponsor", 0]);
+
 
         const insertWarningQuery = 'INSERT INTO warnings ("userID", "issueTime", "issuerUserID", "enabled", "reason") VALUES (?, ?, ?, ?, ?)';
         await db.prepare("run", insertWarningQuery, [getHash("getuserinfo_warning_0"), 10, "getuserinfo_vip", 1, "warning0-0"]);
@@ -32,8 +34,8 @@ describe("getUserInfo", () => {
         await db.prepare("run", insertBanQuery, [getHash("getuserinfo_ban_01")]);
     });
 
-    it("Should be able to get a 200", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_user_01`)
+    it("Should be able to get a 200", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_user_01" } })
             .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
@@ -41,8 +43,8 @@ describe("getUserInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get a 400 (No userID parameter)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo`)
+    it("Should be able to get a 400 (No userID parameter)", (done) => {
+        client.get(endpoint, { params: { userID: "" } })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -50,9 +52,9 @@ describe("getUserInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get user info", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_user_01`)
-            .then(async res => {
+    it("Should be able to get user info", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_user_01" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = {
                     userName: "Username user 01",
@@ -68,98 +70,91 @@ describe("getUserInfo", () => {
                     warnings: 0,
                     warningReason: ""
                 };
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should get warning data", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_0&value=warnings`)
-            .then(async res => {
+    it("Should get warning data", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_warning_0", value: "warnings" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warnings: 1
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should get warning data with public ID", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?publicUserID=${getHash("getuserinfo_warning_0")}&values=["warnings"]`)
-            .then(async res => {
+    it("Should get warning data with public ID", (done) => {
+        client.get(endpoint, { params: { publicUserID: getHash("getuserinfo_warning_0"), values: `["warnings"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warnings: 1
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should get multiple warnings", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_1&value=warnings`)
-            .then(async res => {
+    it("Should get multiple warnings", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_warning_1", value: "warnings" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warnings: 2
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not get warnings if none", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_2&value=warnings`)
-            .then(async res => {
+    it("Should not get warnings if none", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_warning_2", value: "warnings" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warnings: 0,
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should done(userID for userName (No userName set)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_user_02&value=userName`)
-            .then(async res => {
+    it("Should done(userID for userName (No userName set)", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_user_02", value: "userName" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     userName: "c2a28fd225e88f74945794ae85aef96001d4a1aaa1022c656f0dd48ac0a3ea0f"
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should return null segment if none", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_null&value=lastSegmentID`)
-            .then(async res => {
+    it("Should return null segment if none", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_null", value: "lastSegmentID" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.strictEqual(data.lastSegmentID, null);
+                assert.strictEqual(res.data.lastSegmentID, null);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should return zeroes if userid does not exist", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_null&value=lastSegmentID`)
-            .then(async res => {
-                const data = await res.json();
+    it("Should return zeroes if userid does not exist", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_null", value: "lastSegmentID" } })
+            .then(res => {
+                const data = res.data;
                 for (const value in data) {
                     if (data[value] === null && value !== "lastSegmentID")  {
                         done(`returned null for ${value}`);
@@ -170,115 +165,108 @@ describe("getUserInfo", () => {
             .catch(err => done(err));
     });
 
-    it("Should get warning reason from from single enabled warning", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_0&values=["warningReason"]`)
-            .then(async res => {
+    it("Should get warning reason from from single enabled warning", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_warning_0", values: `["warningReason"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warningReason: "warning0-0",
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should get most recent warning from two enabled warnings", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_1&value=warningReason`)
-            .then(async res => {
+    it("Should get most recent warning from two enabled warnings", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_warning_1", value: "warningReason" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warningReason: "warning1-1"
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should not get disabled warning", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_2&values=["warnings","warningReason"]`)
-            .then(async res => {
+    it("Should not get disabled warning", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_warning_2", values: `["warnings","warningReason"]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warnings: 0,
                     warningReason: ""
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should not get newer disabled warning", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_3&value=warnings&value=warningReason`)
-            .then(async res => {
+    it("Should not get newer disabled warning", (done) => {
+        client.get(`${endpoint}?userID=getuserinfo_warning_3&value=warnings&value=warningReason`)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     warnings: 1,
                     warningReason: "warning3-0"
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should get 400 if bad values specified", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_warning_3&value=invalid-value`)
-            .then(async res => {
+    it("Should get 400 if bad values specified", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_warning_3", value: "invalid-value" } })
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done(); // pass
             })
             .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 => {
+    it("Should get ban data for banned user (only appears when specifically requested)", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_ban_01", value: "banned" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     banned: true
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.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 => {
+    it("Should get ban data for unbanned user (only appears when specifically requested)", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_notban_01", value: "banned" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     banned: false
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should throw 400 on bad json in values", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=x&values=[userID]`)
-            .then(async res => {
+    it("Should throw 400 on bad json in values", (done) => {
+        client.get(endpoint, { params: { userID: "x", values: `[userID]` } })
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should return 200 on userID not found", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=notused-userid`)
-            .then(async res => {
+    it("Should return 200 on userID not found", (done) => {
+        client.get(endpoint, { params: { userID: "notused-userid" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     minutesSaved: 0,
                     segmentCount: 0,
@@ -290,21 +278,21 @@ describe("getUserInfo", () => {
                     reputation: 0,
                     vip: false,
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done(); // pass
             })
             .catch(err => done(err));
     });
 
-    it("Should only count long segments as 10 minutes", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userInfo?userID=getuserinfo_user_03`)
-            .then(async res => {
+    it("Should only count long segments as 10 minutes", (done) => {
+        client.get(endpoint, { params: { userID: "getuserinfo_user_03" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = {
                     userName: "807e0a5d0a62c9c4365fae3d403e4618a3226f231314a898fa1555a0e55eab9e",
                     userID: "807e0a5d0a62c9c4365fae3d403e4618a3226f231314a898fa1555a0e55eab9e",
-                    minutesSaved: 20,
-                    viewCount: 2,
+                    minutesSaved: 100,
+                    viewCount: 10,
                     ignoredViewCount: 0,
                     segmentCount: 1,
                     ignoredSegmentCount: 0,
@@ -314,8 +302,7 @@ describe("getUserInfo", () => {
                     warnings: 0,
                     warningReason: ""
                 };
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));

test/cases/getUserStats.ts

@@ -1,10 +1,11 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 describe("getUserStats", () => {
+    const endpoint = "/api/userStats";
     before(async () => {
         const insertUserNameQuery = 'INSERT INTO "userNames" ("userID", "userName") VALUES(?, ?)';
         await db.prepare("run", insertUserNameQuery, [getHash("getuserstats_user_01"), "Username user 01"]);
@@ -22,8 +23,8 @@ describe("getUserStats", () => {
 
     });
 
-    it("Should be able to get a 400 (No userID parameter)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userStats`)
+    it("Should be able to get a 400 (No userID parameter)", (done) => {
+        client.get(endpoint)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -31,9 +32,9 @@ describe("getUserStats", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get all user info", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&fetchCategoryStats=true&fetchActionTypeStats=true`)
-            .then(async res => {
+    it("Should be able to get all user info", (done) => {
+        client.get(endpoint, { params: { userID: "getuserstats_user_01", fetchCategoryStats: true, fetchActionTypeStats: true } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 const expected = {
                     userName: "Username user 01",
@@ -57,18 +58,17 @@ describe("getUserStats", () => {
                         segmentCount: 8
                     }
                 };
-                const data = await res.json();
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get all zeroes for invalid userid", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_invalid`)
-            .then(async res => {
+    it("Should be able to get all zeroes for invalid userid", (done) => {
+        client.get(endpoint, { params: { userID: "getuserstats_user_invalid" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 for (const value in data.overallStats) {
                     if (data[value]) {
                         done(`returned non-zero for ${value}`);
@@ -79,11 +79,11 @@ describe("getUserStats", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to get all zeroes for only ignored segments", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_02`)
-            .then(async res => {
+    it("Should be able to get all zeroes for only ignored segments", (done) => {
+        client.get(endpoint, { params: { userID: "getuserstats_user_02" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 for (const value in data.overallStats) {
                     if (data[value]) {
                         done(`returned non-zero for ${value}`);
@@ -94,11 +94,11 @@ describe("getUserStats", () => {
             .catch(err => done(err));
     });
 
-    it("Should not get extra stats if not requested", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01`)
-            .then(async res => {
+    it("Should not get extra stats if not requested", (done) => {
+        client.get(endpoint, { params: { userID: "getuserstats_user_01" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 // check for categoryCount
                 if (data.categoryCount || data.actionTypeCount) {
                     done("returned extra stats");
@@ -108,11 +108,11 @@ describe("getUserStats", () => {
             .catch(err => done(err));
     });
 
-    it("Should get parts of extra stats if not requested", (done: Done) => {
-        fetch(`${getbaseURL()}/api/userStats?userID=getuserstats_user_01&fetchActionTypeStats=true`)
-            .then(async res => {
+    it("Should get parts of extra stats if not requested", (done) => {
+        client.get(endpoint, { params: { userID: "getuserstats_user_01", fetchActionTypeStats: true } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 // check for categoryCount
                 if (data.categoryCount && !data.actionTypeCount) {
                     done("returned extra stats");

test/cases/lockCategoriesRecords.ts

@@ -1,9 +1,8 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {getHash} from "../../src/utils/getHash";
-import {db} from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
 import assert from "assert";
-import {LockCategory} from "../../src/types/segments.model";
+import { LockCategory } from "../../src/types/segments.model";
+import { client } from "../utils/httpClient";
 
 const stringDeepEquals = (a: string[] ,b: string[]): boolean => {
     let result = true;
@@ -13,23 +12,29 @@ const stringDeepEquals = (a: string[] ,b: string[]): boolean => {
     return result;
 };
 
+const endpoint = "/api/lockCategories";
+const submitEndpoint = "/api/skipSegments";
+const checkLockCategories = (videoID: string): Promise<LockCategory[]> => db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', [videoID]);
+const lockVIPUser = "lockCategoriesRecordsVIPUser";
+const lockVIPUserHash = getHash(lockVIPUser);
+
 describe("lockCategoriesRecords", () => {
     before(async () => {
         const insertVipUserQuery = 'INSERT INTO "vipUsers" ("userID") VALUES (?)';
-        await db.prepare("run", insertVipUserQuery, [getHash("VIPUser-lockCategories")]);
+        await db.prepare("run", insertVipUserQuery, [lockVIPUserHash]);
 
         const insertLockCategoryQuery = 'INSERT INTO "lockCategories" ("userID", "videoID", "category", "reason") VALUES (?, ?, ?, ?)';
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "no-segments-video-id", "sponsor", "reason-1"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "no-segments-video-id", "intro", "reason-1"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "no-segments-video-id", "sponsor", "reason-1"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "no-segments-video-id", "intro", "reason-1"]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "no-segments-video-id-1", "sponsor", "reason-2"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "no-segments-video-id-1", "intro", "reason-2"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "lockCategoryVideo", "sponsor", "reason-3"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "no-segments-video-id-1", "sponsor", "reason-2"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "no-segments-video-id-1", "intro", "reason-2"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "lockCategoryVideo", "sponsor", "reason-3"]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "delete-record", "sponsor", "reason-4"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "delete-record", "sponsor", "reason-4"]);
 
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "delete-record-1", "sponsor", "reason-5"]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-lockCategories"), "delete-record-1", "intro", "reason-5"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "delete-record-1", "sponsor", "reason-5"]);
+        await db.prepare("run", insertLockCategoryQuery, [lockVIPUserHash, "delete-record-1", "intro", "reason-5"]);
     });
 
     it("Should update the database version when starting the application", async () => {
@@ -37,10 +42,10 @@ describe("lockCategoriesRecords", () => {
         assert.ok(version > 1);
     });
 
-    it("Should be able to submit categories not in video (http response)", (done: Done) => {
+    it("Should be able to submit categories not in video (http response)", (done) => {
         const json = {
             videoID: "no-segments-video-id",
-            userID: "VIPUser-lockCategories",
+            userID: "lockCategoriesRecordsVIPUser",
             categories: [
                 "outro",
                 "shilling",
@@ -56,26 +61,20 @@ describe("lockCategoriesRecords", () => {
                 "shilling",
             ],
         };
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json)
-        })
-            .then(async res => {
+        client.post(endpoint, json)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.deepStrictEqual(data, expected);
+                assert.deepStrictEqual(res.data, expected);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to submit categories not in video (sql check)", (done: Done) => {
+    it("Should be able to submit categories not in video (sql check)", (done) => {
+        const videoID = "no-segments-video-id-1";
         const json = {
-            videoID: "no-segments-video-id-1",
-            userID: "VIPUser-lockCategories",
+            videoID,
+            userID: lockVIPUser,
             categories: [
                 "outro",
                 "shilling",
@@ -85,25 +84,17 @@ describe("lockCategoriesRecords", () => {
                 "intro",
             ],
         };
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json)
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', ["no-segments-video-id-1"]) as LockCategory[];
+                const result = await checkLockCategories(videoID);
                 assert.strictEqual(result.length, 4);
                 const oldRecordNotChangeReason = result.filter(item =>
                     item.reason === "reason-2" && ["sponsor", "intro"].includes(item.category)
                 );
-
                 const newRecordWithEmptyReason = result.filter(item =>
                     item.reason === "" && ["outro", "shilling"].includes(item.category)
                 );
-
                 assert.strictEqual(newRecordWithEmptyReason.length, 2);
                 assert.strictEqual(oldRecordNotChangeReason.length, 2);
                 done();
@@ -111,10 +102,11 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to submit categories not in video with reason (http response)", (done: Done) => {
+    it("Should be able to submit categories not in video with reason (http response)", (done) => {
+        const videoID = "no-segments-video-id";
         const json = {
-            videoID: "no-segments-video-id",
-            userID: "VIPUser-lockCategories",
+            videoID,
+            userID: lockVIPUser,
             categories: [
                 "outro",
                 "shilling",
@@ -125,7 +117,6 @@ describe("lockCategoriesRecords", () => {
             ],
             reason: "new reason"
         };
-
         const expected = {
             submitted: [
                 "outro",
@@ -134,26 +125,20 @@ describe("lockCategoriesRecords", () => {
             ],
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json)
-        })
-            .then(async res => {
+        client.post(endpoint, json)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
-                assert.deepStrictEqual(data.submitted, expected.submitted);
+                assert.deepStrictEqual(res.data.submitted, expected.submitted);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to submit categories not in video with reason (sql check)", (done: Done) => {
+    it("Should be able to submit categories not in video with reason (sql check)", (done) => {
+        const videoID = "no-segments-video-id-1";
         const json = {
-            videoID: "no-segments-video-id-1",
-            userID: "VIPUser-lockCategories",
+            videoID,
+            userID: lockVIPUser,
             categories: [
                 "outro",
                 "shilling",
@@ -171,16 +156,10 @@ describe("lockCategoriesRecords", () => {
             "intro"
         ];
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json)
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', ["no-segments-video-id-1"]) as LockCategory[];
+                const result = await checkLockCategories(videoID);
                 assert.strictEqual(result.length, 4);
                 const newRecordWithNewReason = result.filter(item =>
                     expectedWithNewReason.includes(item.category) && item.reason === "new reason"
@@ -196,87 +175,64 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to submit categories with _ in the category", (done: Done) => {
+    it("Should be able to submit categories with _ in the category", (done) => {
         const json = {
             videoID: "underscore",
-            userID: "VIPUser-lockCategories",
+            userID: lockVIPUser,
             categories: [
                 "word_word",
             ],
         };
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', ["underscore"]);
+                const result = await checkLockCategories("underscore");
                 assert.strictEqual(result.length, 1);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to submit categories with upper and lower case in the category", (done: Done) => {
+    it("Should be able to submit categories with upper and lower case in the category", (done) => {
         const json = {
             videoID: "bothCases",
-            userID: "VIPUser-lockCategories",
+            userID: lockVIPUser,
             categories: [
                 "wordWord",
             ],
         };
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', ["bothCases"]);
+                const result = await checkLockCategories("bothCases");
                 assert.strictEqual(result.length, 1);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not be able to submit categories with $ in the category", (done: Done) => {
+    it("Should not be able to submit categories with $ in the category", (done) => {
+        const videoID = "specialChar";
         const json = {
-            videoID: "specialChar",
-            userID: "VIPUser-lockCategories",
+            videoID,
+            userID: lockVIPUser,
             categories: [
                 "word&word",
             ],
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', ["specialChar"]);
+                const result = await checkLockCategories(videoID);
                 assert.strictEqual(result.length, 0);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should return 400 for missing params", (done: Done) => {
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({}),
-        })
+    it("Should return 400 for missing params", (done) => {
+        client.post(endpoint, {})
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -284,19 +240,13 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 for no categories", (done: Done) => {
+    it("Should return 400 for no categories", (done) => {
         const json: any = {
             videoID: "test",
             userID: "test",
             categories: [],
         };
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -304,20 +254,14 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 for no userID", (done: Done) => {
+    it("Should return 400 for no userID", (done) => {
         const json: any = {
             videoID: "test",
             userID: null,
             categories: ["sponsor"],
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -325,20 +269,14 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 for no videoID", (done: Done) => {
+    it("Should return 400 for no videoID", (done) => {
         const json: any = {
             videoID: null,
             userID: "test",
             categories: ["sponsor"],
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -346,20 +284,14 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 object categories", (done: Done) => {
+    it("Should return 400 object categories", (done) => {
         const json = {
             videoID: "test",
             userID: "test",
             categories: {},
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -367,20 +299,14 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 bad format categories", (done: Done) => {
+    it("Should return 400 bad format categories", (done) => {
         const json = {
             videoID: "test",
             userID: "test",
             categories: "sponsor",
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -388,7 +314,7 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 403 if user is not VIP", (done: Done) => {
+    it("Should return 403 if user is not VIP", (done) => {
         const json = {
             videoID: "test",
             userID: "test",
@@ -397,13 +323,7 @@ describe("lockCategoriesRecords", () => {
             ],
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
@@ -411,50 +331,40 @@ describe("lockCategoriesRecords", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to delete a lockCategories record", (done: Done) => {
+    it("Should be able to delete a lockCategories record", (done) => {
+        const videoID = "delete-record";
         const json = {
-            videoID: "delete-record",
-            userID: "VIPUser-lockCategories",
+            videoID,
+            userID: lockVIPUser,
             categories: [
                 "sponsor",
             ],
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "DELETE",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.delete(endpoint, { data: json })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', ["delete-record"]);
+                const result = await checkLockCategories(videoID);
                 assert.strictEqual(result.length, 0);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to delete one lockCategories record without removing another", (done: Done) => {
+    it("Should be able to delete one lockCategories record without removing another", (done) => {
+        const videoID = "delete-record-1";
         const json = {
-            videoID: "delete-record-1",
-            userID: "VIPUser-lockCategories",
+            videoID,
+            userID: lockVIPUser,
             categories: [
                 "sponsor",
             ],
         };
 
-        fetch(`${getbaseURL()}/api/lockCategories`, {
-            method: "DELETE",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.delete(endpoint, { data: json })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "lockCategories"  WHERE "videoID" = ?', ["delete-record-1"]);
+                const result = await checkLockCategories(videoID);
                 assert.strictEqual(result.length, 1);
                 done();
             })
@@ -466,48 +376,37 @@ describe("lockCategoriesRecords", () => {
      * Submission tests in this file do not check database records, only status codes.
      * To test the submission code properly see ./test/cases/postSkipSegments.js
      */
-
-    it("Should not be able to submit a segment to a video with a lock-category record (single submission)", (done: Done) => {
-        fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                userID: "testman42-qwertyuiopasdfghjklzxcvbnm",
-                videoID: "lockCategoryVideo",
-                segments: [{
-                    segment: [20, 40],
-                    category: "sponsor",
-                }],
-            }),
+    const lockedVideoID = "lockCategoryVideo";
+    const testSubmitUser = "testman42-qwertyuiopasdfghjklzxcvbnm";
+    it("Should not be able to submit a segment to a video with a lock-category record (single submission)", (done) => {
+        client.post(submitEndpoint, {
+            userID: testSubmitUser,
+            videoID: lockedVideoID,
+            segments: [{
+                segment: [20, 40],
+                category: "sponsor",
+            }],
         })
-            .then(async res => {
+            .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not be able to submit segments to a video where any of the submissions with a no-segment record", (done: Done) => {
-        fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                userID: "testman42-qwertyuiopasdfghjklzxcvbnm",
-                videoID: "lockCategoryVideo",
-                segments: [{
-                    segment: [20, 40],
-                    category: "sponsor",
-                }, {
-                    segment: [50, 60],
-                    category: "intro",
-                }],
-            },),
+    it("Should not be able to submit segments to a video where any of the submissions with a no-segment record", (done) => {
+        client.post(submitEndpoint, {
+            userID: testSubmitUser,
+            videoID: lockedVideoID,
+            segments: [{
+                segment: [20, 40],
+                category: "sponsor",
+            }, {
+                segment: [50, 60],
+                category: "intro",
+            }]
         })
-            .then(async res => {
+            .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
             })
@@ -515,51 +414,39 @@ describe("lockCategoriesRecords", () => {
     });
 
 
-    it("Should be able to submit a segment to a video with a different no-segment record", (done: Done) => {
-        fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                userID: "testman42-qwertyuiopasdfghjklzxcvbnm",
-                videoID: "lockCategoryVideo",
-                segments: [{
-                    segment: [20, 40],
-                    category: "intro",
-                }],
-            }),
+    it("Should be able to submit a segment to a video with a different no-segment record", (done) => {
+        client.post(submitEndpoint, {
+            userID: testSubmitUser,
+            videoID: lockedVideoID,
+            segments: [{
+                segment: [20, 40],
+                category: "intro",
+            }],
         })
-            .then(async res => {
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to submit a segment to a video with no no-segment records", (done: Done) => {
-        fetch(`${getbaseURL()}/api/postVideoSponsorTimes`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                userID: "testman42-qwertyuiopasdfghjklzxcvbnm",
-                videoID: "normalVideo",
-                segments: [{
-                    segment: [20, 40],
-                    category: "intro",
-                }],
-            }),
+    it("Should be able to submit a segment to a video with no no-segment records", (done) => {
+        client.post(submitEndpoint, {
+            userID: testSubmitUser,
+            videoID: "normalVideo",
+            segments: [{
+                segment: [20, 40],
+                category: "intro",
+            }],
         })
-            .then(async res => {
+            .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should be able to get existing category lock", (done: Done) => {
+    it("should be able to get existing category lock", (done) => {
         const expected = {
             categories: [
                 "sponsor",
@@ -568,11 +455,10 @@ describe("lockCategoriesRecords", () => {
                 "shilling"
             ],
         };
-
-        fetch(`${getbaseURL()}/api/lockCategories?videoID=` + `no-segments-video-id`)
-            .then(async res => {
+        client.get(endpoint, { params: { videoID: "no-segments-video-id" } })
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
+                const data = res.data;
                 assert.ok(stringDeepEquals(data.categories, expected.categories));
                 done();
             })

test/cases/oldGetSponsorTime.ts

@@ -1,18 +1,20 @@
-import fetch from "node-fetch";
-import {db} from "../../src/databases/databases";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {getHash} from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
 import assert from "assert";
+import { client } from "../utils/httpClient";
+
+const endpoint = "/api/getVideoSponsorTimes";
+const getOldSponsorTime = (videoID: string) => client.get(endpoint, { params: { videoID } });
 
 describe("getVideoSponsorTime (Old get method)", () => {
     before(async () => {
-        const insertSponsorTimes = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        await db.prepare("run", insertSponsorTimes, ["old-testtesttest", 1, 11, 2, "uuid-0", "testman", 0, 50, "sponsor", 0, getHash("old-testtesttest", 1)]);
-        await db.prepare("run", insertSponsorTimes, ["old-testtesttest,test", 1, 11, 2, "uuid-1", "testman", 0, 50, "sponsor", 0, getHash("old-testtesttest,test", 1)]);
+        const insertSponsorTimes = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+        await db.prepare("run", insertSponsorTimes, ["oldGetSponsorTime0",      1, 11, 2, "oldGetSponsorTime00", "oldGetSponsorTimeUser", 0, 50, "sponsor", 0]);
+        await db.prepare("run", insertSponsorTimes, ["oldGetSponsorTime1,test", 1, 11, 2, "oldGetSponsorTime01", "oldGetSponsorTimeUser", 0, 50, "sponsor", 0]);
     });
 
-    it("Should be able to get a time", (done: Done) => {
-        fetch(`${getbaseURL()}/api/getVideoSponsorTimes?videoID=old-testtesttest`)
+    it("Should be able to get a time", (done) => {
+        getOldSponsorTime("oldGetSponsorTime0")
             .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
@@ -20,8 +22,8 @@ describe("getVideoSponsorTime (Old get method)", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 404 if no segment found", (done: Done) => {
-        fetch(`${getbaseURL()}/api/getVideoSponsorTimes?videoID=notarealvideo`)
+    it("Should return 404 if no segment found", (done) => {
+        getOldSponsorTime("notarealvideo")
             .then(res => {
                 assert.strictEqual(res.status, 404);
                 done();
@@ -30,8 +32,8 @@ describe("getVideoSponsorTime (Old get method)", () => {
     });
 
 
-    it("Should be possible to send unexpected query parameters", (done: Done) => {
-        fetch(`${getbaseURL()}/api/getVideoSponsorTimes?videoID=old-testtesttest&fakeparam=hello`)
+    it("Should be possible to send unexpected query parameters", (done) => {
+        client.get(endpoint, { params: { videoID: "oldGetSponsorTime0", fakeparam: "hello" } })
             .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
@@ -39,30 +41,28 @@ describe("getVideoSponsorTime (Old get method)", () => {
             .catch(() => done("couldn't callendpoint"));
     });
 
-    it("Should be able send a comma in a query param", (done: Done) => {
-        fetch(`${getbaseURL()}/api/getVideoSponsorTimes?videoID=old-testtesttest,test`)
-            .then(async res => {
+    it("Should be able send a comma in a query param", (done) => {
+        getOldSponsorTime("oldGetSponsorTime1,test")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
-                    UUIDs: ["uuid-1"],
+                    UUIDs: ["oldGetSponsorTime01"],
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to get the correct time", (done: Done) => {
-        fetch(`${getbaseURL()}/api/getVideoSponsorTimes?videoID=old-testtesttest`)
-            .then(async res => {
+    it("Should be able to get the correct time", (done) => {
+        getOldSponsorTime("oldGetSponsorTime0")
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                const data = await res.json();
                 const expected = {
                     sponsorTimes: [[1, 11]],
-                    UUIDs: ["uuid-0"]
+                    UUIDs: ["oldGetSponsorTime00"]
                 };
-                assert.ok(partialDeepEquals(data, expected));
+                assert.ok(partialDeepEquals(res.data, expected));
                 done();
             })
             .catch(err => done(err));

test/cases/oldSubmitSponsorTimes.ts

@@ -1,15 +1,18 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {db} from "../../src/databases/databases";
+import { partialDeepEquals } from "../utils/partialDeepEquals";import { db } from "../../src/databases/databases";
 import assert from "assert";
+import { client } from "../utils/httpClient";
+
+const videoID1 = "dQw4w9WgXcQ";
+const videoID2 = "dQw4w9WgXcE";
+const userID = "testtesttesttesttesttesttesttesttest";
+const endpoint = "/api/postVideoSponsorTimes";
 
 describe("postVideoSponsorTime (Old submission method)", () => {
-    it("Should be able to submit a time (GET)", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/postVideoSponsorTimes?videoID=dQw4w9WgXcQ&startTime=1&endTime=10&userID=testtesttesttesttesttesttesttesttest`)
+    it("Should be able to submit a time (GET)", (done) => {
+        client.get(endpoint, { params: { videoID: videoID1, startTime: 1, endTime: 10, userID } })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcQ"]);
+                const row = await db.prepare("get", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoID1]);
                 const expected = {
                     startTime: 1,
                     endTime: 10,
@@ -21,17 +24,15 @@ describe("postVideoSponsorTime (Old submission method)", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to submit a time (POST)", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/postVideoSponsorTimes?videoID=dQw4w9WgXcE&startTime=1&endTime=11&userID=testtesttesttesttesttesttesttesttest`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
+    it("Should be able to submit a time (POST)", (done) => {
+        client({
+            url: endpoint,
+            params: { videoID: videoID2, startTime: 1, endTime: 11, userID },
+            method: "post",
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, ["dQw4w9WgXcE"]);
+                const row = await db.prepare("get", `SELECT "startTime", "endTime", "category" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoID2]);
                 const expected = {
                     startTime: 1,
                     endTime: 11,
@@ -43,10 +44,9 @@ describe("postVideoSponsorTime (Old submission method)", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 for missing params", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/postVideoSponsorTimes?startTime=1&endTime=10&userID=testtesttesttesttesttesttesttesttest`)
-            .then(async res => {
+    it("Should return 400 for missing params", (done) => {
+        client.post(endpoint, { params: { startTime: 1, endTime: 10, userID } })
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })

test/cases/postClearCache.ts

@@ -1,21 +1,22 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
+import { client } from "../utils/httpClient";
+
+const VIPUser = "clearCacheVIP";
+const regularUser = "regular-user";
+const endpoint = "/api/clearCache";
+const postClearCache = (userID: string, videoID: string) => client({ method: "post", url: endpoint, params: { userID, videoID } });
 
 describe("postClearCache", () => {
     before(async () => {
-        await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES ('${getHash("clearing-vip")}')`);
-        const startOfQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden", "hashedVideoID") VALUES';
-        await db.prepare("run", `${startOfQuery}('clear-test', 0, 1, 2, 'clear-uuid', 'testman', 0, 50, 'sponsor', 0, '" + getHash("clear-test", 1) + "')`);
+        await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES ('${getHash(VIPUser)}')`);
+        const startOfQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", "views", "category", "shadowHidden") VALUES';
+        await db.prepare("run", `${startOfQuery}('clear-test', 0, 1, 2, 'clear-uuid', 'testman', 0, 50, 'sponsor', 0)`);
     });
 
-    it("Should be able to clear cache for existing video", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/clearCache?userID=clearing-vip&videoID=clear-test`, {
-            method: "POST"
-        })
+    it("Should be able to clear cache for existing video", (done) => {
+        postClearCache(VIPUser, "clear-test")
             .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
@@ -23,11 +24,8 @@ describe("postClearCache", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to clear cache for nonexistent video", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/clearCache?userID=clearing-vip&videoID=dne-video`, {
-            method: "POST"
-        })
+    it("Should be able to clear cache for nonexistent video", (done) => {
+        postClearCache(VIPUser, "dne-video")
             .then(res => {
                 assert.strictEqual(res.status, 200);
                 done();
@@ -35,36 +33,27 @@ describe("postClearCache", () => {
             .catch(err => done(err));
     });
 
-    it("Should get 403 as non-vip", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/clearCache?userID=regular-user&videoID=clear-tes`, {
-            method: "POST"
-        })
-            .then(async res => {
+    it("Should get 403 as non-vip", (done) => {
+        postClearCache(regularUser, "clear-test")
+            .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should give 400 with missing videoID", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/clearCache?userID=clearing-vip`, {
-            method: "POST"
-        })
-            .then(async res => {
+    it("Should give 400 with missing videoID", (done) => {
+        client.post(endpoint, { params: { userID: VIPUser } })
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should give 400 with missing userID", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/clearCache?userID=clearing-vip`, {
-            method: "POST"
-        })
-            .then(async res => {
+    it("Should give 400 with missing userID", (done) => {
+        client.post(endpoint, { params: { videoID: "clear-test" } })
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })

test/cases/postPurgeAllSegments.ts

@@ -1,9 +1,8 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
-import {IDatabase} from "../../src/databases/IDatabase";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { IDatabase } from "../../src/databases/IDatabase";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 async function dbSponsorTimesAdd(db: IDatabase, videoID: string, startTime: number, endTime: number, UUID: string, category: string) {
     const votes = 0,
@@ -32,9 +31,9 @@ async function dbSponsorTimesCompareExpect(db: IDatabase, videoId: string, expec
 
 describe("postPurgeAllSegments", function () {
     const privateVipUserID = "VIPUser-purgeAll";
-    const route = "/api/purgeAllSegments";
     const vipUserID = getHash(privateVipUserID);
-    const baseURL = getbaseURL();
+    const endpoint = "/api/purgeAllSegments";
+    const postSegmentShift = (videoID: string, userID: string) => client.post(endpoint, { videoID, userID });
 
     before(async function () {
         // startTime and endTime get set in beforeEach for consistency
@@ -46,35 +45,17 @@ describe("postPurgeAllSegments", function () {
         await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES (?)`, [vipUserID]);
     });
 
-    it("Reject non-VIP user", function (done: Done) {
-        fetch(`${baseURL}${route}`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegpurge01",
-                userID: "segshift_randomuser001",
-            }),
-        })
-            .then(async res => {
+    it("Reject non-VIP user", function (done) {
+        postSegmentShift("vsegpurge01", "segshift_randomuser001")
+            .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Purge all segments success", function (done: Done) {
-        fetch(`${baseURL}${route}`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegpurge01",
-                userID: privateVipUserID,
-            }),
-        })
+    it("Purge all segments success", function (done) {
+        postSegmentShift("vsegpurge01", privateVipUserID)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
                 done(await dbSponsorTimesCompareExpect(db, "vsegpurge01", 1) || await dbSponsorTimesCompareExpect(db, "vseg-not-purged01", 0));
@@ -82,14 +63,9 @@ describe("postPurgeAllSegments", function () {
             .catch(err => done(err));
     });
 
-    it("Should return 400 if missing body", function (done: Done) {
-        fetch(`${baseURL}${route}`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            }
-        })
-            .then(async res => {
+    it("Should return 400 if missing body", function (done) {
+        client.post(endpoint, {})
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })

test/cases/postWarning.ts

@@ -1,30 +1,28 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL, partialDeepEquals} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 describe("postWarning", () => {
+    // constants
+    const endpoint = "/api/warnUser";
+    const getWarning = (userID: string) => db.prepare("get", `SELECT "userID", "issueTime", "issuerUserID", enabled, "reason" FROM warnings WHERE "userID" = ?`, [userID]);
+
     before(async () => {
         await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES (?)`, [getHash("warning-vip")]);
     });
 
-    it("Should be able to create warning if vip (exp 200)", (done: Done) => {
+    it("Should be able to create warning if vip (exp 200)", (done) => {
         const json = {
             issuerUserID: "warning-vip",
             userID: "warning-0",
             reason: "warning-reason-0"
         };
-        fetch(`${getbaseURL()}/api/warnUser`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "userID", "issueTime", "issuerUserID", enabled, "reason" FROM warnings WHERE "userID" = ?`, [json.userID]);
+                const row = await getWarning(json.userID);
                 const expected = {
                     enabled: 1,
                     issuerUserID: getHash(json.issuerUserID),
@@ -36,22 +34,16 @@ describe("postWarning", () => {
             .catch(err => done(err));
     });
 
-    it("Should be not be able to create a duplicate warning if vip", (done: Done) => {
+    it("Should be not be able to create a duplicate warning if vip", (done) => {
         const json = {
             issuerUserID: "warning-vip",
             userID: "warning-0",
         };
 
-        fetch(`${getbaseURL()}/api/warnUser`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 409);
-                const row = await db.prepare("get", `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]);
+                const row = await getWarning(json.userID);
                 const expected = {
                     enabled: 1,
                     issuerUserID: getHash(json.issuerUserID),
@@ -62,23 +54,17 @@ describe("postWarning", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to remove warning if vip", (done: Done) => {
+    it("Should be able to remove warning if vip", (done) => {
         const json = {
             issuerUserID: "warning-vip",
             userID: "warning-0",
             enabled: false
         };
 
-        fetch(`${getbaseURL()}/api/warnUser`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]);
+                const row = await getWarning(json.userID);
                 const expected = {
                     enabled: 0
                 };
@@ -88,19 +74,13 @@ describe("postWarning", () => {
             .catch(err => done(err));
     });
 
-    it("Should not be able to create warning if not vip (exp 403)", (done: Done) => {
+    it("Should not be able to create warning if not vip (exp 403)", (done) => {
         const json = {
             issuerUserID: "warning-not-vip",
             userID: "warning-1",
         };
 
-        fetch(`${getbaseURL()}/api/warnUser`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
@@ -108,37 +88,26 @@ describe("postWarning", () => {
             .catch(err => done(err));
     });
 
-    it("Should return 400 if missing body", (done: Done) => {
-        fetch(`${getbaseURL()}/api/warnUser`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            }
-        })
-            .then(async res => {
+    it("Should return 400 if missing body", (done) => {
+        client.post(endpoint, {})
+            .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should re-enable disabled warning", (done: Done) => {
+    it("Should re-enable disabled warning", (done) => {
         const json = {
             issuerUserID: "warning-vip",
             userID: "warning-0",
             enabled: true
         };
 
-        fetch(`${getbaseURL()}/api/warnUser`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify(json),
-        })
+        client.post(endpoint, json)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const data = await db.prepare("get", `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]);
+                const data = await getWarning(json.userID);
                 const expected = {
                     enabled: 1
                 };

test/cases/reputation.ts

@@ -4,117 +4,128 @@ import { UserID } from "../../src/types/user.model";
 import { getHash } from "../../src/utils/getHash";
 import { getReputation, calculateReputationFromMetrics } from "../../src/utils/reputation";
 
-const userIDLowSubmissions = "reputation-lowsubmissions" as UserID;
-const userIDHighDownvotes = "reputation-highdownvotes" as UserID;
-const userIDHighNonSelfDownvotes = "reputation-highnonselfdownvotes" as UserID;
-const userIDNewSubmissions = "reputation-newsubmissions" as UserID;
-const userIDLowSum = "reputation-lowsum" as UserID;
-const userIDHighRepBeforeManualVote = "reputation-oldhighrep" as UserID;
-const userIDHighRep = "reputation-highrep" as UserID;
-const userIDHighRepAndLocked = "reputation-highlockedrep" as UserID;
-const userIDHaveMostUpvotedInLockedVideo = "reputation-mostupvotedaslocked" as UserID;
-
 describe("reputation", () => {
+    // constants
+    const userIDLowSubmissions = "reputation-lowsubmissions" as UserID;
+    const userHashLowSubmissions = getHash(userIDLowSubmissions);
+    const userIDHighDownvotes = "reputation-highdownvotes" as UserID;
+    const userHashHighDownvotes = getHash(userIDHighDownvotes);
+    const userIDHighNonSelfDownvotes = "reputation-highnonselfdownvotes" as UserID;
+    const userHashHighNonSelfDownvotes = getHash(userIDHighNonSelfDownvotes);
+    const userIDNewSubmissions = "reputation-newsubmissions" as UserID;
+    const userHashNewSubmissions = getHash(userIDNewSubmissions);
+    const userIDLowSum = "reputation-lowsum" as UserID;
+    const userHashLowSum = getHash(userIDLowSum);
+    const userIDHighRepBeforeManualVote = "reputation-oldhighrep" as UserID;
+    const userHashHighRepBeforeManualVote = getHash(userIDHighRepBeforeManualVote);
+    const userIDHighRep = "reputation-highrep" as UserID;
+    const userHashHighRep = getHash(userIDHighRep);
+    const userIDHighRepAndLocked = "reputation-highlockedrep" as UserID;
+    const userHashHighAndLocked = getHash(userIDHighRepAndLocked);
+    const userIDHaveMostUpvotedInLockedVideo = "reputation-mostupvotedaslocked" as UserID;
+    const userHashHaveMostUpvotedInLockedVideo = getHash(userIDHaveMostUpvotedInLockedVideo);
+
     before(async function() {
         this.timeout(5000); // this preparation takes longer then usual
         const videoID = "reputation-videoID";
         const videoID2 = "reputation-videoID-2";
 
-        const sponsorTimesInsertQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "category", "service", "videoDuration", "hidden", "shadowHidden", "hashedVideoID") VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)';
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-0-uuid-0", getHash(userIDLowSubmissions), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-0-uuid-1", getHash(userIDLowSubmissions), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 100, 0, "reputation-0-uuid-2", getHash(userIDLowSubmissions), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        const sponsorTimesInsertQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "category", "hidden", "shadowHidden") VALUES(?,?,?,?,?,?,?,?,?,?,?,?)';
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-0-uuid-0", userHashLowSubmissions, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-0-uuid-1", userHashLowSubmissions, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 100, 0, "reputation-0-uuid-2", userHashLowSubmissions, 1606240000000, 50, "sponsor", 0, 0]);
 
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-1-uuid-0", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-1", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-2", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-3", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-4", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-1-uuid-5", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-uuid-6", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-uuid-7", getHash(userIDHighDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-1-uuid-0", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-1", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-2", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-3", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -2, 0, "reputation-1-uuid-4", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-1-uuid-5", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-uuid-6", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-uuid-7", userHashHighDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
 
         // First video is considered a normal downvote, second is considered a self-downvote (ie. they didn't resubmit to fix their downvote)
-        await db.prepare("run", sponsorTimesInsertQuery, [`${videoID}A`, 1, 11, 2, 0, "reputation-1-1-uuid-0", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [`${videoID}A`, 1, 11, 2, 0, "reputation-1-1-uuid-0", userHashHighNonSelfDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
         // Different category, same video
-        await db.prepare("run", sponsorTimesInsertQuery, [`${videoID}A`, 1, 11, -2, 0, "reputation-1-1-uuid-1", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "intro", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-2", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-3", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-4", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-1-1-uuid-5", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-6", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-7", getHash(userIDHighNonSelfDownvotes), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [`${videoID}A`, 1, 11, -2, 0, "reputation-1-1-uuid-1", userHashHighNonSelfDownvotes, 1606240000000, 50, "intro", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-2", userHashHighNonSelfDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-3", userHashHighNonSelfDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-4", userHashHighNonSelfDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-1-1-uuid-5", userHashHighNonSelfDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-6", userHashHighNonSelfDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-1-1-uuid-7", userHashHighNonSelfDownvotes, 1606240000000, 50, "sponsor", 0, 0]);
 
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-0", getHash(userIDNewSubmissions), Date.now(), 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-1", getHash(userIDNewSubmissions), Date.now(), 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-2", getHash(userIDNewSubmissions), Date.now(), 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-3", getHash(userIDNewSubmissions), Date.now(), 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-4", getHash(userIDNewSubmissions), Date.now(), 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-2-uuid-5", getHash(userIDNewSubmissions), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-2-uuid-6", getHash(userIDNewSubmissions), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-2-uuid-7", getHash(userIDNewSubmissions), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-0", userHashNewSubmissions, Date.now(), 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-1", userHashNewSubmissions, Date.now(), 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-2", userHashNewSubmissions, Date.now(), 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-3", userHashNewSubmissions, Date.now(), 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-2-uuid-4", userHashNewSubmissions, Date.now(), 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-2-uuid-5", userHashNewSubmissions, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-2-uuid-6", userHashNewSubmissions, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-2-uuid-7", userHashNewSubmissions, 1606240000000, 50, "sponsor", 0, 0]);
 
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-3-uuid-0", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 1, 0, "reputation-3-uuid-1", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-2", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-3", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 1, 0, "reputation-3-uuid-4", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-3-uuid-5", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-6", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-7", getHash(userIDLowSum), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-3-uuid-0", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 1, 0, "reputation-3-uuid-1", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-2", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-3", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 1, 0, "reputation-3-uuid-4", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-3-uuid-5", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-6", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-3-uuid-7", userHashLowSum, 1606240000000, 50, "sponsor", 0, 0]);
 
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-0", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-1", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-2", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-3", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-4", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-4-uuid-5", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-4-uuid-6", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-4-uuid-7", getHash(userIDHighRepBeforeManualVote), 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-0", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-1", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-2", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-3", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-4-uuid-4", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-4-uuid-5", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-4-uuid-6", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-4-uuid-7", userHashHighRepBeforeManualVote, 0, 50, "sponsor", 0, 0]);
 
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-0", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-1", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-2", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-3", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-4", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-5-uuid-5", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-5-uuid-6", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-5-uuid-7", getHash(userIDHighRep), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-0", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-1", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-2", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-3", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-5-uuid-4", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-5-uuid-5", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-5-uuid-6", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-5-uuid-7", userHashHighRep, 1606240000000, 50, "sponsor", 0, 0]);
 
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-0", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-1", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-2", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-3", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-6-uuid-4", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-6-uuid-5", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-6-uuid-6", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-6-uuid-7", getHash(userIDHighRepAndLocked), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-0", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-1", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-2", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 1, "reputation-6-uuid-3", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-6-uuid-4", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-6-uuid-5", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-6-uuid-6", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-6-uuid-7", userHashHighAndLocked, 1606240000000, 50, "sponsor", 0, 0]);
 
         //Record has most upvoted
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 5, 0, "reputation-7-uuid-0", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 101, 0, "reputation-7-uuid-1", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "intro", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID2, 1, 11, 5, 0, "reputation-7-uuid-8", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID2, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID2, 1, 11, 0, 0, "reputation-7-uuid-9", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID2, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 5, 0, "reputation-7-uuid-0", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 101, 0, "reputation-7-uuid-1", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "intro", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID2, 1, 11, 5, 0, "reputation-7-uuid-8", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID2, 1, 11, 0, 0, "reputation-7-uuid-9", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
         // other segments
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-7-uuid-2", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-7-uuid-3", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-7-uuid-4", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-7-uuid-5", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-7-uuid-6", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
-        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-7-uuid-7", getHash(userIDHaveMostUpvotedInLockedVideo), 1606240000000, 50, "sponsor", "YouTube", 100, 0, 0, getHash(videoID, 1)]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-7-uuid-2", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-7-uuid-3", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 2, 0, "reputation-7-uuid-4", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, -1, 0, "reputation-7-uuid-5", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-7-uuid-6", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
+        await db.prepare("run", sponsorTimesInsertQuery, [videoID, 1, 11, 0, 0, "reputation-7-uuid-7", userHashHaveMostUpvotedInLockedVideo, 1606240000000, 50, "sponsor", 0, 0]);
 
         // lock video
         const insertVipUserQuery = 'INSERT INTO "vipUsers" ("userID") VALUES (?)';
         await db.prepare("run", insertVipUserQuery, [getHash("VIPUser-getLockCategories")]);
 
-        const insertLockCategoryQuery = 'INSERT INTO "lockCategories" ("userID", "videoID", "category", "hashedVideoID") VALUES (?, ?, ?, ?)';
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), videoID, "sponsor", getHash(videoID, 1)]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), videoID, "intro", getHash(videoID, 1)]);
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), videoID2, "sponsor", getHash(videoID2, 1)]);
+        const insertLockCategoryQuery = 'INSERT INTO "lockCategories" ("userID", "videoID", "category") VALUES (?, ?, ?)';
+        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), videoID, "sponsor"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), videoID, "intro"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-getLockCategories"), videoID2, "sponsor"]);
     });
 
     it("user in grace period", async () => {
-        assert.strictEqual(await getReputation(getHash(userIDLowSubmissions)), 0);
+        const data = await getReputation(getHash(userIDLowSubmissions));
+        assert.strictEqual(data, 0);
     });
 
     it("user with high downvote ratio", async () => {
@@ -128,9 +139,9 @@ describe("reputation", () => {
             oldUpvotedSubmissions: 1,
             mostUpvotedInLockedVideoSum: 0
         };
-
-        assert.strictEqual(await getReputation(getHash(userIDHighDownvotes)), calculateReputationFromMetrics(metrics));
-        assert.strictEqual(await getReputation(getHash(userIDHighDownvotes)), -2.125);
+        const data = await getReputation(getHash(userIDHighDownvotes));
+        assert.strictEqual(data, calculateReputationFromMetrics(metrics));
+        assert.strictEqual(data, -2.125);
     });
 
     it("user with high non self downvote ratio", async () => {
@@ -144,20 +155,21 @@ describe("reputation", () => {
             oldUpvotedSubmissions: 1,
             mostUpvotedInLockedVideoSum: 0
         };
-        assert.strictEqual(await getReputation(getHash(userIDHighNonSelfDownvotes)), calculateReputationFromMetrics(metrics));
-        assert.strictEqual(await getReputation(getHash(userIDHighNonSelfDownvotes)), -1.6428571428571428);
+        const data = await getReputation(userHashHighNonSelfDownvotes);
+        assert.strictEqual(data, calculateReputationFromMetrics(metrics));
+        assert.strictEqual(data, -1.6428571428571428);
     });
 
     it("user with mostly new submissions", async () => {
-        assert.strictEqual(await getReputation(getHash(userIDNewSubmissions)), 0);
+        assert.strictEqual(await getReputation(userHashNewSubmissions), 0);
     });
 
     it("user with not enough vote sum", async () => {
-        assert.strictEqual(await getReputation(getHash(userIDLowSum)), 0);
+        assert.strictEqual(await getReputation(userHashLowSum), 0);
     });
 
     it("user with lots of old votes (before autovote was disabled) ", async () => {
-        assert.strictEqual(await getReputation(getHash(userIDHighRepBeforeManualVote)), 0);
+        assert.strictEqual(await getReputation(userHashHighRepBeforeManualVote), 0);
     });
 
     it("user with high reputation", async () => {
@@ -171,8 +183,9 @@ describe("reputation", () => {
             oldUpvotedSubmissions: 5,
             mostUpvotedInLockedVideoSum: 0
         };
-        assert.strictEqual(await getReputation(getHash(userIDHighRep)), calculateReputationFromMetrics(metrics));
-        assert.strictEqual(await getReputation(getHash(userIDHighRep)), 0.19310344827586207);
+        const data = await getReputation(userHashHighRep);
+        assert.strictEqual(data, calculateReputationFromMetrics(metrics));
+        assert.strictEqual(data, 0.19310344827586207);
     });
 
     it("user with high reputation and locked segments", async () => {
@@ -186,8 +199,9 @@ describe("reputation", () => {
             oldUpvotedSubmissions: 5,
             mostUpvotedInLockedVideoSum: 0
         };
-        assert.strictEqual(await getReputation(getHash(userIDHighRepAndLocked)), calculateReputationFromMetrics(metrics));
-        assert.strictEqual(await getReputation(getHash(userIDHighRepAndLocked)), 1.793103448275862);
+        const data = await getReputation(userHashHighAndLocked);
+        assert.strictEqual(data, calculateReputationFromMetrics(metrics));
+        assert.strictEqual(data, 1.793103448275862);
     });
 
     it("user with most upvoted segments in locked video", async () => {
@@ -201,8 +215,9 @@ describe("reputation", () => {
             oldUpvotedSubmissions: 6,
             mostUpvotedInLockedVideoSum: 2
         };
-        assert.strictEqual(await getReputation(getHash(userIDHaveMostUpvotedInLockedVideo)), calculateReputationFromMetrics(metrics));
-        assert.strictEqual(await getReputation(getHash(userIDHaveMostUpvotedInLockedVideo)),  6.158620689655172);
+        const data = await getReputation(userHashHaveMostUpvotedInLockedVideo);
+        assert.strictEqual(data, calculateReputationFromMetrics(metrics));
+        assert.strictEqual(data,  6.158620689655172);
     });
 
 });

test/cases/segmentShift.ts

@@ -1,46 +1,51 @@
-import fetch from "node-fetch";
-import {Done, getbaseURL} from "../utils";
-import {db} from "../../src/databases/databases";
-import {getHash} from "../../src/utils/getHash";
-import {IDatabase} from "../../src/databases/IDatabase";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { IDatabase } from "../../src/databases/IDatabase";
 import assert from "assert";
-
-async function dbSponsorTimesAdd(db: IDatabase, videoID: string, startTime: number, endTime: number, UUID: string, category: string) {
-    const votes = 0,
-        userID = 0,
-        timeSubmitted = 0,
-        views = 0,
-        shadowHidden = 0,
-        hashedVideoID = `hash_${UUID}`;
-    await db.prepare("run", `INSERT INTO
-        "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID",
-        "userID", "timeSubmitted", "views", "category", "shadowHidden", "hashedVideoID")
-    VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-    [videoID, startTime, endTime, votes, UUID, userID, timeSubmitted, views, category, shadowHidden, hashedVideoID]);
-}
-
-async function dbSponsorTimesSetByUUID(db: IDatabase, UUID: string, startTime: number, endTime: number) {
-    await db.prepare("run", `UPDATE "sponsorTimes" SET "startTime" = ?, "endTime" = ? WHERE "UUID" = ?`, [startTime, endTime, UUID]);
-}
-
-async function dbSponsorTimesCompareExpect(db: IDatabase, expect: any): Promise<void> {
-    for (let i = 0, len = expect.length; i < len; i++) {
-        const expectSeg = expect[i];
-        const seg = await db.prepare("get", `SELECT "startTime", "endTime" FROM "sponsorTimes" WHERE "UUID" = ?`, [expectSeg.UUID]);
-        if ("removed" in expect) {
-            assert.ok(expect.removed);
-            assert.strictEqual(seg.votes, -2);
-            assert.deepStrictEqual(seg, expectSeg);
-            assert.strictEqual(seg.startTime, expectSeg.startTime);
-            assert.strictEqual(seg.endTime, expectSeg.endTime);
-        }
-    }
-}
+import { client } from "../utils/httpClient";
 
 describe("segmentShift", function () {
+    // functions
+    async function dbSponsorTimesAdd(db: IDatabase, videoID: string, startTime: number, endTime: number, UUID: string, category: string) {
+        const votes = 0,
+            userID = 0,
+            timeSubmitted = 0,
+            views = 0,
+            shadowHidden = 0,
+            hashedVideoID = `hash_${UUID}`;
+        await db.prepare("run", `INSERT INTO
+            "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID",
+            "userID", "timeSubmitted", "views", "category", "shadowHidden", "hashedVideoID")
+        VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+        [videoID, startTime, endTime, votes, UUID, userID, timeSubmitted, views, category, shadowHidden, hashedVideoID]);
+    }
+
+    async function dbSponsorTimesSetByUUID(db: IDatabase, UUID: string, startTime: number, endTime: number) {
+        await db.prepare("run", `UPDATE "sponsorTimes" SET "startTime" = ?, "endTime" = ? WHERE "UUID" = ?`, [startTime, endTime, UUID]);
+    }
+
+    async function dbSponsorTimesCompareExpect(db: IDatabase, expect: any): Promise<void> {
+        for (let i = 0, len = expect.length; i < len; i++) {
+            const expectSeg = expect[i];
+            const seg = await db.prepare("get", `SELECT "startTime", "endTime" FROM "sponsorTimes" WHERE "UUID" = ?`, [expectSeg.UUID]);
+            if ("removed" in expect) {
+                assert.ok(expect.removed);
+                assert.strictEqual(seg.votes, -2);
+                assert.deepStrictEqual(seg, expectSeg);
+                assert.strictEqual(seg.startTime, expectSeg.startTime);
+                assert.strictEqual(seg.endTime, expectSeg.endTime);
+            }
+        }
+    }
+    // constants
     const privateVipUserID = "VIPUser-segmentShift";
     const vipUserID = getHash(privateVipUserID);
-    const baseURL = getbaseURL();
+    const endpoint = "/api/segmentShift";
+    const postSegmentShift = (data: Record<string, any>) => client({
+        method: "POST",
+        url: endpoint,
+        data,
+    });
 
     before(async function () {
         // startTime and endTime get set in beforeEach for consistency
@@ -59,232 +64,171 @@ describe("segmentShift", function () {
         await dbSponsorTimesSetByUUID(db, "vsegshifttest01uuid04", 120, 140);
     });
 
-    it("Reject none VIP user", function (done: Done) {
-        fetch(`${baseURL}/api/segmentShift`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegshift01",
-                userID: "segshift_randomuser001",
-                startTime: 20,
-                endTime: 30,
-            }),
+    it("Reject non VIP user", (done) => {
+        postSegmentShift({
+            videoID: "vsegshift01",
+            userID: "segshift_randomuser001",
+            startTime: 20,
+            endTime: 30,
         })
-            .then(async res => {
+            .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Shift is outside segments", function (done: Done) {
-        fetch(`${baseURL}/api/segmentShift`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegshift01",
-                userID: privateVipUserID,
-                startTime: 20,
-                endTime: 30,
-            }),
+    it("Shift is outside segments", (done) => {
+        postSegmentShift({
+            videoID: "vsegshift01",
+            userID: privateVipUserID,
+            startTime: 20,
+            endTime: 30,
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const expect = [
-                    {
-                        UUID: "vsegshifttest01uuid01",
-                        startTime: 0,
-                        endTime: 10,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid02",
-                        startTime: 50,
-                        endTime: 80,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid03",
-                        startTime: 30,
-                        endTime: 35,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid04",
-                        startTime: 110,
-                        endTime: 130,
-                    },
-                ];
+                const expect = [{
+                    UUID: "vsegshifttest01uuid01",
+                    startTime: 0,
+                    endTime: 10,
+                }, {
+                    UUID: "vsegshifttest01uuid02",
+                    startTime: 50,
+                    endTime: 80,
+                }, {
+                    UUID: "vsegshifttest01uuid03",
+                    startTime: 30,
+                    endTime: 35,
+                }, {
+                    UUID: "vsegshifttest01uuid04",
+                    startTime: 110,
+                    endTime: 130,
+                }];
                 done(await dbSponsorTimesCompareExpect(db, expect));
             })
             .catch(err => done(err));
     });
 
-    it("Shift is inside segment", function (done: Done) {
-        fetch(`${baseURL}/api/segmentShift`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegshift01",
-                userID: privateVipUserID,
-                startTime: 65,
-                endTime: 75,
-            }),
+    it("Shift is inside segment", (done) => {
+        postSegmentShift({
+            videoID: "vsegshift01",
+            userID: privateVipUserID,
+            startTime: 65,
+            endTime: 75,
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const expect = [
-                    {
-                        UUID: "vsegshifttest01uuid01",
-                        startTime: 0,
-                        endTime: 10,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid02",
-                        startTime: 60,
-                        endTime: 80,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid03",
-                        startTime: 40,
-                        endTime: 45,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid04",
-                        startTime: 110,
-                        endTime: 130,
-                    },
-                ];
+                const expect = [{
+                    UUID: "vsegshifttest01uuid01",
+                    startTime: 0,
+                    endTime: 10,
+                }, {
+                    UUID: "vsegshifttest01uuid02",
+                    startTime: 60,
+                    endTime: 80,
+                }, {
+                    UUID: "vsegshifttest01uuid03",
+                    startTime: 40,
+                    endTime: 45,
+                }, {
+                    UUID: "vsegshifttest01uuid04",
+                    startTime: 110,
+                    endTime: 130,
+                }];
                 done(await dbSponsorTimesCompareExpect(db, expect));
             })
             .catch(err => done(err));
     });
 
-    it("Shift is overlaping startTime of segment", function (done: Done) {
-        fetch(`${baseURL}/api/segmentShift`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegshift01",
-                userID: privateVipUserID,
-                startTime: 32,
-                endTime: 42,
-            }),
+    it("Shift is overlaping startTime of segment", (done) => {
+        postSegmentShift({
+            videoID: "vsegshift01",
+            userID: privateVipUserID,
+            startTime: 32,
+            endTime: 42,
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const expect = [
-                    {
-                        UUID: "vsegshifttest01uuid01",
-                        startTime: 0,
-                        endTime: 10,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid02",
-                        startTime: 50,
-                        endTime: 80,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid03",
-                        startTime: 32,
-                        endTime: 35,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid04",
-                        startTime: 110,
-                        endTime: 130,
-                    },
-                ];
+                const expect = [{
+                    UUID: "vsegshifttest01uuid01",
+                    startTime: 0,
+                    endTime: 10,
+                }, {
+                    UUID: "vsegshifttest01uuid02",
+                    startTime: 50,
+                    endTime: 80,
+                }, {
+                    UUID: "vsegshifttest01uuid03",
+                    startTime: 32,
+                    endTime: 35,
+                }, {
+                    UUID: "vsegshifttest01uuid04",
+                    startTime: 110,
+                    endTime: 130,
+                }];
                 done(await dbSponsorTimesCompareExpect(db, expect));
             })
             .catch(err => done(err));
     });
 
-    it("Shift is overlaping endTime of segment", function (done: Done) {
-        fetch(`${baseURL}/api/segmentShift`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegshift01",
-                userID: privateVipUserID,
-                startTime: 85,
-                endTime: 95,
-            }),
+    it("Shift is overlaping endTime of segment", (done) => {
+        postSegmentShift({
+            videoID: "vsegshift01",
+            userID: privateVipUserID,
+            startTime: 85,
+            endTime: 95,
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const expect = [
-                    {
-                        UUID: "vsegshifttest01uuid01",
-                        startTime: 0,
-                        endTime: 10,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid02",
-                        startTime: 60,
-                        endTime: 85,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid03",
-                        startTime: 40,
-                        endTime: 45,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid04",
-                        startTime: 110,
-                        endTime: 130,
-                    },
-                ];
+                const expect = [{
+                    UUID: "vsegshifttest01uuid01",
+                    startTime: 0,
+                    endTime: 10,
+                }, {
+                    UUID: "vsegshifttest01uuid02",
+                    startTime: 60,
+                    endTime: 85,
+                }, {
+                    UUID: "vsegshifttest01uuid03",
+                    startTime: 40,
+                    endTime: 45,
+                }, {
+                    UUID: "vsegshifttest01uuid04",
+                    startTime: 110,
+                    endTime: 130,
+                }];
                 done(await dbSponsorTimesCompareExpect(db, expect));
             })
             .catch(err => done(err));
     });
 
-    it("Shift is overlaping segment", function (done: Done) {
-        fetch(`${baseURL}/api/segmentShift`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                videoID: "vsegshift01",
-                userID: privateVipUserID,
-                startTime: 35,
-                endTime: 55,
-            }),
+    it("Shift is overlaping segment", (done) => {
+        postSegmentShift({
+            videoID: "vsegshift01",
+            userID: privateVipUserID,
+            startTime: 35,
+            endTime: 55,
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const expect = [
-                    {
-                        UUID: "vsegshifttest01uuid01",
-                        startTime: 0,
-                        endTime: 10,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid02",
-                        startTime: 40,
-                        endTime: 70,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid03",
-                        startTime: 40,
-                        endTime: 45,
-                        removed: true,
-                    },
-                    {
-                        UUID: "vsegshifttest01uuid04",
-                        startTime: 100,
-                        endTime: 120,
-                    },
-                ];
+                const expect = [{
+                    UUID: "vsegshifttest01uuid01",
+                    startTime: 0,
+                    endTime: 10,
+                }, {
+                    UUID: "vsegshifttest01uuid02",
+                    startTime: 40,
+                    endTime: 70,
+                }, {
+                    UUID: "vsegshifttest01uuid03",
+                    startTime: 40,
+                    endTime: 45,
+                    removed: true,
+                }, {
+                    UUID: "vsegshifttest01uuid04",
+                    startTime: 100,
+                    endTime: 120,
+                }];
                 done(await dbSponsorTimesCompareExpect(db, expect));
             })
             .catch(err => done(err));

test/cases/setUsername.ts

@@ -1,8 +1,7 @@
-import fetch from "node-fetch";
-import { Done, getbaseURL } from "../utils";
 import { db, privateDB } from "../../src/databases/databases";
 import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 const adminPrivateUserID = "testUserId";
 const user00PrivateUserID = "setUsername_00";
@@ -35,14 +34,14 @@ async function getUsernameInfo(userID: string): Promise<{ userName: string, lock
     return row;
 }
 
-async function addLogUserNameChange(userID: string, newUserName: string, oldUserName = "") {
+function addLogUserNameChange(userID: string, newUserName: string, oldUserName = "") {
     privateDB.prepare("run",
         `INSERT INTO "userNameLogs"("userID", "newUserName", "oldUserName", "updatedAt", "updatedByAdmin") VALUES(?, ?, ?, ?, ?)`,
         [getHash(userID), newUserName, oldUserName, new Date().getTime(), + true]
     );
 }
 
-async function getLastLogUserNameChange(userID: string) {
+function getLastLogUserNameChange(userID: string) {
     return privateDB.prepare("get", `SELECT * FROM "userNameLogs" WHERE "userID" = ? ORDER BY "updatedAt" DESC LIMIT 1`, [getHash(userID)]);
 }
 
@@ -51,7 +50,7 @@ function wellFormatUserName(userName: string) {
     return userName.replace(/[\u0000-\u001F\u007F-\u009F]/g, "");
 }
 
-async function testUserNameChangelog(userID: string, newUserName: string, oldUserName: string, byAdmin: boolean, done: Done) {
+async function testUserNameChangelog(userID: string, newUserName: string, oldUserName: string, byAdmin: boolean, done: Mocha.Done) {
     const log = await getLastLogUserNameChange(userID);
     assert.strictEqual(newUserName, log.newUserName);
     assert.strictEqual(oldUserName, log.oldUserName);
@@ -59,6 +58,26 @@ async function testUserNameChangelog(userID: string, newUserName: string, oldUse
     return done();
 }
 
+const endpoint = "/api/setUsername";
+const postSetUserName = (userID: string, username: string) => client({
+    method: "POST",
+    url: endpoint,
+    params: {
+        userID,
+        username,
+    }
+});
+
+const postSetUserNameAdmin = (userID: string, username: string, adminUserID: string) => client({
+    method: "POST",
+    url: endpoint,
+    params: {
+        userID,
+        username,
+        adminUserID,
+    }
+});
+
 describe("setUsername", () => {
     before(async () => {
         await addUsername(getHash(user01PrivateUserID), username01, 0);
@@ -70,157 +89,147 @@ describe("setUsername", () => {
         await addUsername(getHash(user07PrivateUserID), username07, 1);
     });
 
-    it("Should be able to set username that has never been set", (done: Done) => {
-        fetch(`${getbaseURL()}/api/setUsername?userID=${user00PrivateUserID}&username=${username00}`, {
-            method: "POST",
-        })
+    it("Should be able to set username that has never been set", (done) => {
+        postSetUserName(user00PrivateUserID, username00)
             .then(async res => {
+                console.log(res.data);
                 const usernameInfo = await getUsernameInfo(getHash(user00PrivateUserID));
                 assert.strictEqual(res.status, 200);
                 assert.strictEqual(usernameInfo.userName, username00);
                 assert.notStrictEqual(usernameInfo.locked, 1, "username should not be locked");
                 done();
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it("Should return 200", (done: Done) => {
-        fetch(`${getbaseURL()}/api/setUsername?userID=${user01PrivateUserID}&username=Changed%20Username`, {
-            method: "POST",
-        })
-            .then(async res => {
+    it("Should return 200", (done) => {
+        const username = "Changed%20Username";
+        postSetUserName(user01PrivateUserID, username)
+            .then(res => {
                 assert.strictEqual(res.status, 200);
-                testUserNameChangelog(user01PrivateUserID, decodeURIComponent("Changed%20Username"), username01, false, done);
+                testUserNameChangelog(user01PrivateUserID, username, username01, false, done);
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it('Should return 400 for missing param "userID"', (done: Done) => {
-        fetch(`${getbaseURL()}/api/setUsername?username=MyUsername`, {
+    it('Should return 400 for missing param "userID"', (done) => {
+        client({
             method: "POST",
+            url: endpoint,
+            data: {
+                userName: "MyUsername"
+            }
         })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it('Should return 400 for missing param "username"', (done: Done) => {
-        fetch(`${getbaseURL()}/api/setUsername?userID=test`, {
+    it('Should return 400 for missing param "username"', (done) => {
+        client({
             method: "POST",
+            url: endpoint,
+            data: {
+                userID: "test"
+            }
         })
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it('Should return 400 for "username" longer then 64 characters', (done: Done) => {
+    it('Should return 400 for "username" longer then 64 characters', (done) => {
         const username65 = "0000000000000000000000000000000000000000000000000000000000000000X";
-        fetch(`${getbaseURL()}/api/setUsername?userID=test&username=${encodeURIComponent(username65)}`, {
-            method: "POST",
-        })
+        postSetUserName("test", username65)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it('Should not change username if it contains "discord"', (done: Done) => {
+    it('Should not change username if it contains "discord"', (done) => {
         const newUsername = "discord.me";
-        fetch(`${getbaseURL()}/api/setUsername?userID=${user02PrivateUserID}&username=${encodeURIComponent(newUsername)}`, {
-            method: "POST",
-        })
+        postSetUserName(user02PrivateUserID, newUsername)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
                 const userNameInfo = await getUsernameInfo(getHash(user02PrivateUserID));
                 assert.notStrictEqual(userNameInfo.userName, newUsername);
                 done();
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it("Should be able to change username", (done: Done) => {
+    it("Should be able to change username", (done) => {
         const newUsername = "newUsername";
-        fetch(`${getbaseURL()}/api/setUsername?userID=${user03PrivateUserID}&username=${encodeURIComponent(newUsername)}`, {
-            method: "POST",
-        })
+        postSetUserName(user03PrivateUserID, newUsername)
             .then(async () => {
                 const usernameInfo = await getUsernameInfo(getHash(user03PrivateUserID));
                 assert.strictEqual(usernameInfo.userName, newUsername, "Username should change");
                 assert.notStrictEqual(usernameInfo.locked, 1, "Username should not be locked");
                 testUserNameChangelog(user03PrivateUserID, newUsername, username03, false, done);
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it("Should not be able to change locked username", (done: Done) => {
+    it("Should not be able to change locked username", (done) => {
         const newUsername = "newUsername";
-        fetch(`${getbaseURL()}/api/setUsername?userID=${user04PrivateUserID}&username=${encodeURIComponent(newUsername)}`, {
-            method: "POST",
-        })
+        postSetUserName(user04PrivateUserID, newUsername)
             .then(async () => {
                 const usernameInfo = await getUsernameInfo(getHash(user04PrivateUserID));
                 assert.notStrictEqual(usernameInfo.userName, newUsername, "Username should not be changed");
                 assert.strictEqual(usernameInfo.locked, 1, "username should be locked");
                 done();
             })
-            .catch((err) => done(`couldn't call endpoint: ${err}`));
+            .catch((err) => done(err));
     });
 
-    it("Should filter out unicode control characters", (done: Done) => {
+    it("Should filter out unicode control characters", (done) => {
         const newUsername = "This\nUsername+has\tInvalid+Characters";
-        fetch(`${getbaseURL()}/api/setUsername?userID=${user05PrivateUserID}&username=${encodeURIComponent(newUsername)}`, {
-            method: "POST",
-        })
+        postSetUserName(user05PrivateUserID, newUsername)
             .then(async () => {
                 const usernameInfo = await getUsernameInfo(getHash(user05PrivateUserID));
                 assert.notStrictEqual(usernameInfo.userName, newUsername, "Username should not contain control characters");
                 testUserNameChangelog(user05PrivateUserID, wellFormatUserName(newUsername), username05, false, done);
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it("Incorrect adminUserID should return 403", (done: Done) => {
+    it("Incorrect adminUserID should return 403", (done) => {
         const newUsername = "New Username";
-        fetch(`${getbaseURL()}/api/setUsername?adminUserID=invalidAdminID&userID=${getHash(user06PrivateUserID)}&username=${encodeURIComponent(newUsername)}`, {
-            method: "POST",
-        })
-            .then(async res => {
+        postSetUserNameAdmin(getHash(user06PrivateUserID), newUsername,"invalidAdminID")
+            .then(res => {
                 assert.strictEqual(res.status, 403);
                 done();
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it("Admin should be able to change username", (done: Done) => {
+    it("Admin should be able to change username", (done) => {
         const newUsername = "New Username";
-        fetch(`${getbaseURL()}/api/setUsername?adminUserID=${adminPrivateUserID}&userID=${getHash(user06PrivateUserID)}&username=${encodeURIComponent(newUsername)}`, {
-            method: "POST",
-        })
+        postSetUserNameAdmin(getHash(user06PrivateUserID), newUsername, adminPrivateUserID)
             .then(async () => {
                 const usernameInfo = await getUsernameInfo(getHash(user06PrivateUserID));
                 assert.strictEqual(usernameInfo.userName, newUsername, "username should be changed");
                 assert.strictEqual(usernameInfo.locked, 1, "Username should be locked");
                 testUserNameChangelog(user06PrivateUserID, newUsername, username06, true, done);
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 
-    it("Admin should be able to change locked username", (done: Done) => {
+    it("Admin should be able to change locked username", (done) => {
         const newUsername = "New Username";
-        fetch(`${getbaseURL()}/api/setUsername?adminUserID=${adminPrivateUserID}&userID=${getHash(user07PrivateUserID)}&username=${encodeURIComponent(newUsername)}`, {
-            method: "POST",
-        })
+        postSetUserNameAdmin(getHash(user07PrivateUserID), newUsername, adminPrivateUserID)
             .then(async () => {
                 const usernameInfo = await getUsernameInfo(getHash(user06PrivateUserID));
                 assert.strictEqual(usernameInfo.userName, newUsername, "Username should be changed");
                 assert.strictEqual(usernameInfo.locked, 1, "Username should be locked");
                 testUserNameChangelog(user07PrivateUserID, newUsername, username07, true, done);
             })
-            .catch(() => done(`couldn't call endpoint`));
+            .catch((err) => done(err));
     });
 });

test/cases/shadowBanUser.ts

@@ -1,10 +1,17 @@
-import fetch from "node-fetch";
-import {db} from "../../src/databases/databases";
-import {Done, getbaseURL} from "../utils";
-import {getHash} from "../../src/utils/getHash";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
 import assert from "assert";
+import { Category } from "../../src/types/segments.model";
+import { client } from "../utils/httpClient";
 
 describe("shadowBanUser", () => {
+    const getShadowBan = (userID: string) => db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, [userID]);
+    const getShadowBanSegments = (userID: string, status: number) => db.prepare("all", `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, [userID, status]);
+    const getShadowBanSegmentCategory = (userID: string, status: number): Promise<{shadowHidden: number, category: Category}[]> => db.prepare("all", `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, [userID, status]);
+
+    const endpoint = "/api/shadowBanUser";
+    const VIPuserID = "shadow-ban-vip";
+
     before(async () => {
         const insertQuery = `INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "category", "service", "videoDuration", "hidden", "shadowHidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`;
         await db.prepare("run", insertQuery, ["testtesttest", 1, 11, 2, 0, "shadow-1-uuid-0", "shadowBanned", 0, 50, "sponsor", "YouTube", 100, 0, 0, getHash("testtesttest", 1)]);
@@ -24,19 +31,23 @@ describe("shadowBanUser", () => {
         await db.prepare("run", `INSERT INTO "shadowBannedUsers" ("userID") VALUES(?)`, ["shadowBanned3"]);
         await db.prepare("run", `INSERT INTO "shadowBannedUsers" ("userID") VALUES(?)`, ["shadowBanned4"]);
 
-        await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES(?)`, [getHash("shadow-ban-vip")]);
+        await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES(?)`, [getHash(VIPuserID)]);
     });
 
-
-    it("Should be able to ban user and hide submissions", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/shadowBanUser?userID=shadowBanned&adminUserID=shadow-ban-vip`, {
-            method: "POST"
+    it("Should be able to ban user and hide submissions", (done) => {
+        const userID = "shadowBanned";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                adminUserID: VIPuserID,
+            }
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const videoRow = await db.prepare("all", `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned", 1]);
-                const shadowRow = await db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned"]);
+                const videoRow = await getShadowBanSegments(userID, 1);
+                const shadowRow = await getShadowBan(userID);
                 assert.ok(shadowRow);
                 assert.strictEqual(videoRow.length, 3);
                 done();
@@ -44,15 +55,22 @@ describe("shadowBanUser", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to unban user without unhiding submissions", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/shadowBanUser?userID=shadowBanned&adminUserID=shadow-ban-vip&enabled=false&unHideOldSubmissions=false`, {
-            method: "POST"
+    it("Should be able to unban user without unhiding submissions", (done) => {
+        const userID = "shadowBanned";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                adminUserID: VIPuserID,
+                enabled: false,
+                unHideOldSubmissions: false,
+            }
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const videoRow = await db.prepare("all", `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned", 1]);
-                const shadowRow = await db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned"]);
+                const videoRow = await getShadowBanSegments(userID, 1);
+                const shadowRow = await getShadowBan(userID);
                 assert.ok(!shadowRow);
                 assert.strictEqual(videoRow.length, 3);
                 done();
@@ -60,15 +78,21 @@ describe("shadowBanUser", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to ban user and hide submissions from only some categories", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/shadowBanUser?userID=shadowBanned2&adminUserID=shadow-ban-vip&categories=["sponsor"]`, {
-            method: "POST"
+    it("Should be able to ban user and hide submissions from only some categories", (done) => {
+        const userID = "shadowBanned2";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                adminUserID: VIPuserID,
+                categories: `["sponsor"]`
+            }
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const videoRow: {category: string, shadowHidden: number}[] = (await db.prepare("all", `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned2", 1]));
-                const shadowRow = await db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned2"]);
+                const videoRow = await getShadowBanSegmentCategory(userID, 1);
+                const shadowRow = await getShadowBan(userID);
                 assert.ok(shadowRow);
                 assert.strictEqual(videoRow.length, 2);
                 assert.strictEqual(videoRow.filter((elem) => elem.category === "sponsor").length, 2);
@@ -77,15 +101,21 @@ describe("shadowBanUser", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to unban user and unhide submissions", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/shadowBanUser?userID=shadowBanned2&adminUserID=shadow-ban-vip&enabled=false`, {
-            method: "POST"
+    it("Should be able to unban user and unhide submissions", (done) => {
+        const userID = "shadowBanned2";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                adminUserID: VIPuserID,
+                enabled: false,
+            }
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const videoRow = await db.prepare("all", `SELECT "shadowHidden" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned2", 1]);
-                const shadowRow = await db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned2"]);
+                const videoRow = await getShadowBanSegments(userID, 1);
+                const shadowRow = await getShadowBan(userID);
                 assert.ok(!shadowRow);
                 assert.strictEqual(videoRow?.length, 0);
                 done();
@@ -93,15 +123,22 @@ describe("shadowBanUser", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to unban user and unhide some submissions", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/shadowBanUser?userID=shadowBanned3&adminUserID=shadow-ban-vip&enabled=false&categories=["sponsor"]`, {
-            method: "POST"
+    it("Should be able to unban user and unhide some submissions", (done) => {
+        const userID = "shadowBanned3";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                adminUserID: VIPuserID,
+                enabled: false,
+                categories: `["sponsor"]`
+            }
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const videoRow = await db.prepare("all", `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned3", 1]);
-                const shadowRow = await db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned3"]);
+                const videoRow = await getShadowBanSegmentCategory(userID, 1);
+                const shadowRow = await getShadowBan(userID);
                 assert.ok(!shadowRow);
                 assert.strictEqual(videoRow.length, 1);
                 assert.strictEqual(videoRow[0].category, "intro");
@@ -110,15 +147,23 @@ describe("shadowBanUser", () => {
             .catch(err => done(err));
     });
 
-    it("Should get 409 when re-shadowbanning user", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/shadowBanUser?userID=shadowBanned4&adminUserID=shadow-ban-vip&enabled=true&categories=["sponsor"]&unHideOldSubmissions=false`, {
-            method: "POST"
+    it("Should get 409 when re-shadowbanning user", (done) => {
+        const userID = "shadowBanned4";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                adminUserID: VIPuserID,
+                enabled: true,
+                categories: `["sponsor"]`,
+                unHideOldSubmissions: false
+            }
         })
             .then(async res => {
                 assert.strictEqual(res.status, 409);
-                const videoRow = await db.prepare("all", `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned4", 0]);
-                const shadowRow = await db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned4"]);
+                const videoRow = await getShadowBanSegmentCategory(userID, 0);
+                const shadowRow = await getShadowBan(userID);
                 assert.ok(shadowRow); // ban still exists
                 assert.strictEqual(videoRow.length, 1); // videos should not be hidden
                 assert.strictEqual(videoRow[0].category, "sponsor");
@@ -127,15 +172,23 @@ describe("shadowBanUser", () => {
             .catch(err => done(err));
     });
 
-    it("Should be able to re-shadowban user to hide old submissions", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/shadowBanUser?userID=shadowBanned4&adminUserID=shadow-ban-vip&enabled=true&categories=["sponsor"]&unHideOldSubmissions=true`, {
-            method: "POST"
+    it("Should be able to re-shadowban user to hide old submissions", (done) => {
+        const userID = "shadowBanned4";
+        client({
+            method: "POST",
+            url: endpoint,
+            params: {
+                userID,
+                adminUserID: VIPuserID,
+                enabled: true,
+                categories: `["sponsor"]`,
+                unHideOldSubmissions: true
+            }
         })
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const videoRow = await db.prepare("all", `SELECT "shadowHidden", "category" FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?`, ["shadowBanned4", 1]);
-                const shadowRow = await db.prepare("get", `SELECT * FROM "shadowBannedUsers" WHERE "userID" = ?`, ["shadowBanned4"]);
+                const videoRow = await getShadowBanSegmentCategory(userID, 1);
+                const shadowRow = await getShadowBan(userID);
                 assert.ok(shadowRow); // ban still exists
                 assert.strictEqual(videoRow.length, 1); // videos should be hidden
                 assert.strictEqual(videoRow[0].category, "sponsor");
@@ -143,5 +196,4 @@ describe("shadowBanUser", () => {
             })
             .catch(err => done(err));
     });
-
 });

test/cases/testUtils.ts

@@ -1,9 +1,8 @@
 import assert from "assert";
-
-import { partialDeepEquals } from "../utils";
+import { partialDeepEquals } from "../utils/partialDeepEquals";
 
 describe("Test utils ", () => {
-    it("objectContain", async () => {
+    it("objectContain", () => {
         assert(partialDeepEquals(
             {
                 name: "John Wick",
@@ -16,8 +15,8 @@ describe("Test utils ", () => {
             false
         ), "Did not match empty expect");
         assert(partialDeepEquals(
-            [{a: [1,2,3]}, {a: [1,2]}],
-            [{a: [1,2,3]}, {a: [1,2]}]
+            [{ a: [1,2,3] }, { a: [1,2] }],
+            [{ a: [1,2,3] }, { a: [1,2] }]
         ), "Did not match same arrays");
         assert(partialDeepEquals(
             {

test/cases/unBan.ts

@@ -1,10 +1,21 @@
-import fetch from "node-fetch";
-import * as utils from  "../utils";
 import { getHash } from "../../src/utils/getHash";
 import { db } from "../../src/databases/databases";
+import { client } from "../utils/httpClient";
 import assert from "assert";
 
 describe("unBan", () => {
+    const endpoint = "/api/shadowBanUser";
+    const VIPuser = "VIPUser-unBan";
+    const postUnBan = (userID: string, adminUserID: string, enabled: boolean) => client({
+        url: endpoint,
+        method: "POST",
+        params: {
+            userID,
+            adminUserID,
+            enabled
+        }
+    });
+    const videoIDUnBanCheck = (videoID: string, userID: string, status: number) => db.prepare("all", 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', [videoID, userID, status]);
     before(async () => {
         const insertShadowBannedUserQuery = 'INSERT INTO "shadowBannedUsers" VALUES(?)';
         await db.prepare("run", insertShadowBannedUserQuery, ["testMan-unBan"]);
@@ -12,10 +23,10 @@ describe("unBan", () => {
         await db.prepare("run", insertShadowBannedUserQuery, ["testEntity-unBan"]);
 
         const insertVipUserQuery = 'INSERT INTO "vipUsers" ("userID") VALUES (?)';
-        await db.prepare("run", insertVipUserQuery, [getHash("VIPUser-unBan")]);
+        await db.prepare("run", insertVipUserQuery, [getHash(VIPuser)]);
 
         const insertLockCategoryQuery = 'INSERT INTO "lockCategories" ("userID", "videoID", "category") VALUES(?, ?, ?)';
-        await db.prepare("run", insertLockCategoryQuery, [getHash("VIPUser-unBan"), "unBan-videoID-1", "sponsor"]);
+        await db.prepare("run", insertLockCategoryQuery, [getHash(VIPuser), "unBan-videoID-1", "sponsor"]);
 
         const insertSponsorTimeQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
         await db.prepare("run", insertSponsorTimeQuery, ["unBan-videoID-0", 1, 11, 2, "unBan-uuid-0", "testMan-unBan", 0, 50, "sponsor", 1, getHash("unBan-videoID-0", 1)]);
@@ -25,16 +36,11 @@ describe("unBan", () => {
     });
 
     it("Should be able to unban a user and re-enable shadow banned segments", (done) => {
-        fetch(`${utils.getbaseURL()
-        }/api/shadowBanUser?userID=testMan-unBan&adminUserID=VIPUser-unBan&enabled=false`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-        })
+        const userID = "testMan-unBan";
+        postUnBan(userID, VIPuser, false)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ["unBan-videoID-0", "testMan-unBan", 1]);
+                const result = await videoIDUnBanCheck("unBan-videoID-0", userID, 1);
                 assert.strictEqual(result.length, 0);
                 done();
             })
@@ -42,16 +48,11 @@ describe("unBan", () => {
     });
 
     it("Should be able to unban a user and re-enable shadow banned segments without lockCategories entrys", (done) => {
-        fetch(`${utils.getbaseURL()
-        }/api/shadowBanUser?userID=testWoman-unBan&adminUserID=VIPUser-unBan&enabled=false`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-        })
+        const userID = "testWoman-unBan";
+        postUnBan(userID, VIPuser, false)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ["unBan-videoID-1", "testWoman-unBan", 1]);
+                const result = await videoIDUnBanCheck("unBan-videoID-1", userID, 1);
                 assert.strictEqual(result.length, 1);
                 done();
             })
@@ -59,16 +60,11 @@ describe("unBan", () => {
     });
 
     it("Should be able to unban a user and re-enable shadow banned segments with a mix of lockCategories entrys", (done) => {
-        fetch(`${utils.getbaseURL()
-        }/api/shadowBanUser?userID=testEntity-unBan&adminUserID=VIPUser-unBan&enabled=false`, {
-            method: "POST",
-            headers: {
-                "Content-Type": "application/json",
-            },
-        })
+        const userID = "testEntity-unBan";
+        postUnBan(userID, VIPuser, false)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const result = await db.prepare("all", 'SELECT * FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?', ["testEntity-unBan", 1]);
+                const result = await db.prepare("all", 'SELECT * FROM "sponsorTimes" WHERE "userID" = ? AND "shadowHidden" = ?', [userID, 1]);
                 assert.strictEqual(result.length, 1);
                 done();
             })

test/cases/voteOnSponsorTime.ts

@@ -1,16 +1,17 @@
-import fetch from "node-fetch";
-import {config} from "../../src/config";
-import {db} from "../../src/databases/databases";
-import {Done, getbaseURL} from "../utils";
-import {getHash} from "../../src/utils/getHash";
-import {ImportMock} from "ts-mock-imports";
+import { config } from "../../src/config";
+import { db } from "../../src/databases/databases";
+import { getHash } from "../../src/utils/getHash";
+import { ImportMock } from "ts-mock-imports";
 import * as YouTubeAPIModule from "../../src/utils/youtubeApi";
-import {YouTubeApiMock} from "../youtubeMock";
+import { YouTubeApiMock } from "../youtubeMock";
 import assert from "assert";
+import { client } from "../utils/httpClient";
 
 const mockManager = ImportMock.mockStaticClass(YouTubeAPIModule, "YouTubeAPI");
 const sinonStub = mockManager.mock("listVideos");
 sinonStub.callsFake(YouTubeApiMock.listVideos);
+const vipUser = "VIPUser";
+const randomID2 = "randomID2";
 
 describe("voteOnSponsorTime", () => {
     before(async () => {
@@ -21,31 +22,31 @@ describe("voteOnSponsorTime", () => {
         const MILLISECONDS_IN_HOUR = 3600000;
         const warningExpireTime = MILLISECONDS_IN_HOUR * config.hoursAfterWarningExpires;
 
-        const insertSponsorTimeQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", "views", "category", "shadowHidden", "hidden", "hashedVideoID") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest", 1, 11, 2, "vote-uuid-0", "testman", 0, 50, "sponsor", 0, 0, getHash("vote-testtesttest", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest2", 1, 11, 2, "vote-uuid-1", "testman", 0, 50, "sponsor", 0, 0, getHash("vote-testtesttest2", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest2", 1, 11, 10, "vote-uuid-1.5", "testman", 0, 50, "outro", 0, 0, getHash("vote-testtesttest2", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest2", 1, 11, 10, "vote-uuid-1.6", "testman", 0, 50, "interaction", 0, 0, getHash("vote-testtesttest2", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest3", 20, 33, 10, "vote-uuid-2", "testman", 0, 50, "intro", 0, 0, getHash("vote-testtesttest3", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest,test", 1, 11, 100, "vote-uuid-3", "testman", 0, 50, "sponsor", 0, 0, getHash("vote-testtesttest,test", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-test3", 1, 11, 2, "vote-uuid-4", "testman", 0, 50, "sponsor", 0, 0, getHash("vote-test3", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-test3", 7, 22, -3, "vote-uuid-5", "testman", 0, 50, "intro", 0, 0, getHash("vote-test3", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-test3", 7, 22, -3, "vote-uuid-5_1", "testman", 0, 50, "intro", 0, 0, getHash("vote-test3", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-multiple", 1, 11, 2, "vote-uuid-6", "testman", 0, 50, "intro", 0, 0, getHash("vote-multiple", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-multiple", 20, 33, 2, "vote-uuid-7", "testman", 0, 50, "intro", 0, 0, getHash("vote-multiple", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter", 1, 11, 2, "vote-uuid-8", getHash("randomID"), 0, 50, "sponsor", 0, 0, getHash("voter-submitter", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter2", 1, 11, 2, "vote-uuid-9", getHash("randomID2"), 0, 50, "sponsor", 0, 0, getHash("voter-submitter2", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter2", 1, 11, 2, "vote-uuid-10", getHash("randomID3"), 0, 50, "sponsor", 0, 0, getHash("voter-submitter2", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter2", 1, 11, 2, "vote-uuid-11", getHash("randomID4"), 0, 50, "sponsor", 0, 0, getHash("voter-submitter2", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["own-submission-video", 1, 11, 500, "own-submission-uuid", getHash("own-submission-id"), 0, 50, "sponsor", 0, 0, getHash("own-submission-video", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["not-own-submission-video", 1, 11, 500, "not-own-submission-uuid", getHash("somebody-else-id"), 0, 50, "sponsor", 0, 0, getHash("not-own-submission-video", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["incorrect-category", 1, 11, 500, "incorrect-category", getHash("somebody-else-id"), 0, 50, "sponsor", 0, 0, getHash("incorrect-category", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["incorrect-category-change", 1, 11, 500, "incorrect-category-change", getHash("somebody-else-id"), 0, 50, "sponsor", 0, 0, getHash("incorrect-category-change", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest", 1, 11, 2, "warnvote-uuid-0", "testman", 0, 50, "sponsor", 0, 0, getHash("vote-testtesttest", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["no-sponsor-segments-video", 1, 11, 2, "no-sponsor-segments-uuid-0", "no-sponsor-segments", 0, 50, "sponsor", 0, 0, getHash("no-sponsor-segments-video", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["no-sponsor-segments-video", 1, 11, 2, "no-sponsor-segments-uuid-1", "no-sponsor-segments", 0, 50, "intro", 0, 0, getHash("no-sponsor-segments-video", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["segment-locking-video", 1, 11, 2, "segment-locking-uuid-1", "segment-locking-user", 0, 50, "intro", 0, 0, getHash("segment-locking-video", 1)]);
-        await db.prepare("run", insertSponsorTimeQuery, ["segment-hidden-video", 1, 11, 2, "segment-hidden-uuid-1", "segment-hidden-user", 0, 50, "intro", 0, 1, getHash("segment-locking-video", 1)]);
+        const insertSponsorTimeQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", "views", "category", "shadowHidden", "hidden") VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest", 1, 11, 2, "vote-uuid-0", "testman", 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest2", 1, 11, 2, "vote-uuid-1", "testman", 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest2", 1, 11, 10, "vote-uuid-1.5", "testman", 0, 50, "outro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest2", 1, 11, 10, "vote-uuid-1.6", "testman", 0, 50, "interaction", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest3", 20, 33, 10, "vote-uuid-2", "testman", 0, 50, "intro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest,test", 1, 11, 100, "vote-uuid-3", "testman", 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-test3", 1, 11, 2, "vote-uuid-4", "testman", 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-test3", 7, 22, -3, "vote-uuid-5", "testman", 0, 50, "intro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-test3", 7, 22, -3, "vote-uuid-5_1", "testman", 0, 50, "intro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-multiple", 1, 11, 2, "vote-uuid-6", "testman", 0, 50, "intro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-multiple", 20, 33, 2, "vote-uuid-7", "testman", 0, 50, "intro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter", 1, 11, 2, "vote-uuid-8", getHash("randomID"), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter2", 1, 11, 2, "vote-uuid-9", getHash(randomID2), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter2", 1, 11, 2, "vote-uuid-10", getHash("randomID3"), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["voter-submitter2", 1, 11, 2, "vote-uuid-11", getHash("randomID4"), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["own-submission-video", 1, 11, 500, "own-submission-uuid", getHash("own-submission-id"), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["not-own-submission-video", 1, 11, 500, "not-own-submission-uuid", getHash("somebody-else-id"), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["incorrect-category", 1, 11, 500, "incorrect-category", getHash("somebody-else-id"), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["incorrect-category-change", 1, 11, 500, "incorrect-category-change", getHash("somebody-else-id"), 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["vote-testtesttest", 1, 11, 2, "warnvote-uuid-0", "testman", 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["no-sponsor-segments-video", 1, 11, 2, "no-sponsor-segments-uuid-0", "no-sponsor-segments", 0, 50, "sponsor", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["no-sponsor-segments-video", 1, 11, 2, "no-sponsor-segments-uuid-1", "no-sponsor-segments", 0, 50, "intro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["segment-locking-video", 1, 11, 2, "segment-locking-uuid-1", "segment-locking-user", 0, 50, "intro", 0, 0]);
+        await db.prepare("run", insertSponsorTimeQuery, ["segment-hidden-video", 1, 11, 2, "segment-hidden-uuid-1", "segment-hidden-user", 0, 50, "intro", 0, 1]);
 
         const insertWarningQuery = 'INSERT INTO "warnings" ("userID", "issueTime", "issuerUserID", "enabled") VALUES(?, ?, ?, ?)';
         await db.prepare("run", insertWarningQuery, [warnUser01Hash, now, warnVip01Hash,  1]);
@@ -58,127 +59,150 @@ describe("voteOnSponsorTime", () => {
         await db.prepare("run", insertWarningQuery, [warnUser02Hash, (now - (warningExpireTime + 2000)), warnVip01Hash,  1]);
 
 
-        await db.prepare("run", 'INSERT INTO "vipUsers" ("userID") VALUES (?)', [getHash("VIPUser")]);
+        await db.prepare("run", 'INSERT INTO "vipUsers" ("userID") VALUES (?)', [getHash(vipUser)]);
         await db.prepare("run", 'INSERT INTO "shadowBannedUsers" ("userID") VALUES (?)', [getHash("randomID4")]);
 
         await db.prepare("run", 'INSERT INTO "lockCategories" ("videoID", "userID", "category") VALUES (?, ?, ?)', ["no-sponsor-segments-video", "someUser", "sponsor"]);
     });
+    // constants
+    const endpoint = "/api/voteOnSponsorTime";
+    const postVote = (userID: string, UUID: string, type: number) => client({
+        method: "POST",
+        url: endpoint,
+        params: {
+            userID,
+            UUID,
+            type
+        }
+    });
+    const postVoteCategory = (userID: string, UUID: string, category: string) => client({
+        method: "POST",
+        url: endpoint,
+        params: {
+            userID,
+            UUID,
+            category
+        }
+    });
 
-    it("Should be able to upvote a segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID&UUID=vote-uuid-0&type=1`)
+    const getSegmentVotes = (UUID: string) => db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
+    const getSegmentCategory = (UUID: string) => db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
+
+    it("Should be able to upvote a segment", (done) => {
+        const UUID = "vote-uuid-0";
+        postVote("randomID", UUID, 1)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-0"]);
+                const row = await getSegmentVotes(UUID);
                 assert.strictEqual(row.votes, 3);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to downvote a segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-2&type=0`)
+    it("Should be able to downvote a segment", (done) => {
+        const UUID = "vote-uuid-2";
+        postVote(randomID2, UUID, 0)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
+                const row = await getSegmentVotes(UUID);
                 assert.ok(row.votes < 10);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not be able to downvote the same segment when voting from a different user on the same IP", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID3&UUID=vote-uuid-2&type=0`)
+    it("Should not be able to downvote the same segment when voting from a different user on the same IP", (done) => {
+        const UUID = "vote-uuid-2";
+        postVote("randomID3", UUID, 0)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
+                const row = await getSegmentVotes(UUID);
                 assert.strictEqual(row.votes, 9);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not be able to downvote a segment if the user is shadow banned", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID4&UUID=vote-uuid-1.6&type=0`)
+    it("Should not be able to downvote a segment if the user is shadow banned", (done) => {
+        const UUID = "vote-uuid-1.6";
+        postVote("randomID4", UUID, 0)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.6"]);
+                const row = await getSegmentVotes(UUID);
                 assert.strictEqual(row.votes, 10);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not be able to upvote a segment if the user hasn't submitted yet", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=hasNotSubmittedID&UUID=vote-uuid-1&type=1`)
+    it("Should not be able to upvote a segment if the user hasn't submitted yet", (done) => {
+        const UUID = "vote-uuid-1";
+        postVote("hasNotSubmittedID", UUID, 1)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1"]);
+                const row = await getSegmentVotes(UUID);
                 assert.strictEqual(row.votes, 2);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not be able to downvote a segment if the user hasn't submitted yet", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=hasNotSubmittedID&UUID=vote-uuid-1.5&type=0`)
+    it("Should not be able to downvote a segment if the user hasn't submitted yet", (done) => {
+        const UUID = "vote-uuid-1.5";
+        postVote("hasNotSubmittedID", UUID, 0)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.5"]);
+                const row = await getSegmentVotes(UUID);
                 assert.strictEqual(row.votes, 10);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("VIP should be able to completely downvote a segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-3&type=0`)
+    it("VIP should be able to completely downvote a segment", (done) => {
+        const UUID = "vote-uuid-3";
+        postVote(vipUser, UUID, 0)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-3"]);
+                const row = await getSegmentVotes(UUID);
                 assert.ok(row.votes <= -2);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should be able to completely downvote your own segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=own-submission-id&UUID=own-submission-uuid&type=0`)
+    it("should be able to completely downvote your own segment", (done) => {
+        const UUID = "own-submission-uuid";
+        postVote("own-submission-id", UUID, 0)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["own-submission-uuid"]);
+                const row = await getSegmentVotes(UUID);
                 assert.ok(row.votes <= -2);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("should not be able to completely downvote somebody elses segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=not-own-submission-uuid&type=0`)
+    it("should not be able to completely downvote somebody elses segment", (done) => {
+        const UUID = "not-own-submission-uuid";
+        postVote(randomID2, UUID, 0)
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["not-own-submission-uuid"]);
+                const row = await getSegmentVotes(UUID);
                 assert.strictEqual(row.votes, 499);
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to vote for a category and it should add your vote to the database", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-4&category=intro`)
+    it("Should be able to vote for a category and it should add your vote to the database", (done) => {
+        const UUID = "vote-uuid-4";
+        postVoteCategory(randomID2, UUID, "intro")
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
-                const categoryRows = await db.prepare("all", `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
+                const row = await getSegmentCategory(UUID);
+                const categoryRows = await db.prepare("all", `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, [UUID]);
                 assert.strictEqual(row.category, "sponsor");
                 assert.strictEqual(categoryRows.length, 2);
                 assert.strictEqual(categoryRows[0].votes, 1);
@@ -190,65 +214,62 @@ describe("voteOnSponsorTime", () => {
             .catch(err => done(err));
     });
 
-    it("Should not able to change to an invalid category", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category&category=fakecategory`)
+    it("Should not able to change to an invalid category", (done) => {
+        const UUID = "incorrect-category";
+        postVoteCategory(randomID2, UUID, "fakecategory")
             .then(async res => {
                 assert.strictEqual(res.status, 400);
-                const row = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]);
+                const row = await getSegmentCategory(UUID);
                 assert.strictEqual(row.category, "sponsor");
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not able to change to highlight category", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category&category=highlight`)
+    it("Should not able to change to highlight category", (done) => {
+        const UUID = "incorrect-category";
+        postVoteCategory(randomID2, UUID, "highlight")
             .then(async res => {
                 assert.strictEqual(res.status, 400);
-                const row = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]);
+                const row = await getSegmentCategory(UUID);
                 assert.strictEqual(row.category, "sponsor");
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should be able to change your vote for a category and it should add your vote to the database", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-4&category=outro`)
+    it("Should be able to change your vote for a category and it should add your vote to the database", (done) => {
+        const UUID = "vote-uuid-4";
+        postVoteCategory(randomID2, UUID, "outro")
             .then(async res => {
-                if (res.status === 200) {
-                    const submissionRow = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
-                    const categoryRows = await db.prepare("all", `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
-                    let introVotes = 0;
-                    let outroVotes = 0;
-                    let sponsorVotes = 0;
-                    for (const row of categoryRows) {
-                        if (row?.category === "intro") introVotes += row?.votes;
-                        if (row?.category === "outro") outroVotes += row?.votes;
-                        if (row?.category === "sponsor") sponsorVotes += row?.votes;
-                    }
-                    assert.strictEqual(submissionRow.category, "sponsor");
-                    assert.strictEqual(categoryRows.length, 3);
-                    assert.strictEqual(introVotes, 0);
-                    assert.strictEqual(outroVotes, 1);
-                    assert.strictEqual(sponsorVotes, 1);
-                    done();
-                } else {
-                    done(`Status code was ${res.status}`);
+                assert.strictEqual(res.status, 200, "Status code should be 200");
+                const submissionRow = await getSegmentCategory(UUID);
+                const categoryRows = await db.prepare("all", `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, [UUID]);
+                let introVotes = 0;
+                let outroVotes = 0;
+                let sponsorVotes = 0;
+                for (const row of categoryRows) {
+                    if (row?.category === "intro") introVotes += row?.votes;
+                    if (row?.category === "outro") outroVotes += row?.votes;
+                    if (row?.category === "sponsor") sponsorVotes += row?.votes;
                 }
+                assert.strictEqual(submissionRow.category, "sponsor");
+                assert.strictEqual(categoryRows.length, 3);
+                assert.strictEqual(introVotes, 0);
+                assert.strictEqual(outroVotes, 1);
+                assert.strictEqual(sponsorVotes, 1);
+                done();
             })
             .catch(err => done(err));
     });
 
 
-    it("Should not be able to change your vote to an invalid category", (done: Done) => {
-        const vote = (inputCat: string, assertCat: string, callback: Done) => {
-            fetch(`${getbaseURL()
-            }/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category-change&category=${inputCat}`)
+    it("Should not be able to change your vote to an invalid category", (done) => {
+        const UUID = "incorrect-category-change";
+        const vote = (inputCat: string, assertCat: string, callback: Mocha.Done) => {
+            postVoteCategory(randomID2, UUID, inputCat)
                 .then(async () => {
-                    const row = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category-change"]);
+                    const row = await getSegmentCategory(UUID);
                     assert.strictEqual(row.category, assertCat);
                     callback();
                 })
@@ -260,13 +281,13 @@ describe("voteOnSponsorTime", () => {
     });
 
 
-    it("VIP should be able to vote for a category and it should immediately change", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-5&category=outro`)
+    it("VIP should be able to vote for a category and it should immediately change", (done) => {
+        const UUID = "vote-uuid-5";
+        postVoteCategory(vipUser, UUID, "outro")
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
-                const row2 = await db.prepare("get", `SELECT votes FROM "categoryVotes" WHERE "UUID" = ? and category = ?`, ["vote-uuid-5", "outro"]);
+                const row = await getSegmentCategory(UUID);
+                const row2 = await db.prepare("get", `SELECT votes FROM "categoryVotes" WHERE "UUID" = ? and category = ?`, [UUID, "outro"]);
                 assert.strictEqual(row.category, "outro");
                 assert.strictEqual(row2.votes, 500);
                 done();
@@ -274,160 +295,21 @@ describe("voteOnSponsorTime", () => {
             .catch(err => done(err));
     });
 
-    it("Submitter should be able to vote for a category and it should immediately change", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=testman&UUID=vote-uuid-5_1&category=outro`)
+    it("Submitter should be able to vote for a category and it should immediately change", (done) => {
+        const UUID = "vote-uuid-5_1";
+        postVoteCategory("testman", UUID, "outro")
             .then(async res => {
                 assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
+                const row = await getSegmentCategory("vote-uuid-5");
                 assert.strictEqual(row.category, "outro");
                 done();
             })
             .catch(err => done(err));
     });
 
-    it("Should not be able to category-vote on an invalid UUID submission", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID3&UUID=invalid-uuid&category=intro`)
-            .then(async res => {
-                assert.strictEqual(res.status, 400);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it('Non-VIP should not be able to upvote "dead" submission', (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-5&type=1`)
-            .then(async res => {
-                assert.strictEqual(res.status, 403);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
-                assert.strictEqual(row.votes, -3);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it('Non-VIP should not be able to downvote "dead" submission', (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-5&type=0`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
-                assert.strictEqual(row.votes, -3);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it('VIP should be able to upvote "dead" submission', (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-5&type=1`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
-                assert.ok(row.votes > -3);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("Should not be able to upvote a segment (Too many warning)", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=warn-voteuser01&UUID=warnvote-uuid-0&type=1`)
-            .then(async res => {
-                assert.strictEqual(res.status, 403);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("Non-VIP should not be able to downvote on a segment with no-segments category", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&type=0`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
-                assert.strictEqual(row.votes, 2);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("Non-VIP should be able to upvote on a segment with no-segments category", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&type=1`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
-                assert.strictEqual(row.votes, 3);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("Non-VIP should not be able to category vote on a segment with no-segments category", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&category=outro`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
-                assert.strictEqual(row.category, "sponsor");
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("VIP upvote should lock segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=1`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]);
-                assert.strictEqual(row.locked, 1);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("VIP downvote should unlock segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=0`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]);
-                assert.strictEqual(row.locked, 0);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("VIP upvote should unhide segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-hidden-uuid-1&type=1`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "hidden" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-hidden-uuid-1"]);
-                assert.strictEqual(row.hidden, 0);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("Should be able to undo-vote a segment", (done: Done) => {
-        fetch(`${getbaseURL()
-        }/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-2&type=20`)
-            .then(async res => {
-                assert.strictEqual(res.status, 200);
-                const row = await db.prepare("get", `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
-                assert.strictEqual(row.votes, 10);
-                done();
-            })
-            .catch(err => done(err));
-    });
-
-    it("Should not be able to vote with type 10", (done: Done) => {
-        fetch(`${getbaseURL()  }/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=10`)
+    it("Should not be able to category-vote on an invalid UUID submission", (done) => {
+        const UUID = "invalid-uuid";
+        postVoteCategory("randomID3", UUID, "intro")
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();
@@ -435,8 +317,149 @@ describe("voteOnSponsorTime", () => {
             .catch(err => done(err));
     });
 
-    it("Should not be able to vote with type 11", (done: Done) => {
-        fetch(`${getbaseURL()  }/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=11`)
+    it('Non-VIP should not be able to upvote "dead" submission', (done) => {
+        const UUID = "vote-uuid-5";
+        postVote(randomID2, UUID, 1)
+            .then(async res => {
+                assert.strictEqual(res.status, 403);
+                const row = await getSegmentVotes(UUID);
+                assert.strictEqual(row.votes, -3);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it('Non-VIP should not be able to downvote "dead" submission', (done) => {
+        const UUID = "vote-uuid-5";
+        postVote(randomID2, UUID, 0)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await getSegmentVotes(UUID);
+                assert.strictEqual(row.votes, -3);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it('VIP should be able to upvote "dead" submission', (done) => {
+        const UUID = "vote-uuid-5";
+        postVote(vipUser, UUID, 1)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await getSegmentVotes(UUID);
+                assert.ok(row.votes > -3);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Should not be able to upvote a segment (Too many warning)", (done) => {
+        const UUID = "warnvote-uuid-0";
+        postVote("warn-voteuser01", UUID, 1)
+            .then(res => {
+                assert.strictEqual(res.status, 403);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Non-VIP should not be able to downvote on a segment with no-segments category", (done) => {
+        const UUID = "no-sponsor-segments-uuid-0";
+        postVote("randomID", UUID, 0)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await getSegmentVotes(UUID);
+                assert.strictEqual(row.votes, 2);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Non-VIP should be able to upvote on a segment with no-segments category", (done) => {
+        const UUID = "no-sponsor-segments-uuid-0";
+        postVote("randomID", UUID, 1)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await getSegmentVotes(UUID);
+                assert.strictEqual(row.votes, 3);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Non-VIP should not be able to category vote on a segment with no-segments category", (done) => {
+        const UUID = "no-sponsor-segments-uuid-0";
+        postVoteCategory("randomID", UUID, "outro")
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await getSegmentCategory(UUID);
+                assert.strictEqual(row.category, "sponsor");
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("VIP upvote should lock segment", (done) => {
+        const UUID = "segment-locking-uuid-1";
+        postVote(vipUser, UUID, 1)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await db.prepare("get", `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
+                assert.strictEqual(row.locked, 1);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("VIP downvote should unlock segment", (done) => {
+        const UUID = "segment-locking-uuid-1";
+        postVote(vipUser, UUID, 0)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await db.prepare("get", `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
+                assert.strictEqual(row.locked, 0);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("VIP upvote should unhide segment", (done) => {
+        const UUID = "segment-hidden-uuid-1";
+        postVote(vipUser, UUID, 1)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await db.prepare("get", `SELECT "hidden" FROM "sponsorTimes" WHERE "UUID" = ?`, [UUID]);
+                assert.strictEqual(row.hidden, 0);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Should be able to undo-vote a segment", (done) => {
+        const UUID = "vote-uuid-2";
+        postVote(randomID2, UUID, 20)
+            .then(async res => {
+                assert.strictEqual(res.status, 200);
+                const row = await getSegmentVotes(UUID);
+                assert.strictEqual(row.votes, 10);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Should not be able to vote with type 10", (done) => {
+        const UUID = "segment-locking-uuid-1";
+        postVote(vipUser, UUID, 10)
+            .then(res => {
+                assert.strictEqual(res.status, 400);
+                done();
+            })
+            .catch(err => done(err));
+    });
+
+    it("Should not be able to vote with type 11", (done) => {
+        const UUID = "segment-locking-uuid-1";
+        postVote(vipUser, UUID, 11)
             .then(res => {
                 assert.strictEqual(res.status, 400);
                 done();

test/mocks.ts

@@ -1,5 +1,5 @@
 import express from "express";
-import {config} from "../src/config";
+import { config } from "../src/config";
 import { Server } from "http";
 
 const app = express();

test/test.ts

@@ -1,12 +1,12 @@
 import Mocha from "mocha";
 import fs from "fs";
 import path from "path";
-import {config} from "../src/config";
-import {createServer} from "../src/app";
-import {createMockServer} from "./mocks";
-import {Logger} from "../src/utils/logger";
-import {initDb} from "../src/databases/databases";
-import {ImportMock} from "ts-mock-imports";
+import { config } from "../src/config";
+import { createServer } from "../src/app";
+import { createMockServer } from "./mocks";
+import { Logger } from "../src/utils/logger";
+import { initDb } from "../src/databases/databases";
+import { ImportMock } from "ts-mock-imports";
 import * as rateLimitMiddlewareModule from "../src/middleware/requestRateLimit";
 import rateLimit from "express-rate-limit";
 

test/utils/httpClient.ts

@@ -0,0 +1,9 @@
+import { config } from "../../src/config";
+import axios, { AxiosRequestConfig } from "axios";
+
+const defaultConfig: AxiosRequestConfig = {
+    baseURL: `http://localhost:${config.port}`,
+    validateStatus: (status) => status < 500
+};
+
+export const client = axios.create(defaultConfig);

test/utils/partialDeepEquals.ts

@@ -1,19 +1,10 @@
-import {config} from "../src/config";
-import { Logger } from "../src/utils/logger";
+import { Logger } from "../../src/utils/logger";
 
-export function getbaseURL(): string {
-    return `http://localhost:${config.port}`;
+function printActualExpected(actual: Record<string, any>, expected: Record<string, any>): void {
+    Logger.error(`Actual: ${JSON.stringify(actual)}`);
+    Logger.error(`Expected: ${JSON.stringify(expected)}`);
 }
 
-/**
- * Duplicated from Mocha types. TypeScript doesn't infer that type by itself for some reason.
- */
-export type Done = (err?: any) => void;
-
-/**
- *
- * Check object contains expected properties
- */
 export const partialDeepEquals = (actual: Record<string, any>, expected: Record<string, any>, print = true): boolean => {
     // loop over key, value of expected
     for (const [ key, value ] of Object.entries(expected)) {
@@ -21,20 +12,13 @@ export const partialDeepEquals = (actual: Record<string, any>, expected: Record<
         if (Array.isArray(value) || typeof value === "object") {
             if (!partialDeepEquals(actual?.[key], value, false)) {
                 if (print) printActualExpected(actual, expected);
-
                 return false;
             }
         }
         else if (actual?.[key] !== value) {
             if (print) printActualExpected(actual, expected);
-
             return false;
         }
     }
     return true;
-};
-
-function printActualExpected(actual: Record<string, any>, expected: Record<string, any>): void {
-    Logger.error(`Actual: ${JSON.stringify(actual)}`);
-    Logger.error(`Expected: ${JSON.stringify(expected)}`);
-}
+};

test/youtubeMock.ts

@@ -1,6 +1,7 @@
 import { APIVideoData, APIVideoInfo } from "../src/types/youtubeApi.model";
 
 export class YouTubeApiMock {
+    // eslint-disable-next-line require-await
     static async listVideos(videoID: string): Promise<APIVideoInfo> {
         const obj = {
             id: videoID