mirror of
https://github.com/ajayyy/SponsorBlockServer.git
synced 2025-05-12 02:46:06 +02:00
fix eslint-errors
This commit is contained in:
Michael C
parent
a1bcd08658
commit
d89b26b77d
71 changed files with 392 additions and 393 deletions
24
.eslintrc.js
Normal file
24
.eslintrc.js
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
module.exports = {
|
||||
env: {
|
||||
browser: false,
|
||||
es2021: true,
|
||||
node: true,
|
||||
},
|
||||
extends: [
|
||||
"eslint:recommended",
|
||||
"plugin:@typescript-eslint/recommended",
|
||||
],
|
||||
parser: "@typescript-eslint/parser",
|
||||
parserOptions: {
|
||||
ecmaVersion: 12,
|
||||
sourceType: "module",
|
||||
},
|
||||
plugins: ["@typescript-eslint"],
|
||||
rules: {
|
||||
// TODO: Remove warn rules when not needed anymore
|
||||
"no-self-assign": "off",
|
||||
"semi": "warn",
|
||||
"@typescript-eslint/no-empty-interface": "off",
|
||||
"@typescript-eslint/no-explicit-any": "off",
|
||||
},
|
||||
};
|
||||
|
|
@ -34,13 +34,14 @@ import { addUnlistedVideo } from './routes/addUnlistedVideo';
|
|||
import {postPurgeAllSegments} from './routes/postPurgeAllSegments';
|
||||
import {getUserID} from './routes/getUserID';
|
||||
import ExpressPromiseRouter from 'express-promise-router';
|
||||
import { Server } from 'http';
|
||||
|
||||
export function createServer(callback: () => void) {
|
||||
export function createServer(callback: () => void): Server {
|
||||
// Create a service (the app object is just a callback).
|
||||
const app = express();
|
||||
|
||||
const router = ExpressPromiseRouter()
|
||||
app.use(router)
|
||||
const router = ExpressPromiseRouter();
|
||||
app.use(router);
|
||||
|
||||
//setup CORS correctly
|
||||
router.use(corsMiddleware);
|
||||
|
|
@ -158,7 +159,7 @@ function setupRoutes(router: Router) {
|
|||
if (config.postgres) {
|
||||
router.get('/database', (req, res) => dumpDatabase(req, res, true));
|
||||
router.get('/database.json', (req, res) => dumpDatabase(req, res, false));
|
||||
router.get('/database/*', redirectLink)
|
||||
router.get('/database/*', redirectLink);
|
||||
} else {
|
||||
router.get('/database.db', function (req: Request, res: Response) {
|
||||
res.sendFile("./databases/sponsorTimes.db", {root: "./"});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import fs from 'fs';
|
||||
import {SBSConfig} from "./types/config.model";
|
||||
import packageJson from "../package.json"
|
||||
import packageJson from "../package.json";
|
||||
|
||||
const isTestMode = process.env.npm_lifecycle_script === packageJson.scripts.test;
|
||||
const configFile = process.env.TEST_POSTGRES ? 'ci.json'
|
||||
|
|
@ -83,7 +83,7 @@ addDefaults(config, {
|
|||
// Add defaults
|
||||
function addDefaults(config: SBSConfig, defaults: SBSConfig) {
|
||||
for (const key in defaults) {
|
||||
if (!config.hasOwnProperty(key)) {
|
||||
if (!Object.prototype.hasOwnProperty.call(config, key)) {
|
||||
// @ts-ignore
|
||||
config[key] = defaults[key];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,19 +1,20 @@
|
|||
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';
|
||||
|
||||
export class Mysql implements IDatabase {
|
||||
private connection: any;
|
||||
|
||||
constructor(private config: any) {
|
||||
constructor(private config: unknown) {
|
||||
}
|
||||
|
||||
async init(): Promise<void> {
|
||||
this.connection = new MysqlInterface(this.config);
|
||||
}
|
||||
|
||||
prepare(type: QueryType, query: string, params?: any[]) {
|
||||
prepare(type: QueryType, query: string, params?: any[]): Promise<any[]> {
|
||||
Logger.debug(`prepare (mysql): type: ${type}, query: ${query}, params: ${params}`);
|
||||
const queryResult = this.connection.query(query, params);
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ types.setTypeParser(20, function(val) {
|
|||
export class Postgres implements IDatabase {
|
||||
private pool: Pool;
|
||||
|
||||
constructor(private config: any) {}
|
||||
constructor(private config: Record<string, any>) {}
|
||||
|
||||
async init(): Promise<void> {
|
||||
this.pool = new Pool(this.config.postgres);
|
||||
|
|
@ -43,7 +43,7 @@ export class Postgres implements IDatabase {
|
|||
}
|
||||
}
|
||||
|
||||
async prepare(type: QueryType, query: string, params?: any[]) {
|
||||
async prepare(type: QueryType, query: string, params?: any[]): Promise<any[]> {
|
||||
// Convert query to use numbered parameters
|
||||
let count = 1;
|
||||
for (let char = 0; char < query.length; char++) {
|
||||
|
|
@ -64,7 +64,7 @@ export class Postgres implements IDatabase {
|
|||
return value;
|
||||
}
|
||||
case 'all': {
|
||||
let values = queryResult.rows;
|
||||
const values = queryResult.rows;
|
||||
Logger.debug(`result (postgres): ${values}`);
|
||||
return values;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ export class Sqlite implements IDatabase {
|
|||
{
|
||||
}
|
||||
|
||||
async prepare(type: QueryType, query: string, params: any[] = []) {
|
||||
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,7 +30,7 @@ export class Sqlite implements IDatabase {
|
|||
}
|
||||
}
|
||||
|
||||
async init() {
|
||||
async init(): Promise<void> {
|
||||
// Make dirs if required
|
||||
if (!fs.existsSync(path.join(this.config.dbPath, "../"))) {
|
||||
fs.mkdirSync(path.join(this.config.dbPath, "../"));
|
||||
|
|
@ -61,7 +61,7 @@ export class Sqlite implements IDatabase {
|
|||
this.db.exec("pragma mmap_size= 500000000;");
|
||||
}
|
||||
|
||||
attachDatabase(database: string, attachAs: string) {
|
||||
attachDatabase(database: string, attachAs: string): void {
|
||||
this.db.prepare(`ATTACH ? as ${attachAs}`).run(database);
|
||||
}
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ export class Sqlite implements IDatabase {
|
|||
}
|
||||
|
||||
private static processUpgradeQuery(query: string): string {
|
||||
let result = query.replace(/^.*--!sqlite-ignore/gm, "");
|
||||
const result = query.replace(/^.*--!sqlite-ignore/gm, "");
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ if (config.mysql) {
|
|||
enableWalCheckpointNumber: false
|
||||
});
|
||||
}
|
||||
async function initDb() {
|
||||
async function initDb(): Promise<void> {
|
||||
await db.init();
|
||||
await privateDB.init();
|
||||
|
||||
|
|
@ -74,4 +74,4 @@ export {
|
|||
db,
|
||||
privateDB,
|
||||
initDb,
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import {NextFunction, Request, Response} from 'express';
|
||||
|
||||
export function apiCspMiddleware(req: Request, res: Response, next: NextFunction) {
|
||||
export function apiCspMiddleware(req: Request, res: Response, next: NextFunction): void {
|
||||
res.header("Content-Security-Policy", "script-src 'none'; object-src 'none'");
|
||||
next();
|
||||
}
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
import {NextFunction, Request, Response} from 'express';
|
||||
|
||||
export function corsMiddleware(req: Request, res: Response, next: NextFunction) {
|
||||
export function corsMiddleware(req: Request, res: Response, next: NextFunction): void {
|
||||
res.header("Access-Control-Allow-Origin", "*");
|
||||
res.header("Access-Control-Allow-Headers", "X-Requested-With, Content-Type, Accept");
|
||||
res.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS, DELETE")
|
||||
res.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS, DELETE");
|
||||
next();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import {Logger} from '../utils/logger';
|
||||
import {NextFunction, Request, Response} from 'express';
|
||||
|
||||
export function loggerMiddleware(req: Request, res: Response, next: NextFunction) {
|
||||
export function loggerMiddleware(req: Request, res: Response, next: NextFunction): void {
|
||||
Logger.info(`Request received: ${req.method} ${req.url}`);
|
||||
next();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ 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) {
|
||||
export function userCounter(req: Request, res: Response, next: NextFunction): void {
|
||||
fetch(config.userCounterURL + "/api/v1/addIP?hashedIP=" + getHash(getIP(req), 1), {method: "POST"})
|
||||
.catch(() => Logger.debug("Failing to connect to user counter at: " + config.userCounterURL));
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
import { time } from 'console';
|
||||
import {Request, Response} from 'express';
|
||||
import { db } from '../databases/databases';
|
||||
import { Logger } from '../utils/logger';
|
||||
|
|
@ -10,7 +9,7 @@ import { Logger } from '../utils/logger';
|
|||
* https://support.google.com/youtube/answer/9230970
|
||||
*/
|
||||
|
||||
export function addUnlistedVideo(req: Request, res: Response) {
|
||||
export function addUnlistedVideo(req: Request, res: Response): void {
|
||||
const videoID = req.body.videoID;
|
||||
const year = req.body.year || 0;
|
||||
const views = req.body.views || 0;
|
||||
|
|
@ -27,7 +26,6 @@ export function addUnlistedVideo(req: Request, res: Response) {
|
|||
} catch (err) {
|
||||
Logger.error(err);
|
||||
res.sendStatus(500);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import {db} from '../databases/databases';
|
|||
import {config} from '../config';
|
||||
import {Request, Response} from 'express';
|
||||
|
||||
export async function addUserAsVIP(req: Request, res: Response) {
|
||||
export async function addUserAsVIP(req: Request, res: Response): Promise<void> {
|
||||
const userID = req.query.userID as string;
|
||||
let adminUserIDInput = req.query.adminUserID as string;
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import {db} from '../databases/databases';
|
|||
import { Category, VideoID } from '../types/segments.model';
|
||||
import { UserID } from '../types/user.model';
|
||||
|
||||
export async function deleteLockCategoriesEndpoint(req: Request, res: Response) {
|
||||
export async function deleteLockCategoriesEndpoint(req: Request, res: Response): Promise<void> {
|
||||
// Collect user input data
|
||||
const videoID = req.body.videoID as VideoID;
|
||||
const userID = req.body.userID as UserID;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ const styleHeader = `<style>
|
|||
table tbody tr:nth-child(odd) {
|
||||
background: #efefef;
|
||||
}
|
||||
</style>`
|
||||
</style>`;
|
||||
|
||||
const licenseHeader = `<p>The API and database follow <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" rel="nofollow">CC BY-NC-SA 4.0</a> unless you have explicit permission.</p>
|
||||
<p><a href="https://gist.github.com/ajayyy/4b27dfc66e33941a45aeaadccb51de71">Attribution Template</a></p>
|
||||
|
|
@ -38,13 +38,13 @@ const tableNames = tables.map(table => table.name);
|
|||
interface TableDumpList {
|
||||
fileName: string;
|
||||
tableName: string;
|
||||
};
|
||||
}
|
||||
let latestDumpFiles: TableDumpList[] = [];
|
||||
|
||||
interface TableFile {
|
||||
file: string,
|
||||
timestamp: number
|
||||
};
|
||||
}
|
||||
|
||||
if (tables.length === 0) {
|
||||
Logger.warn('[dumpDatabase] No tables configured');
|
||||
|
|
@ -55,7 +55,7 @@ let updateQueued = false;
|
|||
let updateRunning = false;
|
||||
|
||||
function removeOutdatedDumps(exportPath: string): Promise<void> {
|
||||
return new Promise((resolve, reject) => {
|
||||
return new Promise((resolve) => {
|
||||
// Get list of table names
|
||||
// Create array for each table
|
||||
const tableFiles: Record<string, TableFile[]> = tableNames.reduce((obj: any, tableName) => {
|
||||
|
|
@ -81,7 +81,7 @@ function removeOutdatedDumps(exportPath: string): Promise<void> {
|
|||
});
|
||||
});
|
||||
|
||||
for (let tableName in tableFiles) {
|
||||
for (const tableName in tableFiles) {
|
||||
const files = tableFiles[tableName].sort((a, b) => b.timestamp - a.timestamp);
|
||||
for (let i = 2; i < files.length; i++) {
|
||||
// remove old file
|
||||
|
|
@ -90,13 +90,12 @@ function removeOutdatedDumps(exportPath: string): Promise<void> {
|
|||
});
|
||||
}
|
||||
}
|
||||
|
||||
resolve();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
export default async function dumpDatabase(req: Request, res: Response, showPage: boolean) {
|
||||
export default async function dumpDatabase(req: Request, res: Response, showPage: boolean): Promise<void> {
|
||||
if (!config?.dumpDatabase?.enabled) {
|
||||
res.status(404).send("Database dump is disabled");
|
||||
return;
|
||||
|
|
@ -108,7 +107,7 @@ export default async function dumpDatabase(req: Request, res: Response, showPage
|
|||
|
||||
updateQueueTime();
|
||||
|
||||
res.status(200)
|
||||
res.status(200);
|
||||
|
||||
if (showPage) {
|
||||
res.send(`${styleHeader}
|
||||
|
|
@ -153,7 +152,7 @@ export default async function dumpDatabase(req: Request, res: Response, showPage
|
|||
size: item.fileSize,
|
||||
};
|
||||
}),
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
await queueDump();
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import {db} from '../databases/databases';
|
||||
import {Request, Response} from 'express';
|
||||
|
||||
export async function getDaysSavedFormatted(req: Request, res: Response) {
|
||||
let row = await db.prepare('get', 'SELECT SUM(("endTime" - "startTime") / 60 / 60 / 24 * "views") as "daysSaved" from "sponsorTimes" where "shadowHidden" != 1', []);
|
||||
export async function getDaysSavedFormatted(req: Request, res: Response): Promise<void> {
|
||||
const row = await db.prepare('get', 'SELECT SUM(("endTime" - "startTime") / 60 / 60 / 24 * "views") as "daysSaved" from "sponsorTimes" where "shadowHidden" != 1', []);
|
||||
|
||||
if (row !== undefined) {
|
||||
//send this result
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ export async function getIsUserVIP(req: Request, res: Response): Promise<void> {
|
|||
const hashedUserID: HashedUserID = getHash(userID);
|
||||
|
||||
try {
|
||||
let vipState = await isUserVIP(hashedUserID);
|
||||
const vipState = await isUserVIP(hashedUserID);
|
||||
res.status(200).json({
|
||||
hashedUserID: hashedUserID,
|
||||
vip: vipState,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { Logger } from '../utils/logger';
|
|||
|
||||
const maxRewardTimePerSegmentInSeconds = config.maxRewardTimePerSegmentInSeconds ?? 86400;
|
||||
|
||||
export async function getSavedTimeForUser(req: Request, res: Response) {
|
||||
export async function getSavedTimeForUser(req: Request, res: Response): Promise<void> {
|
||||
let userID = req.query.userID as string;
|
||||
|
||||
if (userID == undefined) {
|
||||
|
|
@ -19,7 +19,7 @@ export async function getSavedTimeForUser(req: Request, res: Response) {
|
|||
userID = getHash(userID);
|
||||
|
||||
try {
|
||||
let row = await db.prepare("get", 'SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -1 AND "shadowHidden" != 1 ', [maxRewardTimePerSegmentInSeconds, maxRewardTimePerSegmentInSeconds, userID]);
|
||||
const row = await db.prepare("get", 'SELECT SUM(((CASE WHEN "endTime" - "startTime" > ? THEN ? ELSE "endTime" - "startTime" END) / 60) * "views") as "minutesSaved" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -1 AND "shadowHidden" != 1 ', [maxRewardTimePerSegmentInSeconds, maxRewardTimePerSegmentInSeconds, userID]);
|
||||
|
||||
if (row.minutesSaved != null) {
|
||||
res.send({
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import { Request, Response } from 'express';
|
|||
import { db } from '../databases/databases';
|
||||
import { DBSegment, SegmentUUID } from "../types/segments.model";
|
||||
|
||||
const isValidSegmentUUID = (str: string): Boolean => /^([a-f0-9]{64}|[a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})/.test(str)
|
||||
const isValidSegmentUUID = (str: string): boolean => /^([a-f0-9]{64}|[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/.test(str);
|
||||
|
||||
async function getSegmentFromDBByUUID(UUID: SegmentUUID): Promise<DBSegment> {
|
||||
try {
|
||||
|
|
@ -18,7 +18,7 @@ async function getSegmentFromDBByUUID(UUID: SegmentUUID): Promise<DBSegment> {
|
|||
|
||||
async function getSegmentsByUUID(UUIDs: SegmentUUID[]): Promise<DBSegment[]> {
|
||||
const DBSegments: DBSegment[] = [];
|
||||
for (let UUID of UUIDs) {
|
||||
for (const UUID of UUIDs) {
|
||||
// if UUID is invalid, skip
|
||||
if (!isValidSegmentUUID(UUID)) continue;
|
||||
DBSegments.push(await getSegmentFromDBByUUID(UUID as SegmentUUID));
|
||||
|
|
@ -26,7 +26,7 @@ async function getSegmentsByUUID(UUIDs: SegmentUUID[]): Promise<DBSegment[]> {
|
|||
return DBSegments;
|
||||
}
|
||||
|
||||
async function handleGetSegmentInfo(req: Request, res: Response) {
|
||||
async function handleGetSegmentInfo(req: Request, res: Response): Promise<DBSegment[]> {
|
||||
// If using params instead of JSON, only one UUID can be pulled
|
||||
let UUIDs = req.query.UUIDs
|
||||
? JSON.parse(req.query.UUIDs as string)
|
||||
|
|
@ -41,18 +41,18 @@ async function handleGetSegmentInfo(req: Request, res: Response) {
|
|||
if (UUIDs.length > 10) UUIDs = UUIDs.slice(0, 10);
|
||||
if (!Array.isArray(UUIDs) || !UUIDs) {
|
||||
res.status(400).send("UUIDs parameter does not match format requirements.");
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
const DBSegments = await getSegmentsByUUID(UUIDs);
|
||||
// all uuids failed lookup
|
||||
if (!DBSegments?.length) {
|
||||
res.sendStatus(400);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
// uuids valid but not found
|
||||
if (DBSegments[0] === null || DBSegments[0] === undefined) {
|
||||
res.sendStatus(400);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
return DBSegments;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import { getCategoryActionType } from '../utils/categoryInfo';
|
|||
import { getHash } from '../utils/getHash';
|
||||
import { getIP } from '../utils/getIP';
|
||||
import { Logger } from '../utils/logger';
|
||||
import { QueryCacher } from '../utils/queryCacher'
|
||||
import { QueryCacher } from '../utils/queryCacher';
|
||||
import { getReputation } from '../utils/reputation';
|
||||
|
||||
|
||||
|
|
@ -41,7 +41,7 @@ async function prepareCategorySegments(req: Request, videoID: VideoID, category:
|
|||
|
||||
const filteredSegments = segments.filter((_, index) => shouldFilter[index]);
|
||||
|
||||
const maxSegments = getCategoryActionType(category) === CategoryActionType.Skippable ? 32 : 1
|
||||
const maxSegments = getCategoryActionType(category) === CategoryActionType.Skippable ? 32 : 1;
|
||||
return (await chooseSegments(filteredSegments, maxSegments)).map((chosenSegment) => ({
|
||||
category,
|
||||
segment: [chosenSegment.startTime, chosenSegment.endTime],
|
||||
|
|
@ -135,7 +135,7 @@ async function getSegmentsFromDBByHash(hashedVideoIDPrefix: VideoIDHash, service
|
|||
) as Promise<DBSegment[]>;
|
||||
|
||||
if (hashedVideoIDPrefix.length === 4) {
|
||||
return await QueryCacher.get(fetchFromDB, skipSegmentsHashKey(hashedVideoIDPrefix, service))
|
||||
return await QueryCacher.get(fetchFromDB, skipSegmentsHashKey(hashedVideoIDPrefix, service));
|
||||
}
|
||||
|
||||
return await fetchFromDB();
|
||||
|
|
@ -150,7 +150,7 @@ async function getSegmentsFromDBByVideoID(videoID: VideoID, service: Service): P
|
|||
[videoID, service]
|
||||
) as Promise<DBSegment[]>;
|
||||
|
||||
return await QueryCacher.get(fetchFromDB, skipSegmentsKey(videoID, service))
|
||||
return await QueryCacher.get(fetchFromDB, skipSegmentsKey(videoID, service));
|
||||
}
|
||||
|
||||
//gets a weighted random choice from the choices array based on their `votes` property.
|
||||
|
|
@ -168,7 +168,7 @@ function getWeightedRandomChoice<T extends VotableObject>(choices: T[], amountOf
|
|||
|
||||
//assign a weight to each choice
|
||||
let totalWeight = 0;
|
||||
let choicesWithWeights: TWithWeight[] = choices.map(choice => {
|
||||
const choicesWithWeights: TWithWeight[] = choices.map(choice => {
|
||||
const boost = Math.min(choice.reputation, 4);
|
||||
|
||||
//The 3 makes -2 the minimum votes before being ignored completely
|
||||
|
|
@ -234,7 +234,7 @@ async function chooseSegments(segments: DBSegment[], max: number): Promise<DBSeg
|
|||
}
|
||||
|
||||
cursor = Math.max(cursor, segment.endTime);
|
||||
};
|
||||
}
|
||||
|
||||
overlappingSegmentsGroups.forEach((group) => {
|
||||
if (group.locked) {
|
||||
|
|
|
|||
|
|
@ -3,11 +3,10 @@ import {getSegmentsByHash} from './getSkipSegments';
|
|||
import {Request, Response} from 'express';
|
||||
import { Category, Service, VideoIDHash } from '../types/segments.model';
|
||||
|
||||
export async function getSkipSegmentsByHash(req: Request, res: Response) {
|
||||
export async function getSkipSegmentsByHash(req: Request, res: Response): Promise<Response> {
|
||||
let hashPrefix = req.params.prefix as VideoIDHash;
|
||||
if (!hashPrefixTester(req.params.prefix)) {
|
||||
res.status(400).send("Hash prefix does not match format requirements."); // Exit early on faulty prefix
|
||||
return;
|
||||
return res.status(400).send("Hash prefix does not match format requirements."); // Exit early on faulty prefix
|
||||
}
|
||||
hashPrefix = hashPrefix.toLowerCase() as VideoIDHash;
|
||||
|
||||
|
|
@ -44,6 +43,5 @@ export async function getSkipSegmentsByHash(req: Request, res: Response) {
|
|||
hash: data.hash,
|
||||
segments: data.segments,
|
||||
}));
|
||||
|
||||
res.status(output.length === 0 ? 404 : 200).json(output);
|
||||
return res.status(output.length === 0 ? 404 : 200).json(output);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ const MILLISECONDS_IN_MINUTE = 60000;
|
|||
const getTopUsersWithCache = createMemoryCache(generateTopUsersStats, config.getTopUsersCacheTimeMinutes * MILLISECONDS_IN_MINUTE);
|
||||
const maxRewardTimePerSegmentInSeconds = config.maxRewardTimePerSegmentInSeconds ?? 86400;
|
||||
|
||||
async function generateTopUsersStats(sortBy: string, categoryStatsEnabled: boolean = false) {
|
||||
async function generateTopUsersStats(sortBy: string, categoryStatsEnabled = false) {
|
||||
const userNames = [];
|
||||
const viewCounts = [];
|
||||
const totalSubmissions = [];
|
||||
|
|
@ -63,7 +63,7 @@ async function generateTopUsersStats(sortBy: string, categoryStatsEnabled: boole
|
|||
};
|
||||
}
|
||||
|
||||
export async function getTopUsers(req: Request, res: Response) {
|
||||
export async function getTopUsers(req: Request, res: Response): Promise<Response> {
|
||||
const sortType = parseInt(req.query.sortType as string);
|
||||
const categoryStatsEnabled = req.query.categoryStats;
|
||||
|
||||
|
|
@ -89,5 +89,5 @@ export async function getTopUsers(req: Request, res: Response) {
|
|||
const stats = await getTopUsersWithCache(sortBy, categoryStatsEnabled);
|
||||
|
||||
//send this result
|
||||
res.send(stats);
|
||||
return res.send(stats);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,14 +13,14 @@ let apiUsersCache = 0;
|
|||
|
||||
let lastUserCountCheck = 0;
|
||||
|
||||
export async function getTotalStats(req: Request, res: Response) {
|
||||
export async function getTotalStats(req: Request, res: Response): Promise<void> {
|
||||
const userCountQuery = `(SELECT COUNT(*) FROM (SELECT DISTINCT "userID" from "sponsorTimes") t) "userCount",`;
|
||||
|
||||
let row = await db.prepare('get', `SELECT ${req.query.countContributingUsers ? userCountQuery : ""} COUNT(*) as "totalSubmissions",
|
||||
const row = await db.prepare('get', `SELECT ${req.query.countContributingUsers ? userCountQuery : ""} COUNT(*) as "totalSubmissions",
|
||||
SUM("views") as "viewCount", SUM(("endTime" - "startTime") / 60 * "views") as "minutesSaved" FROM "sponsorTimes" WHERE "shadowHidden" != 1 AND "votes" >= 0`, []);
|
||||
|
||||
if (row !== undefined) {
|
||||
let extensionUsers = chromeUsersCache + firefoxUsersCache;
|
||||
const extensionUsers = chromeUsersCache + firefoxUsersCache;
|
||||
|
||||
//send this result
|
||||
res.send({
|
||||
|
|
@ -33,7 +33,7 @@ export async function getTotalStats(req: Request, res: Response) {
|
|||
});
|
||||
|
||||
// Check if the cache should be updated (every ~14 hours)
|
||||
let now = Date.now();
|
||||
const now = Date.now();
|
||||
if (now - lastUserCountCheck > 5000000) {
|
||||
lastUserCountCheck = now;
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ function updateExtensionUsers() {
|
|||
})
|
||||
.catch(() => Logger.debug("Failing to connect to " + chromeExtensionUrl));
|
||||
})
|
||||
.catch(err => {
|
||||
.catch(() => {
|
||||
Logger.debug("Failing to connect to " + mozillaAddonsUrl);
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ 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 }[]> {
|
||||
function getFuzzyUserID(userName: string): Promise<{userName: string, userID: UserID }[]> {
|
||||
// escape [_ % \] to avoid ReDOS
|
||||
userName = userName.replace(/\\/g, '\\\\')
|
||||
.replace(/_/g, '\\_')
|
||||
|
|
@ -11,13 +11,13 @@ function getFuzzyUserID(userName: String): Promise<{userName: String, userID: Us
|
|||
// LIMIT to reduce overhead | ESCAPE to escape LIKE wildcards
|
||||
try {
|
||||
return db.prepare('all', `SELECT "userName", "userID" FROM "userNames" WHERE "userName"
|
||||
LIKE ? ESCAPE '\\' LIMIT 10`, [userName])
|
||||
LIKE ? ESCAPE '\\' LIMIT 10`, [userName]);
|
||||
} catch (err) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function getExactUserID(userName: String): Promise<{userName: String, userID: UserID }[]> {
|
||||
function getExactUserID(userName: string): Promise<{userName: string, userID: UserID }[]> {
|
||||
try {
|
||||
return db.prepare('all', `SELECT "userName", "userID" from "userNames" WHERE "userName" = ? LIMIT 10`, [userName]);
|
||||
} catch (err) {
|
||||
|
|
@ -25,31 +25,27 @@ function getExactUserID(userName: String): Promise<{userName: String, userID: Us
|
|||
}
|
||||
}
|
||||
|
||||
export async function getUserID(req: Request, res: Response) {
|
||||
let userName = req.query.username as string;
|
||||
export async function getUserID(req: Request, res: Response): Promise<Response> {
|
||||
const userName = req.query.username as string;
|
||||
const exactSearch = req.query.exact
|
||||
? req.query.exact == "true"
|
||||
: false as Boolean;
|
||||
: false as boolean;
|
||||
|
||||
// if not exact and length is 1, also skip
|
||||
if (userName == undefined || userName.length > 64 ||
|
||||
(!exactSearch && userName.length < 3)) {
|
||||
// invalid request
|
||||
res.sendStatus(400);
|
||||
return false;
|
||||
return res.sendStatus(400);
|
||||
}
|
||||
const results = exactSearch
|
||||
? await getExactUserID(userName)
|
||||
: await getFuzzyUserID(userName);
|
||||
|
||||
if (results === undefined || results === null) {
|
||||
res.sendStatus(500);
|
||||
return false;
|
||||
return res.sendStatus(500);
|
||||
} else if (results.length === 0) {
|
||||
res.sendStatus(404);
|
||||
return false;
|
||||
return res.sendStatus(404);
|
||||
} else {
|
||||
res.send(results);
|
||||
return false;
|
||||
return res.send(results);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ import { SegmentUUID } from "../types/segments.model";
|
|||
|
||||
async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ minutesSaved: number, segmentCount: number }> {
|
||||
try {
|
||||
let row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved",
|
||||
const row = await db.prepare("get", `SELECT SUM((("endTime" - "startTime") / 60) * "views") as "minutesSaved",
|
||||
count(*) as "segmentCount" FROM "sponsorTimes"
|
||||
WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
|
||||
if (row.minutesSaved != null) {
|
||||
|
|
@ -30,8 +30,8 @@ async function dbGetSubmittedSegmentSummary(userID: HashedUserID): Promise<{ min
|
|||
|
||||
async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise<number> {
|
||||
try {
|
||||
let row = await db.prepare("get", `SELECT COUNT(*) as "ignoredSegmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID]);
|
||||
return row?.ignoredSegmentCount ?? 0
|
||||
const row = await db.prepare("get", `SELECT COUNT(*) as "ignoredSegmentCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID]);
|
||||
return row?.ignoredSegmentCount ?? 0;
|
||||
} catch (err) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -39,7 +39,7 @@ async function dbGetIgnoredSegmentCount(userID: HashedUserID): Promise<number> {
|
|||
|
||||
async function dbGetUsername(userID: HashedUserID) {
|
||||
try {
|
||||
let row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
|
||||
const row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
|
||||
if (row !== undefined) {
|
||||
return row.userName;
|
||||
} else {
|
||||
|
|
@ -53,7 +53,7 @@ async function dbGetUsername(userID: HashedUserID) {
|
|||
|
||||
async function dbGetViewsForUser(userID: HashedUserID) {
|
||||
try {
|
||||
let row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
|
||||
const row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ? AND "votes" > -2 AND "shadowHidden" != 1`, [userID]);
|
||||
return row?.viewCount ?? 0;
|
||||
} catch (err) {
|
||||
return false;
|
||||
|
|
@ -62,7 +62,7 @@ async function dbGetViewsForUser(userID: HashedUserID) {
|
|||
|
||||
async function dbGetIgnoredViewsForUser(userID: HashedUserID) {
|
||||
try {
|
||||
let row = await db.prepare('get', `SELECT SUM("views") as "ignoredViewCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID]);
|
||||
const row = await db.prepare('get', `SELECT SUM("views") as "ignoredViewCount" FROM "sponsorTimes" WHERE "userID" = ? AND ( "votes" <= -2 OR "shadowHidden" = 1 )`, [userID]);
|
||||
return row?.ignoredViewCount ?? 0;
|
||||
} catch (err) {
|
||||
return false;
|
||||
|
|
@ -71,7 +71,7 @@ async function dbGetIgnoredViewsForUser(userID: HashedUserID) {
|
|||
|
||||
async function dbGetWarningsForUser(userID: HashedUserID): Promise<number> {
|
||||
try {
|
||||
let row = await db.prepare('get', `SELECT COUNT(*) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]);
|
||||
const row = await db.prepare('get', `SELECT COUNT(*) as total FROM "warnings" WHERE "userID" = ? AND "enabled" = 1`, [userID]);
|
||||
return row?.total ?? 0;
|
||||
} catch (err) {
|
||||
Logger.error('Couldn\'t get warnings for user ' + userID + '. returning 0');
|
||||
|
|
@ -81,14 +81,14 @@ async function dbGetWarningsForUser(userID: HashedUserID): Promise<number> {
|
|||
|
||||
async function dbGetLastSegmentForUser(userID: HashedUserID): Promise<SegmentUUID> {
|
||||
try {
|
||||
let row = await db.prepare('get', `SELECT "UUID" FROM "sponsorTimes" WHERE "userID" = ? ORDER BY "timeSubmitted" DESC LIMIT 1`, [userID]);
|
||||
const row = await db.prepare('get', `SELECT "UUID" FROM "sponsorTimes" WHERE "userID" = ? ORDER BY "timeSubmitted" DESC LIMIT 1`, [userID]);
|
||||
return row?.UUID ?? null;
|
||||
} catch (err) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
export async function getUserInfo(req: Request, res: Response) {
|
||||
export async function getUserInfo(req: Request, res: Response): Promise<void> {
|
||||
const userID = req.query.userID as UserID;
|
||||
const hashedUserID: HashedUserID = userID ? getHash(userID) : req.query.publicUserID as HashedUserID;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import {getHash} from '../utils/getHash';
|
|||
import {Logger} from '../utils/logger';
|
||||
import {Request, Response} from 'express';
|
||||
|
||||
export async function getUsername(req: Request, res: Response) {
|
||||
export async function getUsername(req: Request, res: Response): Promise<void> {
|
||||
let userID = req.query.userID as string;
|
||||
|
||||
if (userID == undefined) {
|
||||
|
|
@ -16,7 +16,7 @@ export async function getUsername(req: Request, res: Response) {
|
|||
userID = getHash(userID);
|
||||
|
||||
try {
|
||||
let row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
|
||||
const row = await db.prepare('get', `SELECT "userName" FROM "userNames" WHERE "userID" = ?`, [userID]);
|
||||
|
||||
if (row !== undefined) {
|
||||
res.send({
|
||||
|
|
@ -31,7 +31,6 @@ export async function getUsername(req: Request, res: Response) {
|
|||
} catch (err) {
|
||||
Logger.error(err);
|
||||
res.sendStatus(500);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import {Request, Response} from 'express';
|
|||
import {getHash} from '../utils/getHash';
|
||||
import {Logger} from '../utils/logger';
|
||||
|
||||
export async function getViewsForUser(req: Request, res: Response) {
|
||||
export async function getViewsForUser(req: Request, res: Response): Promise<void> {
|
||||
let userID = req.query.userID as string;
|
||||
|
||||
if (userID == undefined) {
|
||||
|
|
@ -16,7 +16,7 @@ export async function getViewsForUser(req: Request, res: Response) {
|
|||
userID = getHash(userID);
|
||||
|
||||
try {
|
||||
let row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ?`, [userID]);
|
||||
const row = await db.prepare('get', `SELECT SUM("views") as "viewCount" FROM "sponsorTimes" WHERE "userID" = ?`, [userID]);
|
||||
|
||||
//increase the view count by one
|
||||
if (row.viewCount != null) {
|
||||
|
|
@ -29,7 +29,6 @@ export async function getViewsForUser(req: Request, res: Response) {
|
|||
} catch (err) {
|
||||
Logger.error(err);
|
||||
res.sendStatus(500);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@ import {handleGetSegments} from './getSkipSegments';
|
|||
import {Request, Response} from 'express';
|
||||
|
||||
export async function oldGetVideoSponsorTimes(req: Request, res: Response): Promise<void> {
|
||||
let segments = await handleGetSegments(req, res);
|
||||
const segments = await handleGetSegments(req, res);
|
||||
|
||||
if (segments) {
|
||||
// Convert to old outputs
|
||||
let sponsorTimes = [];
|
||||
let UUIDs = [];
|
||||
const sponsorTimes = [];
|
||||
const UUIDs = [];
|
||||
|
||||
for (const segment of segments) {
|
||||
sponsorTimes.push(segment.segment);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
import {postSkipSegments} from './postSkipSegments';
|
||||
import {Request, Response} from 'express';
|
||||
|
||||
export async function oldSubmitSponsorTimes(req: Request, res: Response) {
|
||||
export async function oldSubmitSponsorTimes(req: Request, res: Response): Promise<void> {
|
||||
req.query.category = "sponsor";
|
||||
|
||||
return postSkipSegments(req, res);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ import { QueryCacher } from '../utils/queryCacher';
|
|||
import { isUserVIP } from '../utils/isUserVIP';
|
||||
import { VideoIDHash } from "../types/segments.model";
|
||||
|
||||
export async function postClearCache(req: Request, res: Response) {
|
||||
export async function postClearCache(req: Request, res: Response): Promise<void> {
|
||||
const videoID = req.query.videoID as VideoID;
|
||||
let userID = req.query.userID as UserID;
|
||||
const userID = req.query.userID as UserID;
|
||||
const service = req.query.service as Service ?? Service.YouTube;
|
||||
|
||||
const invalidFields = [];
|
||||
|
|
@ -24,7 +24,7 @@ export async function postClearCache(req: Request, res: Response) {
|
|||
// invalid request
|
||||
const fields = invalidFields.reduce((p, c, i) => p + (i !== 0 ? ', ' : '') + c, '');
|
||||
res.status(400).send(`No valid ${fields} field(s) provided`);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
|
||||
// hash the userID as early as possible
|
||||
|
|
@ -36,7 +36,7 @@ export async function postClearCache(req: Request, res: Response) {
|
|||
if (!(await isUserVIP(hashedUserID))){
|
||||
Logger.warn("Permission violation: User " + hashedUserID + " attempted to clear cache for video " + videoID + ".");
|
||||
res.status(403).json({"message": "Not a VIP"});
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
@ -49,7 +49,7 @@ export async function postClearCache(req: Request, res: Response) {
|
|||
message: "Cache cleared on video " + videoID
|
||||
});
|
||||
} catch(err) {
|
||||
res.status(500).send()
|
||||
return false;
|
||||
res.status(500).send();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ import {isUserVIP} from '../utils/isUserVIP';
|
|||
import {db} from '../databases/databases';
|
||||
import {Request, Response} from 'express';
|
||||
|
||||
export async function postLockCategories(req: Request, res: Response) {
|
||||
export async function postLockCategories(req: Request, res: Response): Promise<string[]> {
|
||||
// Collect user input data
|
||||
let videoID = req.body.videoID;
|
||||
const videoID = req.body.videoID;
|
||||
let userID = req.body.userID;
|
||||
let categories = req.body.categories;
|
||||
const categories = req.body.categories;
|
||||
|
||||
// Check input data is valid
|
||||
if (!videoID
|
||||
|
|
@ -25,7 +25,7 @@ export async function postLockCategories(req: Request, res: Response) {
|
|||
|
||||
// Check if user is VIP
|
||||
userID = getHash(userID);
|
||||
let userIsVIP = await isUserVIP(userID);
|
||||
const userIsVIP = await isUserVIP(userID);
|
||||
|
||||
if (!userIsVIP) {
|
||||
res.status(403).json({
|
||||
|
|
@ -67,7 +67,7 @@ export async function postLockCategories(req: Request, res: Response) {
|
|||
message: "Internal Server Error: Could not write marker to the database.",
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
res.status(200).json({
|
||||
submitted: categoriesToMark,
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ export async function postPurgeAllSegments(req: Request, res: Response): Promise
|
|||
const hashedUserID: HashedUserID = getHash(userID);
|
||||
|
||||
try {
|
||||
let vipState = await isUserVIP(hashedUserID);
|
||||
const vipState = await isUserVIP(hashedUserID);
|
||||
if (!vipState) {
|
||||
res.status(403).json({
|
||||
message: 'Must be a VIP to perform this action.',
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ export async function postSegmentShift(req: Request, res: Response): Promise<Res
|
|||
await db.prepare('run', 'UPDATE "sponsorTimes" SET "startTime" = ?, "endTime" = ?, "votes" = -2 WHERE "UUID" = ?', [result.segment.startTime, result.segment.endTime, result.segment.UUID]);
|
||||
break;
|
||||
}
|
||||
};
|
||||
}
|
||||
} catch (err) {
|
||||
Logger.error(err);
|
||||
res.sendStatus(500);
|
||||
|
|
|
|||
|
|
@ -4,16 +4,13 @@ import {db, privateDB} from '../databases/databases';
|
|||
import {getMaxResThumbnail, YouTubeAPI} from '../utils/youtubeApi';
|
||||
import {getSubmissionUUID} from '../utils/getSubmissionUUID';
|
||||
import fetch from 'node-fetch';
|
||||
import isoDurations, { end } from 'iso8601-duration';
|
||||
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 { skipSegmentsHashKey, skipSegmentsKey } from '../utils/redisKeys';
|
||||
import redis from '../utils/redis';
|
||||
import { Category, CategoryActionType, IncomingSegment, Segment, SegmentUUID, Service, VideoDuration, VideoID } from '../types/segments.model';
|
||||
import { Category, CategoryActionType, IncomingSegment, SegmentUUID, Service, VideoDuration, VideoID } from '../types/segments.model';
|
||||
import { deleteLockCategories } from './deleteLockCategories';
|
||||
import { getCategoryActionType } from '../utils/categoryInfo';
|
||||
import { QueryCacher } from '../utils/queryCacher';
|
||||
|
|
@ -176,9 +173,6 @@ async function autoModerateSubmission(apiVideoInfo: APIVideoInfo,
|
|||
const segments = submission.segments;
|
||||
let nbString = "";
|
||||
for (let i = 0; i < segments.length; i++) {
|
||||
const startTime = parseFloat(segments[i].segment[0]);
|
||||
const endTime = parseFloat(segments[i].segment[1]);
|
||||
|
||||
if (duration == 0) {
|
||||
// Allow submission if the duration is 0 (bug in youtube api)
|
||||
return false;
|
||||
|
|
@ -202,8 +196,8 @@ async function autoModerateSubmission(apiVideoInfo: APIVideoInfo,
|
|||
|
||||
//add segments they are trying to add in this submission
|
||||
for (let i = 0; i < segments.length; i++) {
|
||||
let startTime = parseFloat(segments[i].segment[0]);
|
||||
let endTime = parseFloat(segments[i].segment[1]);
|
||||
const startTime = parseFloat(segments[i].segment[0]);
|
||||
const endTime = parseFloat(segments[i].segment[1]);
|
||||
allSegmentTimes.push([startTime, endTime]);
|
||||
}
|
||||
|
||||
|
|
@ -280,12 +274,12 @@ function proxySubmission(req: Request) {
|
|||
.then(async res => {
|
||||
Logger.debug('Proxy Submission: ' + res.status + ' (' + (await res.text()) + ')');
|
||||
})
|
||||
.catch(err => {
|
||||
.catch(() => {
|
||||
Logger.error("Proxy Submission: Failed to make call");
|
||||
});
|
||||
}
|
||||
|
||||
export async function postSkipSegments(req: Request, res: Response) {
|
||||
export async function postSkipSegments(req: Request, res: Response): Promise<void> {
|
||||
if (config.proxySubmission) {
|
||||
proxySubmission(req);
|
||||
}
|
||||
|
|
@ -338,7 +332,8 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
)).count;
|
||||
|
||||
if (warningsCount >= config.maxNumberOfActiveWarnings) {
|
||||
return res.status(403).send('Submission rejected due to a warning from a moderator. This means that we noticed you were making some common mistakes that are not malicious, and we just want to clarify the rules. Could you please send a message in Discord or Matrix so we can further help you?');
|
||||
res.status(403).send('Submission rejected due to a warning from a moderator. This means that we noticed you were making some common mistakes that are not malicious, and we just want to clarify the rules. Could you please send a message in Discord or Matrix so we can further help you?');
|
||||
return;
|
||||
}
|
||||
|
||||
let lockedCategoryList = (await db.prepare('all', 'SELECT category from "lockCategories" where "videoID" = ?', [videoID])).map((list: any) => {
|
||||
|
|
@ -406,8 +401,8 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
}
|
||||
|
||||
|
||||
let startTime = parseFloat(segments[i].segment[0]);
|
||||
let endTime = parseFloat(segments[i].segment[1]);
|
||||
const startTime = parseFloat(segments[i].segment[0]);
|
||||
const endTime = parseFloat(segments[i].segment[1]);
|
||||
|
||||
if (isNaN(startTime) || isNaN(endTime)
|
||||
|| startTime === Infinity || endTime === Infinity || startTime < 0 || startTime > endTime
|
||||
|
|
@ -459,6 +454,7 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
const yesterday = timeSubmitted - 86400000;
|
||||
|
||||
// Disable IP ratelimiting for now
|
||||
// eslint-disable-next-line no-constant-condition
|
||||
if (false) {
|
||||
//check to see if this ip has submitted too many sponsors today
|
||||
const rateLimitCheckRow = await privateDB.prepare('get', `SELECT COUNT(*) as count FROM "sponsorTimes" WHERE "hashedIP" = ? AND "videoID" = ? AND "timeSubmitted" > ?`, [hashedIP, videoID, yesterday]);
|
||||
|
|
@ -466,12 +462,12 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
if (rateLimitCheckRow.count >= 10) {
|
||||
//too many sponsors for the same video from the same ip address
|
||||
res.sendStatus(429);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Disable max submissions for now
|
||||
// eslint-disable-next-line no-constant-condition
|
||||
if (false) {
|
||||
//check to see if the user has already submitted sponsors for this video
|
||||
const duplicateCheckRow = await db.prepare('get', `SELECT COUNT(*) as count FROM "sponsorTimes" WHERE "userID" = ? and "videoID" = ?`, [userID, videoID]);
|
||||
|
|
@ -479,7 +475,6 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
if (duplicateCheckRow.count >= 16) {
|
||||
//too many sponsors for the same video from the same user
|
||||
res.sendStatus(429);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -494,7 +489,7 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
shadowBanned = 1;
|
||||
}
|
||||
|
||||
let startingVotes = 0 + decreaseVotes;
|
||||
const startingVotes = 0 + decreaseVotes;
|
||||
const reputation = await getReputation(userID);
|
||||
|
||||
for (const segmentInfo of segments) {
|
||||
|
|
@ -528,7 +523,6 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
res.sendStatus(500);
|
||||
Logger.error("Error when putting sponsorTime in the DB: " + videoID + ", " + segmentInfo.segment[0] + ", " +
|
||||
segmentInfo.segment[1] + ", " + userID + ", " + segmentInfo.category + ". " + err);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -541,9 +535,7 @@ export async function postSkipSegments(req: Request, res: Response) {
|
|||
}
|
||||
} catch (err) {
|
||||
Logger.error(err);
|
||||
|
||||
res.sendStatus(500);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import {isUserVIP} from '../utils/isUserVIP';
|
|||
import {getHash} from '../utils/getHash';
|
||||
import { HashedUserID, UserID } from '../types/user.model';
|
||||
|
||||
export async function postWarning(req: Request, res: Response) {
|
||||
export async function postWarning(req: Request, res: Response): Promise<void> {
|
||||
// Collect user input data
|
||||
const issuerUserID: HashedUserID = getHash(<UserID> req.body.issuerUserID);
|
||||
const userID: UserID = req.body.userID;
|
||||
|
|
@ -23,7 +23,7 @@ export async function postWarning(req: Request, res: Response) {
|
|||
let resultStatus = "";
|
||||
|
||||
if (enabled) {
|
||||
let previousWarning = await db.prepare('get', 'SELECT * FROM "warnings" WHERE "userID" = ? AND "issuerUserID" = ?', [userID, issuerUserID]);
|
||||
const previousWarning = await db.prepare('get', 'SELECT * FROM "warnings" WHERE "userID" = ? AND "issuerUserID" = ?', [userID, issuerUserID]);
|
||||
|
||||
if (!previousWarning) {
|
||||
await db.prepare(
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ async function logUserNameChange(userID: string, newUserName: string, oldUserNam
|
|||
);
|
||||
}
|
||||
|
||||
export async function setUsername(req: Request, res: Response) {
|
||||
export async function setUsername(req: Request, res: Response): Promise<void> {
|
||||
let userID = req.query.userID as string;
|
||||
let userName = req.query.username as string;
|
||||
|
||||
|
|
@ -31,6 +31,7 @@ export async function setUsername(req: Request, res: Response) {
|
|||
|
||||
// remove unicode control characters from username (example: \n, \r, \t etc.)
|
||||
// source: https://en.wikipedia.org/wiki/Control_character#In_Unicode
|
||||
// eslint-disable-next-line no-control-regex
|
||||
userName = userName.replace(/[\u0000-\u001F\u007F-\u009F]/g, '');
|
||||
|
||||
if (adminUserIDInput != undefined) {
|
||||
|
|
@ -81,7 +82,6 @@ export async function setUsername(req: Request, res: Response) {
|
|||
} catch (err) {
|
||||
Logger.error(err);
|
||||
res.sendStatus(500);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { Category, Service, VideoID, VideoIDHash } from '../types/segments.model
|
|||
import { UserID } from '../types/user.model';
|
||||
import { QueryCacher } from '../utils/queryCacher';
|
||||
|
||||
export async function shadowBanUser(req: Request, res: Response) {
|
||||
export async function shadowBanUser(req: Request, res: Response): Promise<void> {
|
||||
const userID = req.query.userID as string;
|
||||
const hashedIP = req.query.hashedIP as string;
|
||||
let adminUserIDInput = req.query.adminUserID as string;
|
||||
|
|
@ -66,10 +66,10 @@ export async function shadowBanUser(req: Request, res: Response) {
|
|||
|
||||
//find all previous submissions and unhide them
|
||||
if (unHideOldSubmissions) {
|
||||
let segmentsToIgnore = (await db.prepare('all', `SELECT "UUID" FROM "sponsorTimes" st
|
||||
const segmentsToIgnore = (await db.prepare('all', `SELECT "UUID" FROM "sponsorTimes" st
|
||||
JOIN "lockCategories" ns on "st"."videoID" = "ns"."videoID" AND st.category = ns.category WHERE "st"."userID" = ?`
|
||||
, [userID])).map((item: {UUID: string}) => item.UUID);
|
||||
let allSegments = (await db.prepare('all', `SELECT "UUID" FROM "sponsorTimes" st WHERE "st"."userID" = ?`, [userID]))
|
||||
const allSegments = (await db.prepare('all', `SELECT "UUID" FROM "sponsorTimes" st WHERE "st"."userID" = ?`, [userID]))
|
||||
.map((item: {UUID: string}) => item.UUID);
|
||||
|
||||
await Promise.all(allSegments.filter((item: {uuid: string}) => {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import {db} from '../databases/databases';
|
|||
import {Request, Response} from 'express';
|
||||
|
||||
export async function viewedVideoSponsorTime(req: Request, res: Response): Promise<Response> {
|
||||
let UUID = req.query.UUID;
|
||||
const UUID = req.query.UUID;
|
||||
|
||||
if (UUID == undefined) {
|
||||
//invalid request
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ export function getUserID(req: Request): UserID {
|
|||
return req.query.userID as UserID;
|
||||
}
|
||||
|
||||
export async function voteOnSponsorTime(req: Request, res: Response) {
|
||||
export async function voteOnSponsorTime(req: Request, res: Response): Promise<void> {
|
||||
const UUID = req.query.UUID as SegmentUUID;
|
||||
const paramUserID = getUserID(req);
|
||||
let type = req.query.type !== undefined ? parseInt(req.query.type as string) : undefined;
|
||||
|
|
@ -269,13 +269,13 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
|
|||
const userID = getHash(paramUserID + UUID);
|
||||
|
||||
// To force a non 200, change this early
|
||||
let finalResponse: FinalResponse = {
|
||||
const finalResponse: FinalResponse = {
|
||||
blockVote: false,
|
||||
finalStatus: 200,
|
||||
finalMessage: null,
|
||||
webhookType: VoteWebhookType.Normal,
|
||||
webhookMessage: null
|
||||
}
|
||||
};
|
||||
|
||||
//x-forwarded-for if this server is behind a proxy
|
||||
const ip = getIP(req);
|
||||
|
|
@ -292,7 +292,7 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
|
|||
// disallow vote types 10/11
|
||||
if (type === 10 || type === 11) {
|
||||
// no longer allow type 10/11 alternative votes
|
||||
res.sendStatus(400)
|
||||
res.sendStatus(400);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -305,8 +305,8 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
|
|||
|
||||
if (await isSegmentLocked() || await isVideoLocked()) {
|
||||
finalResponse.blockVote = true;
|
||||
finalResponse.webhookType = VoteWebhookType.Rejected
|
||||
finalResponse.webhookMessage = "Vote rejected: A moderator has decided that this segment is correct"
|
||||
finalResponse.webhookType = VoteWebhookType.Rejected;
|
||||
finalResponse.webhookMessage = "Vote rejected: A moderator has decided that this segment is correct";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -337,7 +337,8 @@ export async function voteOnSponsorTime(req: Request, res: Response) {
|
|||
)).count;
|
||||
|
||||
if (warningsCount >= config.maxNumberOfActiveWarnings) {
|
||||
return res.status(403).send('Vote rejected due to a warning from a moderator. This means that we noticed you were making some common mistakes that are not malicious, and we just want to clarify the rules. Could you please send a message in Discord or Matrix so we can further help you?');
|
||||
res.status(403).send('Vote rejected due to a warning from a moderator. This means that we noticed you were making some common mistakes that are not malicious, and we just want to clarify the rules. Could you please send a message in Discord or Matrix so we can further help you?');
|
||||
return;
|
||||
}
|
||||
|
||||
const voteTypeEnum = (type == 0 || type == 1 || type == 20) ? voteTypes.normal : voteTypes.incorrect;
|
||||
|
|
|
|||
|
|
@ -10,22 +10,22 @@ if (config.diskCache) {
|
|||
DiskCache = {
|
||||
// constructor(rootPath, options): {};
|
||||
|
||||
init() {},
|
||||
init(): void { return; },
|
||||
|
||||
reset() {},
|
||||
reset(): void { return; },
|
||||
|
||||
has(key) { return false; },
|
||||
has(key: string): boolean { return false; },
|
||||
|
||||
get(key, opts) { return null; },
|
||||
get(key: string, opts): string { return null; },
|
||||
|
||||
// Returns size
|
||||
set(key, dataOrSteam) { return new Promise((resolve) => 0); },
|
||||
set(key: string, dataOrSteam): Promise<number> { return new Promise(() => 0); },
|
||||
|
||||
del(key) {},
|
||||
del(key: string): void { return; },
|
||||
|
||||
size() { return 0; },
|
||||
size(): number { return 0; },
|
||||
|
||||
prune() {},
|
||||
prune(): void {return; },
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/**
|
||||
* Converts time in seconds to minutes:seconds
|
||||
*/
|
||||
export function getFormattedTime(totalSeconds: number) {
|
||||
let minutes = Math.floor(totalSeconds / 60);
|
||||
let seconds = totalSeconds - minutes * 60;
|
||||
export function getFormattedTime(totalSeconds: number): string {
|
||||
const minutes = Math.floor(totalSeconds / 60);
|
||||
const seconds = totalSeconds - minutes * 60;
|
||||
let secondsDisplay = seconds.toFixed(3);
|
||||
if (seconds < 10) {
|
||||
//add a zero
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ export function getHash<T extends string>(value: T, times = 5000): T & HashedVal
|
|||
if (times <= 0) return "" as T & HashedValue;
|
||||
|
||||
for (let i = 0; i < times; i++) {
|
||||
let hashCreator = crypto.createHash('sha256');
|
||||
const hashCreator = crypto.createHash('sha256');
|
||||
value = hashCreator.update(value).digest('hex') as T;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import {getHash} from './getHash';
|
||||
import { HashedValue } from '../types/hash.model';
|
||||
|
||||
export function getSubmissionUUID(videoID: string, category: string, userID: string, startTime: number, endTime: number) {
|
||||
export function getSubmissionUUID(videoID: string, category: string, userID: string, startTime: number, endTime: number): HashedValue{
|
||||
return getHash('v2-categories' + videoID + startTime + endTime + category + userID, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -86,4 +86,4 @@ class Logger {
|
|||
const loggerInstance = new Logger();
|
||||
export {
|
||||
loggerInstance as Logger
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ async function get<T>(fetchFromDB: () => Promise<T>, key: string): Promise<T> {
|
|||
return data;
|
||||
}
|
||||
|
||||
function clearVideoCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoIDHash; service: Service; userID?: UserID; }) {
|
||||
function clearVideoCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoIDHash; service: Service; userID?: UserID; }): void {
|
||||
if (videoInfo) {
|
||||
redis.delAsync(skipSegmentsKey(videoInfo.videoID, videoInfo.service));
|
||||
redis.delAsync(skipSegmentsHashKey(videoInfo.hashedVideoID, videoInfo.service));
|
||||
|
|
@ -33,4 +33,4 @@ function clearVideoCache(videoInfo: { videoID: VideoID; hashedVideoID: VideoIDHa
|
|||
export const QueryCacher = {
|
||||
get,
|
||||
clearVideoCache
|
||||
}
|
||||
};
|
||||
|
|
@ -12,12 +12,12 @@ interface RedisSB {
|
|||
|
||||
let exportObject: RedisSB = {
|
||||
get: (key, callback?) => callback(null, undefined),
|
||||
getAsync: (key) =>
|
||||
getAsync: () =>
|
||||
new Promise((resolve) => resolve({err: null, reply: undefined})),
|
||||
set: (key, value, callback) => callback(null, undefined),
|
||||
setAsync: (key, value) =>
|
||||
setAsync: () =>
|
||||
new Promise((resolve) => resolve({err: null, reply: undefined})),
|
||||
delAsync: (...keys) =>
|
||||
delAsync: () =>
|
||||
new Promise((resolve) => resolve(null)),
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
import {config} from '../config';
|
||||
import {Logger} from '../utils/logger';
|
||||
import fetch from 'node-fetch';
|
||||
import AbortController from "abort-controller";
|
||||
|
||||
function getVoteAuthorRaw(submissionCount: number, isVIP: boolean, isOwnSubmission: boolean): string {
|
||||
if (isOwnSubmission) {
|
||||
|
|
@ -27,15 +26,15 @@ function getVoteAuthor(submissionCount: number, isVIP: boolean, isOwnSubmission:
|
|||
return "";
|
||||
}
|
||||
|
||||
function dispatchEvent(scope: string, data: any): void {
|
||||
let webhooks = config.webhooks;
|
||||
function dispatchEvent(scope: string, data: Record<string, unknown>): void {
|
||||
const webhooks = config.webhooks;
|
||||
if (webhooks === undefined || webhooks.length === 0) return;
|
||||
Logger.debug("Dispatching webhooks");
|
||||
|
||||
for (const webhook of webhooks) {
|
||||
let webhookURL = webhook.url;
|
||||
let authKey = webhook.key;
|
||||
let scopes = webhook.scopes || [];
|
||||
const webhookURL = webhook.url;
|
||||
const authKey = webhook.key;
|
||||
const scopes = webhook.scopes || [];
|
||||
if (!scopes.includes(scope.toLowerCase())) return;
|
||||
|
||||
fetch(webhookURL, {
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ export class YouTubeAPI {
|
|||
|
||||
if (data) {
|
||||
Logger.debug("YouTube API: cache used for video information: " + videoID);
|
||||
return { err: null, data: JSON.parse(data) }
|
||||
return { err: null, data: JSON.parse(data) };
|
||||
}
|
||||
} catch (err) {
|
||||
return { err }
|
||||
return { err };
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ export class YouTubeAPI {
|
|||
if (result.ok) {
|
||||
const data = await result.json();
|
||||
if (data.error) {
|
||||
Logger.warn("NewLeaf API Error for " + videoID + ": " + data.error)
|
||||
Logger.warn("NewLeaf API Error for " + videoID + ": " + data.error);
|
||||
return { err: data.error, data: null };
|
||||
}
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ export class YouTubeAPI {
|
|||
return { err: result.statusText, data: null };
|
||||
}
|
||||
} catch (err) {
|
||||
return {err, data: null}
|
||||
return {err, data: null};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
import {db, privateDB} from '../../src/databases/databases';
|
||||
import {Done} from '../utils';
|
||||
|
||||
describe('dbUpgrade', () => {
|
||||
it('Should update the database version when starting the application', async () => {
|
||||
let dbVersion = (await db.prepare('get', 'SELECT key, value FROM config where key = ?', ['version'])).value;
|
||||
let privateVersion = (await privateDB.prepare('get', 'SELECT key, value FROM config where key = ?', ['version'])).value;
|
||||
const dbVersion = (await db.prepare('get', 'SELECT key, value FROM config where key = ?', ['version'])).value;
|
||||
const privateVersion = (await privateDB.prepare('get', 'SELECT key, value FROM config where key = ?', ['version'])).value;
|
||||
if (dbVersion >= 1 && privateVersion >= 1) return;
|
||||
else return 'Versions are not at least 1. db is ' + dbVersion + ', private is ' + privateVersion;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ describe('getIsUserVIP', () => {
|
|||
if (res.status !== 200) done("non 200: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("couldn't call endpoint"));
|
||||
.catch(() => done("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ describe('getIsUserVIP', () => {
|
|||
if (res.status !== 400) done("non 400: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("couldn't call endpoint"));
|
||||
.catch(() => done("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should say a VIP is a VIP', (done: Done) => {
|
||||
|
|
@ -37,7 +37,7 @@ describe('getIsUserVIP', () => {
|
|||
else done("Result was non-vip when should have been vip");
|
||||
}
|
||||
})
|
||||
.catch(err => done("couldn't call endpoint"));
|
||||
.catch(() => done("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should say a normal user is not a VIP', (done: Done) => {
|
||||
|
|
@ -50,6 +50,6 @@ describe('getIsUserVIP', () => {
|
|||
else done("Result was vip when should have been non-vip");
|
||||
}
|
||||
})
|
||||
.catch(err => done("couldn't call endpoint"));
|
||||
.catch(() => done("couldn't call endpoint"));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import {getHash} from '../../src/utils/getHash';
|
|||
|
||||
describe('getSavedTimeForUser', () => {
|
||||
before(async () => {
|
||||
let startOfQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden", "hashedVideoID") VALUES';
|
||||
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)]);
|
||||
return;
|
||||
|
|
@ -17,6 +17,6 @@ describe('getSavedTimeForUser', () => {
|
|||
if (res.status !== 200) done("non 200");
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("couldn't call endpoint"));
|
||||
.catch(() => done("couldn't call endpoint"));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ const oldID = `${'0'.repeat(8)}-${'0000-'.repeat(3)}${'0'.repeat(12)}`
|
|||
|
||||
describe('getSegmentInfo', () => {
|
||||
before(async () => {
|
||||
let insertQuery = `INSERT INTO
|
||||
const insertQuery = `INSERT INTO
|
||||
"sponsorTimes"("videoID", "startTime", "endTime", "votes", "locked",
|
||||
"UUID", "userID", "timeSubmitted", "views", "category", "service",
|
||||
"videoDuration", "hidden", "shadowHidden", "hashedVideoID")
|
||||
|
|
@ -53,7 +53,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive downvoted segment', (done: Done) => {
|
||||
|
|
@ -69,7 +69,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive locked up segment', (done: Done) => {
|
||||
|
|
@ -85,7 +85,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive infinite vote segment', (done: Done) => {
|
||||
|
|
@ -101,7 +101,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive shadowhidden segment', (done: Done) => {
|
||||
|
|
@ -117,7 +117,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive locked down segment', (done: Done) => {
|
||||
|
|
@ -133,7 +133,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive hidden segment', (done: Done) => {
|
||||
|
|
@ -149,7 +149,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive segment with old ID', (done: Done) => {
|
||||
|
|
@ -165,7 +165,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive single segment in array', (done: Done) => {
|
||||
|
|
@ -181,7 +181,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to retreive multiple segments in array', (done: Done) => {
|
||||
|
|
@ -199,7 +199,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be possible to send unexpected query parameters', (done: Done) => {
|
||||
|
|
@ -215,7 +215,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should return 400 if array passed to UUID', (done: Done) => {
|
||||
|
|
@ -224,7 +224,7 @@ describe('getSegmentInfo', () => {
|
|||
if (res.status !== 400) done("non 400 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 if bad array passed to UUIDs', (done: Done) => {
|
||||
|
|
@ -233,7 +233,7 @@ describe('getSegmentInfo', () => {
|
|||
if (res.status !== 400) done("non 404 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 if bad UUID passed', (done: Done) => {
|
||||
|
|
@ -242,7 +242,7 @@ describe('getSegmentInfo', () => {
|
|||
if (res.status !== 400) done("non 400 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 if bad UUIDs passed in array', (done: Done) => {
|
||||
|
|
@ -251,7 +251,7 @@ describe('getSegmentInfo', () => {
|
|||
if (res.status !== 400) done("non 400 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return good UUID when mixed with bad UUIDs', (done: Done) => {
|
||||
|
|
@ -267,7 +267,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should cut off array at 10', function(done: Done) {
|
||||
|
|
@ -286,7 +286,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should not duplicate reponses', (done: Done) => {
|
||||
|
|
@ -302,7 +302,7 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 if UUID not found', (done: Done) => {
|
||||
|
|
@ -311,7 +311,7 @@ describe('getSegmentInfo', () => {
|
|||
if (res.status !== 400) done("non 400 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to retreive multiple segments with multiple parameters', (done: Done) => {
|
||||
|
|
@ -329,11 +329,11 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should not parse repeated UUID if UUIDs present', (done: Done) => {
|
||||
fetch(getbaseURL() + `/api/segmentInfo?UUID=${downvotedID}&UUID=${lockedupID}&UUIDs=[\"${upvotedID}\"]`)
|
||||
fetch(getbaseURL() + `/api/segmentInfo?UUID=${downvotedID}&UUID=${lockedupID}&UUIDs=["${upvotedID}"]`)
|
||||
.then(async res => {
|
||||
if (res.status !== 200) done("Status code was: " + res.status);
|
||||
else {
|
||||
|
|
@ -346,6 +346,6 @@ describe('getSegmentInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to get a time by category for a different service 1', (done: Done) => {
|
||||
|
|
@ -52,7 +52,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => "Couldn't call endpoint");
|
||||
.catch(() => "Couldn't call endpoint");
|
||||
});
|
||||
|
||||
it('Should be able to get a time by category 2', (done: Done) => {
|
||||
|
|
@ -69,7 +69,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get a time by categories array', (done: Done) => {
|
||||
|
|
@ -86,7 +86,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get a time by categories array 2', (done: Done) => {
|
||||
|
|
@ -103,7 +103,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 404 if all submissions are hidden', (done: Done) => {
|
||||
|
|
@ -112,7 +112,7 @@ describe('getSkipSegments', () => {
|
|||
if (res.status !== 404) done("non 404 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get multiple times by category', (done: Done) => {
|
||||
|
|
@ -171,7 +171,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be possible to send unexpected query parameters', (done: Done) => {
|
||||
|
|
@ -189,7 +189,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Low voted submissions should be hidden', (done: Done) => {
|
||||
|
|
@ -207,7 +207,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 404 if no segment found', (done: Done) => {
|
||||
|
|
@ -216,7 +216,7 @@ describe('getSkipSegments', () => {
|
|||
if (res.status !== 404) done("non 404 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 if bad categories argument', (done: Done) => {
|
||||
|
|
@ -225,7 +225,7 @@ describe('getSkipSegments', () => {
|
|||
if (res.status !== 400) done("non 400 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able send a comma in a query param', (done: Done) => {
|
||||
|
|
@ -243,7 +243,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should always get locked segment', (done: Done) => {
|
||||
|
|
@ -260,7 +260,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get multiple categories with repeating parameters', (done: Done) => {
|
||||
|
|
@ -290,7 +290,7 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get, categories param overriding repeating category', (done: Done) => {
|
||||
|
|
@ -307,6 +307,6 @@ describe('getSkipSegments', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("Couldn't call endpoint"));
|
||||
.catch(() => ("Couldn't call endpoint"));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ describe('getSegmentsByHash', () => {
|
|||
if (res.status !== 200) done("non 200 status code, was " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 404 if no segments are found even if a video for the given hash is known', (done: Done) => {
|
||||
|
|
@ -42,7 +42,7 @@ describe('getSegmentsByHash', () => {
|
|||
else done("Response had videos");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get an empty array if no videos', (done: Done) => {
|
||||
|
|
@ -55,7 +55,7 @@ describe('getSegmentsByHash', () => {
|
|||
else done("non empty array returned");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get an empty array if only hidden videos', (done: Done) => {
|
||||
|
|
@ -68,7 +68,7 @@ describe('getSegmentsByHash', () => {
|
|||
else done("non empty array returned");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 prefix too short', (done: Done) => {
|
||||
|
|
@ -77,11 +77,11 @@ describe('getSegmentsByHash', () => {
|
|||
if (res.status !== 400) done("non 400 status code, was " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 prefix too long', (done: Done) => {
|
||||
let prefix = new Array(50).join('1');
|
||||
const prefix = new Array(50).join('1');
|
||||
if (prefix.length <= 32) { // default value, config can change this
|
||||
done('failed to generate a long enough string for the test ' + prefix.length);
|
||||
return;
|
||||
|
|
@ -91,7 +91,7 @@ describe('getSegmentsByHash', () => {
|
|||
if (res.status !== 400) done("non 400 status code, was " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should not return 400 prefix in range', (done: Done) => {
|
||||
|
|
@ -100,7 +100,7 @@ describe('getSegmentsByHash', () => {
|
|||
if (res.status === 400) done("prefix length 5 gave 400 " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 404 for no hash', (done: Done) => {
|
||||
|
|
@ -109,7 +109,7 @@ describe('getSegmentsByHash', () => {
|
|||
if (res.status !== 404) done("expected 404, got " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 400 for bad format categories', (done: Done) => {
|
||||
|
|
@ -118,7 +118,7 @@ describe('getSegmentsByHash', () => {
|
|||
if (res.status !== 400) done("expected 400 got " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get multiple videos', (done: Done) => {
|
||||
|
|
@ -133,7 +133,7 @@ describe('getSegmentsByHash', () => {
|
|||
else done();
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get 200 for no categories (default sponsor)', (done: Done) => {
|
||||
|
|
@ -151,7 +151,7 @@ describe('getSegmentsByHash', () => {
|
|||
else done();
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get 200 for no categories (default sponsor) for a non YouTube service', (done: Done) => {
|
||||
|
|
@ -166,7 +166,7 @@ describe('getSegmentsByHash', () => {
|
|||
else done();
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should only return one segment when fetching highlight segments', (done: Done) => {
|
||||
|
|
@ -180,11 +180,11 @@ describe('getSegmentsByHash', () => {
|
|||
else done();
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to post a segment and get it using endpoint', (done: Done) => {
|
||||
let testID = 'abc123goodVideo';
|
||||
const testID = 'abc123goodVideo';
|
||||
fetch(getbaseURL() + "/api/postVideoSponsorTimes", {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
|
|
@ -212,7 +212,7 @@ describe('getSegmentsByHash', () => {
|
|||
else done();
|
||||
}
|
||||
})
|
||||
.catch(err => done("(get) Couldn't call endpoint"));
|
||||
.catch(() => done("(get) Couldn't call endpoint"));
|
||||
} else {
|
||||
done("(post) non 200 status code, was " + res.status);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,11 +23,10 @@ describe('getUserID', () => {
|
|||
it('Should be able to get a 200', (done: Done) => {
|
||||
fetch(getbaseURL() + '/api/userID?username=fuzzy+user+01')
|
||||
.then(async res => {
|
||||
const text = await res.text()
|
||||
if (res.status !== 200) done('non 200 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
it('Should be able to get a 400 (No username parameter)', (done: Done) => {
|
||||
|
|
@ -36,17 +35,16 @@ describe('getUserID', () => {
|
|||
if (res.status !== 400) done('non 400 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
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 => {
|
||||
const text = await res.text()
|
||||
if (res.status !== 200) done('non 200 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
it('Should be able to get a 400 (username longer than 64 chars)', (done: Done) => {
|
||||
|
|
@ -55,7 +53,7 @@ describe('getUserID', () => {
|
|||
if (res.status !== 400) done('non 400 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
it('Should be able to get single username', (done: Done) => {
|
||||
|
|
@ -76,7 +74,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get multiple fuzzy user info from start', (done: Done) => {
|
||||
|
|
@ -101,7 +99,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get multiple fuzzy user info from middle', (done: Done) => {
|
||||
|
|
@ -130,7 +128,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get with public ID', (done: Done) => {
|
||||
|
|
@ -152,7 +150,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get with fuzzy public ID', (done: Done) => {
|
||||
|
|
@ -174,7 +172,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get repeating username', (done: Done) => {
|
||||
|
|
@ -199,7 +197,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get repeating fuzzy username', (done: Done) => {
|
||||
|
|
@ -224,7 +222,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should avoid ReDOS with _', (done: Done) => {
|
||||
|
|
@ -245,7 +243,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should avoid ReDOS with %', (done: Done) => {
|
||||
|
|
@ -266,7 +264,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should return 404 if escaped backslashes present', (done: Done) => {
|
||||
|
|
@ -275,7 +273,7 @@ describe('getUserID', () => {
|
|||
if (res.status !== 404) done('non 404 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should return 404 if backslashes present', (done: Done) => {
|
||||
|
|
@ -284,7 +282,7 @@ describe('getUserID', () => {
|
|||
if (res.status !== 404) done('non 404 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should return user if just backslashes', (done: Done) => {
|
||||
|
|
@ -305,7 +303,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should not allow usernames more than 64 characters', (done: Done) => {
|
||||
|
|
@ -314,7 +312,7 @@ describe('getUserID', () => {
|
|||
if (res.status !== 400) done('non 400 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should not allow usernames less than 3 characters', (done: Done) => {
|
||||
|
|
@ -323,7 +321,7 @@ describe('getUserID', () => {
|
|||
if (res.status !== 400) done('non 400 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('should allow exact match', (done: Done) => {
|
||||
|
|
@ -344,7 +342,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get repeating username with exact username', (done: Done) => {
|
||||
|
|
@ -369,7 +367,7 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should not get exact unless explicitly set to true', (done: Done) => {
|
||||
|
|
@ -398,6 +396,6 @@ describe('getUserID', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ describe('getUserInfo', () => {
|
|||
if (res.status !== 200) done('non 200 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
it('Should be able to get a 400 (No userID parameter)', (done: Done) => {
|
||||
|
|
@ -39,7 +39,7 @@ describe('getUserInfo', () => {
|
|||
if (res.status !== 400) done('non 400 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
it('Should be able to get user info', (done: Done) => {
|
||||
|
|
@ -70,7 +70,7 @@ describe('getUserInfo', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should get warning data', (done: Done) => {
|
||||
|
|
@ -79,12 +79,12 @@ describe('getUserInfo', () => {
|
|||
if (res.status !== 200) {
|
||||
done('non 200 (' + res.status + ')');
|
||||
} else {
|
||||
const data = await res.json();;
|
||||
const data = await res.json();
|
||||
if (data.warnings !== 1) done('wrong number of warnings: ' + data.warnings + ', not ' + 1);
|
||||
else done(); // pass
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should get warning data with public ID', (done: Done) => {
|
||||
|
|
@ -98,7 +98,7 @@ describe('getUserInfo', () => {
|
|||
else done();
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should get multiple warnings', (done: Done) => {
|
||||
|
|
@ -112,7 +112,7 @@ describe('getUserInfo', () => {
|
|||
else done(); // pass
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should not get warnings if none', (done: Done) => {
|
||||
|
|
@ -126,7 +126,7 @@ describe('getUserInfo', () => {
|
|||
else done(); // pass
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should done(userID for userName (No userName set)', (done: Done) => {
|
||||
|
|
@ -142,7 +142,7 @@ describe('getUserInfo', () => {
|
|||
done(); // pass
|
||||
}
|
||||
})
|
||||
.catch(err => ('couldn\'t call endpoint'));
|
||||
.catch(() => ('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
it('Should return null segment if none', (done: Done) => {
|
||||
|
|
@ -156,20 +156,20 @@ describe('getUserInfo', () => {
|
|||
else done(); // pass
|
||||
}
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return zeroes if userid does not exist', (done: Done) => {
|
||||
fetch(getbaseURL() + '/api/userInfo?userID=getuserinfo_null')
|
||||
.then(async res => {
|
||||
const data = await res.json();
|
||||
for (var value in data) {
|
||||
for (const value in data) {
|
||||
if (data[value] === null && value !== "lastSegmentID") {
|
||||
done(`returned null for ${value}`)
|
||||
}
|
||||
}
|
||||
done(); // pass
|
||||
})
|
||||
.catch(err => ("couldn't call endpoint"));
|
||||
.catch(() => ("couldn't call endpoint"));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should update the database version when starting the application', async () => {
|
||||
let version = (await db.prepare('get', 'SELECT key, value FROM config where key = ?', ['version'])).value;
|
||||
const version = (await db.prepare('get', 'SELECT key, value FROM config where key = ?', ['version'])).value;
|
||||
if (version > 1) return;
|
||||
else return 'Version isn\'t greater than 1. Version is ' + version;
|
||||
});
|
||||
|
||||
it('Should be able to submit categories not in video (http response)', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'no-segments-video-id',
|
||||
userID: 'VIPUser-lockCategories',
|
||||
categories: [
|
||||
|
|
@ -43,7 +43,7 @@ describe('lockCategoriesRecords', () => {
|
|||
],
|
||||
};
|
||||
|
||||
let expected = {
|
||||
const expected = {
|
||||
submitted: [
|
||||
'outro',
|
||||
'shilling',
|
||||
|
|
@ -66,7 +66,6 @@ describe('lockCategoriesRecords', () => {
|
|||
done("Incorrect response: expected " + JSON.stringify(expected) + " got " + JSON.stringify(data));
|
||||
}
|
||||
} else {
|
||||
const body = await res.text();
|
||||
done("Status code was " + res.status);
|
||||
}
|
||||
})
|
||||
|
|
@ -74,7 +73,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should be able to submit categories not in video (sql check)', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'no-segments-video-id-1',
|
||||
userID: 'VIPUser-lockCategories',
|
||||
categories: [
|
||||
|
|
@ -96,14 +95,13 @@ describe('lockCategoriesRecords', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['no-segments-video-id-1']);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['no-segments-video-id-1']);
|
||||
if (result.length !== 4) {
|
||||
done("Expected 4 entrys in db, got " + result.length);
|
||||
} else {
|
||||
done();
|
||||
}
|
||||
} else {
|
||||
const body = await res.text();
|
||||
done("Status code was " + res.status);
|
||||
}
|
||||
})
|
||||
|
|
@ -111,7 +109,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should be able to submit categories with _ in the category', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'underscore',
|
||||
userID: 'VIPUser-lockCategories',
|
||||
categories: [
|
||||
|
|
@ -128,14 +126,13 @@ describe('lockCategoriesRecords', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['underscore']);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['underscore']);
|
||||
if (result.length !== 1) {
|
||||
done("Expected 1 entrys in db, got " + result.length);
|
||||
} else {
|
||||
done();
|
||||
}
|
||||
} else {
|
||||
const body = await res.text();
|
||||
done("Status code was " + res.status);
|
||||
}
|
||||
})
|
||||
|
|
@ -143,7 +140,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should be able to submit categories with upper and lower case in the category', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'bothCases',
|
||||
userID: 'VIPUser-lockCategories',
|
||||
categories: [
|
||||
|
|
@ -160,14 +157,13 @@ describe('lockCategoriesRecords', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['bothCases']);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['bothCases']);
|
||||
if (result.length !== 1) {
|
||||
done("Expected 1 entrys in db, got " + result.length);
|
||||
} else {
|
||||
done();
|
||||
}
|
||||
} else {
|
||||
const body = await res.text();
|
||||
done("Status code was " + res.status);
|
||||
}
|
||||
})
|
||||
|
|
@ -175,7 +171,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should not be able to submit categories with $ in the category', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'specialChar',
|
||||
userID: 'VIPUser-lockCategories',
|
||||
categories: [
|
||||
|
|
@ -192,14 +188,13 @@ describe('lockCategoriesRecords', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['specialChar']);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['specialChar']);
|
||||
if (result.length !== 0) {
|
||||
done("Expected 0 entrys in db, got " + result.length);
|
||||
} else {
|
||||
done();
|
||||
}
|
||||
} else {
|
||||
const body = await res.text();
|
||||
done("Status code was " + res.status);
|
||||
}
|
||||
})
|
||||
|
|
@ -225,7 +220,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should return 400 for no categories', (done: Done) => {
|
||||
let json: any = {
|
||||
const json: any = {
|
||||
videoID: 'test',
|
||||
userID: 'test',
|
||||
categories: [],
|
||||
|
|
@ -249,7 +244,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should return 400 for no userID', (done: Done) => {
|
||||
let json: any = {
|
||||
const json: any = {
|
||||
videoID: 'test',
|
||||
userID: null,
|
||||
categories: ['sponsor'],
|
||||
|
|
@ -273,7 +268,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should return 400 for no videoID', (done: Done) => {
|
||||
let json: any = {
|
||||
const json: any = {
|
||||
videoID: null,
|
||||
userID: 'test',
|
||||
categories: ['sponsor'],
|
||||
|
|
@ -297,7 +292,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should return 400 object categories', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'test',
|
||||
userID: 'test',
|
||||
categories: {},
|
||||
|
|
@ -321,7 +316,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should return 400 bad format categories', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'test',
|
||||
userID: 'test',
|
||||
categories: 'sponsor',
|
||||
|
|
@ -345,7 +340,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should return 403 if user is not VIP', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'test',
|
||||
userID: 'test',
|
||||
categories: [
|
||||
|
|
@ -371,7 +366,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should be able to delete a lockCategories record', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'delete-record',
|
||||
userID: 'VIPUser-lockCategories',
|
||||
categories: [
|
||||
|
|
@ -388,7 +383,7 @@ describe('lockCategoriesRecords', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record']);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record']);
|
||||
if (result.length === 0) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -402,7 +397,7 @@ describe('lockCategoriesRecords', () => {
|
|||
});
|
||||
|
||||
it('Should be able to delete one lockCategories record without removing another', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
videoID: 'delete-record-1',
|
||||
userID: 'VIPUser-lockCategories',
|
||||
categories: [
|
||||
|
|
@ -419,7 +414,7 @@ describe('lockCategoriesRecords', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record-1']);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "lockCategories" WHERE "videoID" = ?', ['delete-record-1']);
|
||||
if (result.length === 1) {
|
||||
done();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ describe('getVideoSponsorTime (Old get method)', () => {
|
|||
if (res.status !== 200) done("non 200 (" + res.status + ")");
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should return 404 if no segment found', (done: Done) => {
|
||||
|
|
@ -25,7 +25,7 @@ describe('getVideoSponsorTime (Old get method)', () => {
|
|||
if (res.status !== 404) done("non 404 respone code: " + res.status);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("couldn't call endpoint"));
|
||||
.catch(() => done("couldn't call endpoint"));
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -35,7 +35,7 @@ describe('getVideoSponsorTime (Old get method)', () => {
|
|||
if (res.status !== 200) done("non 200");
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done("couldn't callendpoint"));
|
||||
.catch(() => done("couldn't callendpoint"));
|
||||
});
|
||||
|
||||
it('Should be able send a comma in a query param', (done: Done) => {
|
||||
|
|
@ -46,7 +46,7 @@ describe('getVideoSponsorTime (Old get method)', () => {
|
|||
else if (JSON.parse(body).UUIDs[0] === 'uuid-1') done(); // pass
|
||||
else done("couldn't parse response");
|
||||
})
|
||||
.catch(err => done("couln't call endpoint"));
|
||||
.catch(() => done("couln't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to get the correct time', (done: Done) => {
|
||||
|
|
@ -65,6 +65,6 @@ describe('getVideoSponsorTime (Old get method)', () => {
|
|||
}
|
||||
|
||||
})
|
||||
.catch(err => done("couldn't call endpoint"));
|
||||
.catch(() => done("couldn't call endpoint"));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ describe('postVideoSponsorTime (Old submission method)', () => {
|
|||
+ "/api/postVideoSponsorTimes?videoID=dQw4w9WgXcQ&startTime=1&endTime=10&userID=test")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let 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" = ?`, ["dQw4w9WgXcQ"]);
|
||||
if (row.startTime === 1 && row.endTime === 10 && row.category === "sponsor") {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -32,7 +32,7 @@ describe('postVideoSponsorTime (Old submission method)', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let 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" = ?`, ["dQw4w9WgXcE"]);
|
||||
if (row.startTime === 1 && row.endTime === 11 && row.category === "sponsor") {
|
||||
done();
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import {getHash} from '../../src/utils/getHash';
|
|||
describe('postClearCache', () => {
|
||||
before(async () => {
|
||||
await db.prepare("run", `INSERT INTO "vipUsers" ("userID") VALUES ('` + getHash("clearing-vip") + "')");
|
||||
let startOfQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "UUID", "userID", "timeSubmitted", views, category, "shadowHidden", "hashedVideoID") VALUES';
|
||||
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) + "')");
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ async function dbSponsorTimesAdd(db: IDatabase, videoID: string, startTime: numb
|
|||
}
|
||||
|
||||
async function dbSponsorTimesCompareExpect(db: IDatabase, videoId: string, expectdHidden: number) {
|
||||
let seg = await db.prepare('get', `SELECT "hidden", "UUID" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoId]);
|
||||
const seg = await db.prepare('get', `SELECT "hidden", "UUID" FROM "sponsorTimes" WHERE "videoID" = ?`, [videoId]);
|
||||
for (let i = 0, len = seg.length; i < len; i++) {
|
||||
if (seg.hidden !== expectdHidden) {
|
||||
return `${seg.UUID} hidden expected to be ${expectdHidden} but found ${seg.hidden}`;
|
||||
|
|
|
|||
|
|
@ -249,7 +249,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 403 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to submit a single time under a different service (JSON method)', (done: Done) => {
|
||||
|
|
@ -512,7 +512,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 200 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be rejected if segment starts and ends at the same time', (done: Done) => {
|
||||
|
|
@ -527,7 +527,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 400 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be accepted if highlight segment starts and ends at the same time', (done: Done) => {
|
||||
|
|
@ -542,7 +542,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 200 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be rejected if highlight segment doesn\'t start and end at the same time', (done: Done) => {
|
||||
|
|
@ -557,7 +557,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 400 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be rejected if a sponsor is less than 1 second', (done: Done) => {
|
||||
|
|
@ -572,7 +572,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 403 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be rejected if over 80% of the video', (done: Done) => {
|
||||
|
|
@ -585,7 +585,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 403 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it("Should be rejected if NB's predicted probability is <70%.", (done: Done) => {
|
||||
|
|
@ -598,7 +598,7 @@ describe('postSkipSegments', () => {
|
|||
done("non 200 status code: " + res.status + " (" + body + ")");
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be rejected if user has to many active warnings', (done: Done) => {
|
||||
|
|
@ -690,7 +690,7 @@ describe('postSkipSegments', () => {
|
|||
if (res.status === 400) done();
|
||||
else done(true);
|
||||
})
|
||||
.catch(err => done(true));
|
||||
.catch(() => done(true));
|
||||
});
|
||||
|
||||
it('Should return 400 for missing params (JSON method) 1', (done: Done) => {
|
||||
|
|
@ -715,7 +715,7 @@ describe('postSkipSegments', () => {
|
|||
if (res.status === 400) done();
|
||||
else done(true);
|
||||
})
|
||||
.catch(err => done(true));
|
||||
.catch(() => done(true));
|
||||
});
|
||||
it('Should return 400 for missing params (JSON method) 2', (done: Done) => {
|
||||
fetch(getbaseURL()
|
||||
|
|
@ -733,7 +733,7 @@ describe('postSkipSegments', () => {
|
|||
if (res.status === 400) done();
|
||||
else done(true);
|
||||
})
|
||||
.catch(err => done(true));
|
||||
.catch(() => done(true));
|
||||
});
|
||||
it('Should return 400 for missing params (JSON method) 3', (done: Done) => {
|
||||
fetch(getbaseURL()
|
||||
|
|
@ -758,7 +758,7 @@ describe('postSkipSegments', () => {
|
|||
if (res.status === 400) done();
|
||||
else done(true);
|
||||
})
|
||||
.catch(err => done(true));
|
||||
.catch(() => done(true));
|
||||
});
|
||||
it('Should return 400 for missing params (JSON method) 4', (done: Done) => {
|
||||
fetch(getbaseURL()
|
||||
|
|
@ -782,7 +782,7 @@ describe('postSkipSegments', () => {
|
|||
if (res.status === 400) done();
|
||||
else done(true);
|
||||
})
|
||||
.catch(err => done(true));
|
||||
.catch(() => done(true));
|
||||
});
|
||||
it('Should return 400 for missing params (JSON method) 5', (done: Done) => {
|
||||
fetch(getbaseURL()
|
||||
|
|
@ -800,6 +800,6 @@ describe('postSkipSegments', () => {
|
|||
if (res.status === 400) done();
|
||||
else done(true);
|
||||
})
|
||||
.catch(err => done(true));
|
||||
.catch(() => done(true));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ describe('postWarning', () => {
|
|||
});
|
||||
|
||||
it('Should be able to create warning if vip (exp 200)', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
issuerUserID: 'warning-vip',
|
||||
userID: 'warning-0',
|
||||
reason: 'warning-reason-0'
|
||||
|
|
@ -24,7 +24,7 @@ describe('postWarning', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled, "reason" FROM warnings WHERE "userID" = ?`, [json.userID]);
|
||||
const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled, "reason" FROM warnings WHERE "userID" = ?`, [json.userID]);
|
||||
if (row?.enabled == 1 && row?.issuerUserID == getHash(json.issuerUserID) && row?.reason === json.reason) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -40,7 +40,7 @@ describe('postWarning', () => {
|
|||
});
|
||||
|
||||
it('Should be not be able to create a duplicate warning if vip', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
issuerUserID: 'warning-vip',
|
||||
userID: 'warning-0',
|
||||
};
|
||||
|
|
@ -55,7 +55,7 @@ describe('postWarning', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 409) {
|
||||
let row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]);
|
||||
const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]);
|
||||
if (row?.enabled == 1 && row?.issuerUserID == getHash(json.issuerUserID)) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -71,7 +71,7 @@ describe('postWarning', () => {
|
|||
});
|
||||
|
||||
it('Should be able to remove warning if vip', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
issuerUserID: 'warning-vip',
|
||||
userID: 'warning-0',
|
||||
enabled: false
|
||||
|
|
@ -87,7 +87,7 @@ describe('postWarning', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]);
|
||||
const row = await db.prepare('get', `SELECT "userID", "issueTime", "issuerUserID", enabled FROM warnings WHERE "userID" = ?`, [json.userID]);
|
||||
if (row?.enabled == 0) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -103,7 +103,7 @@ describe('postWarning', () => {
|
|||
});
|
||||
|
||||
it('Should not be able to create warning if not vip (exp 403)', (done: Done) => {
|
||||
let json = {
|
||||
const json = {
|
||||
issuerUserID: 'warning-not-vip',
|
||||
userID: 'warning-1',
|
||||
};
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ describe('reputation', () => {
|
|||
this.timeout(5000); // this preparation takes longer then usual
|
||||
const videoID = "reputation-videoID";
|
||||
|
||||
let sponsorTimesInsertQuery = 'INSERT INTO "sponsorTimes" ("videoID", "startTime", "endTime", "votes", "locked", "UUID", "userID", "timeSubmitted", "views", "category", "service", "videoDuration", "hidden", "shadowHidden", "hashedVideoID") VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)';
|
||||
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)]);
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ async function dbSponsorTimesSetByUUID(db: IDatabase, UUID: string, startTime: n
|
|||
async function dbSponsorTimesCompareExpect(db: IDatabase, expect: any) {
|
||||
for (let i = 0, len = expect.length; i < len; i++) {
|
||||
const expectSeg = expect[i];
|
||||
let seg = await db.prepare('get', `SELECT "startTime", "endTime" FROM "sponsorTimes" WHERE "UUID" = ?`, [expectSeg.UUID]);
|
||||
const seg = await db.prepare('get', `SELECT "startTime", "endTime" FROM "sponsorTimes" WHERE "UUID" = ?`, [expectSeg.UUID]);
|
||||
if ('removed' in expect) {
|
||||
if (expect.removed === true && seg.votes === -2) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ async function getUsernameInfo(userID: string): Promise<{ userName: string, lock
|
|||
return row;
|
||||
}
|
||||
|
||||
async function addLogUserNameChange(userID: string, newUserName: string, oldUserName: string = '') {
|
||||
async 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]
|
||||
|
|
@ -90,7 +90,7 @@ describe('setUsername', () => {
|
|||
if (usernameInfo.locked == "1") done(`Username was locked when it shouldn't have been`);
|
||||
done();
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should return 200', (done: Done) => {
|
||||
|
|
@ -103,7 +103,7 @@ describe('setUsername', () => {
|
|||
testUserNameChangelog(user01PrivateUserID, decodeURIComponent('Changed%20Username'), username01, false, done);
|
||||
}
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should return 400 for missing param "userID"', (done: Done) => {
|
||||
|
|
@ -114,7 +114,7 @@ describe('setUsername', () => {
|
|||
if (res.status !== 400) done(`Status code was ${res.status}`);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should return 400 for missing param "username"', (done: Done) => {
|
||||
|
|
@ -125,7 +125,7 @@ describe('setUsername', () => {
|
|||
if (res.status !== 400) done(`Status code was ${res.status}`);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should return 400 for "username" longer then 64 characters', (done: Done) => {
|
||||
|
|
@ -137,7 +137,7 @@ describe('setUsername', () => {
|
|||
if (res.status !== 400) done(`Status code was ${res.status}`);
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should not change username if it contains "discord"', (done: Done) => {
|
||||
|
|
@ -155,7 +155,7 @@ describe('setUsername', () => {
|
|||
else done();
|
||||
}
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should be able to change username', (done: Done) => {
|
||||
|
|
@ -163,13 +163,13 @@ describe('setUsername', () => {
|
|||
fetch(`${getbaseURL()}/api/setUsername?userID=${user03PrivateUserID}&username=${encodeURIComponent(newUsername)}`, {
|
||||
method: 'POST',
|
||||
})
|
||||
.then(async res => {
|
||||
.then(async () => {
|
||||
const usernameInfo = await getUsernameInfo(getHash(user03PrivateUserID));
|
||||
if (usernameInfo.userName !== newUsername) done(`Username did not change`);
|
||||
if (usernameInfo.locked == "1") done(`Username was locked when it shouldn't have been`);
|
||||
testUserNameChangelog(user03PrivateUserID, newUsername, username03, false, done);
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should not be able to change locked username', (done: Done) => {
|
||||
|
|
@ -177,13 +177,13 @@ describe('setUsername', () => {
|
|||
fetch(`${getbaseURL()}/api/setUsername?userID=${user04PrivateUserID}&username=${encodeURIComponent(newUsername)}`, {
|
||||
method: 'POST',
|
||||
})
|
||||
.then(async res => {
|
||||
.then(async () => {
|
||||
const usernameInfo = await getUsernameInfo(getHash(user04PrivateUserID));
|
||||
if (usernameInfo.userName === newUsername) done(`Username '${username04}' got changed to '${usernameInfo}'`);
|
||||
if (usernameInfo.locked == "0") done(`Username was unlocked when it shouldn't have been`);
|
||||
else done();
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Should filter out unicode control characters', (done: Done) => {
|
||||
|
|
@ -191,12 +191,12 @@ describe('setUsername', () => {
|
|||
fetch(`${getbaseURL()}/api/setUsername?userID=${user05PrivateUserID}&username=${encodeURIComponent(newUsername)}`, {
|
||||
method: 'POST',
|
||||
})
|
||||
.then(async res => {
|
||||
.then(async () => {
|
||||
const usernameInfo = await getUsernameInfo(getHash(user05PrivateUserID));
|
||||
if (usernameInfo.userName === newUsername) done(`Username contains unicode control characters`);
|
||||
testUserNameChangelog(user05PrivateUserID, wellFormatUserName(newUsername), username05, false, done);
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Incorrect adminUserID should return 403', (done: Done) => {
|
||||
|
|
@ -208,7 +208,7 @@ describe('setUsername', () => {
|
|||
if (res.status !== 403) done(`Status code was ${res.status}`);
|
||||
else done();
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Admin should be able to change username', (done: Done) => {
|
||||
|
|
@ -216,13 +216,13 @@ describe('setUsername', () => {
|
|||
fetch(`${getbaseURL()}/api/setUsername?adminUserID=${adminPrivateUserID}&userID=${getHash(user06PrivateUserID)}&username=${encodeURIComponent(newUsername)}`, {
|
||||
method: 'POST',
|
||||
})
|
||||
.then(async res => {
|
||||
.then(async () => {
|
||||
const usernameInfo = await getUsernameInfo(getHash(user06PrivateUserID));
|
||||
if (usernameInfo.userName !== newUsername) done(`Failed to change username from '${username06}' to '${newUsername}'`);
|
||||
if (usernameInfo.locked == "0") done(`Username was not locked`);
|
||||
else testUserNameChangelog(user06PrivateUserID, newUsername, username06, true, done);
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
|
||||
it('Admin should be able to change locked username', (done: Done) => {
|
||||
|
|
@ -230,12 +230,12 @@ describe('setUsername', () => {
|
|||
fetch(`${getbaseURL()}/api/setUsername?adminUserID=${adminPrivateUserID}&userID=${getHash(user07PrivateUserID)}&username=${encodeURIComponent(newUsername)}`, {
|
||||
method: 'POST',
|
||||
})
|
||||
.then(async res => {
|
||||
.then(async () => {
|
||||
const usernameInfo = await getUsernameInfo(getHash(user06PrivateUserID));
|
||||
if (usernameInfo.userName !== newUsername) done(`Failed to change username from '${username06}' to '${newUsername}'`);
|
||||
if (usernameInfo.locked == "0") done(`Username was unlocked when it shouldn't have been`);
|
||||
else testUserNameChangelog(user07PrivateUserID, newUsername, username07, true, done);
|
||||
})
|
||||
.catch(err => done(`couldn't call endpoint`));
|
||||
.catch(() => done(`couldn't call endpoint`));
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ describe('shadowBanUser', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to unban user without unhiding submissions', (done: Done) => {
|
||||
|
|
@ -60,7 +60,7 @@ describe('shadowBanUser', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to ban user and hide submissions from only some categories', (done: Done) => {
|
||||
|
|
@ -80,7 +80,7 @@ describe('shadowBanUser', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to unban user and unhide submissions', (done: Done) => {
|
||||
|
|
@ -100,7 +100,7 @@ describe('shadowBanUser', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
it('Should be able to unban user and unhide some submissions', (done: Done) => {
|
||||
|
|
@ -120,7 +120,7 @@ describe('shadowBanUser', () => {
|
|||
}
|
||||
}
|
||||
})
|
||||
.catch(err => done("Couldn't call endpoint"));
|
||||
.catch(() => done("Couldn't call endpoint"));
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ describe('unBan', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-0', 'testMan-unBan', 1]);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-0', 'testMan-unBan', 1]);
|
||||
if (result.length !== 0) {
|
||||
console.log(result);
|
||||
done("Expected 0 banned entrys in db, got " + result.length);
|
||||
|
|
@ -57,7 +57,7 @@ describe('unBan', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-1', 'testWoman-unBan', 1]);
|
||||
const result = await db.prepare('all', 'SELECT * FROM "sponsorTimes" WHERE "videoID" = ? AND "userID" = ? AND "shadowHidden" = ?', ['unBan-videoID-1', 'testWoman-unBan', 1]);
|
||||
if (result.length !== 1) {
|
||||
console.log(result);
|
||||
done("Expected 1 banned entry1 in db, got " + result.length);
|
||||
|
|
@ -82,7 +82,7 @@ describe('unBan', () => {
|
|||
})
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let 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" = ?', ['testEntity-unBan', 1]);
|
||||
if (result.length !== 1) {
|
||||
console.log(result);
|
||||
done("Expected 1 banned entry1 in db, got " + result.length);
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID&UUID=vote-uuid-0&type=1")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-0"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-0"]);
|
||||
if (row.votes === 3) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -85,7 +85,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-2&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
|
||||
if (row.votes < 10) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -103,7 +103,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID3&UUID=vote-uuid-2&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
|
||||
if (row.votes === 9) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -121,7 +121,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID4&UUID=vote-uuid-1.6&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.6"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.6"]);
|
||||
if (row.votes === 10) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -139,7 +139,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=hasNotSubmittedID&UUID=vote-uuid-1&type=1")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1"]);
|
||||
if (row.votes === 2) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -157,7 +157,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=hasNotSubmittedID&UUID=vote-uuid-1.5&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.5"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-1.5"]);
|
||||
if (row.votes === 10) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -175,7 +175,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-3&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-3"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-3"]);
|
||||
if (row.votes <= -2) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -193,7 +193,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=own-submission-id&UUID=own-submission-uuid&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["own-submission-uuid"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["own-submission-uuid"]);
|
||||
if (row.votes <= -2) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -211,7 +211,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=not-own-submission-uuid&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["not-own-submission-uuid"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["not-own-submission-uuid"]);
|
||||
if (row.votes === 499) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -229,8 +229,8 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-4&category=intro")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
|
||||
let categoryRows = await db.prepare('all', `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
|
||||
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"]);
|
||||
if (row.category === "sponsor" && categoryRows.length === 2
|
||||
&& categoryRows[0]?.votes === 1 && categoryRows[0]?.category === "intro"
|
||||
&& categoryRows[1]?.votes === 1 && categoryRows[1]?.category === "sponsor") {
|
||||
|
|
@ -250,7 +250,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category&category=fakecategory")
|
||||
.then(async res => {
|
||||
if (res.status === 400) {
|
||||
let row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]);
|
||||
const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]);
|
||||
if (row.category === "sponsor") {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -268,7 +268,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category&category=highlight")
|
||||
.then(async res => {
|
||||
if (res.status === 400) {
|
||||
let row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]);
|
||||
const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category"]);
|
||||
if (row.category === "sponsor") {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -286,8 +286,8 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-4&category=outro")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let submissionRow = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
|
||||
let categoryRows = await db.prepare('all', `SELECT votes, category FROM "categoryVotes" WHERE "UUID" = ?`, ["vote-uuid-4"]);
|
||||
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;
|
||||
|
|
@ -315,8 +315,8 @@ describe('voteOnSponsorTime', () => {
|
|||
const vote = (inputCat: string, assertCat: string, callback: Done) => {
|
||||
fetch(getbaseURL()
|
||||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=incorrect-category-change&category=" + inputCat)
|
||||
.then(async res => {
|
||||
let row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category-change"]);
|
||||
.then(async () => {
|
||||
const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["incorrect-category-change"]);
|
||||
if (row.category === assertCat) {
|
||||
callback();
|
||||
} else {
|
||||
|
|
@ -336,8 +336,8 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-5&category=outro")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
let row2 = await db.prepare('get', `SELECT votes FROM "categoryVotes" WHERE "UUID" = ? and category = ?`, ["vote-uuid-5", "outro"]);
|
||||
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"]);
|
||||
if (row.category === "outro" && row2.votes === 500) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -355,7 +355,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=testman&UUID=vote-uuid-5_1&category=outro")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
if (row.category === "outro") {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -385,7 +385,7 @@ describe('voteOnSponsorTime', () => {
|
|||
fetch(getbaseURL()
|
||||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-5&type=1")
|
||||
.then(async res => {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
if (res.status === 403 && row.votes === -3) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -399,7 +399,7 @@ describe('voteOnSponsorTime', () => {
|
|||
fetch(getbaseURL()
|
||||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-5&type=0")
|
||||
.then(async res => {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
if (res.status === 200 && row.votes === -3) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -414,7 +414,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=VIPUser&UUID=vote-uuid-5&type=1")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-5"]);
|
||||
if (row.votes > -3) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -444,7 +444,7 @@ describe('voteOnSponsorTime', () => {
|
|||
fetch(getbaseURL()
|
||||
+ "/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&type=0")
|
||||
.then(async res => {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
|
||||
if (res.status === 200 && row.votes === 2) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -458,7 +458,7 @@ describe('voteOnSponsorTime', () => {
|
|||
fetch(getbaseURL()
|
||||
+ "/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&type=1")
|
||||
.then(async res => {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
|
||||
if (res.status === 200 && row.votes === 3) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -472,7 +472,7 @@ describe('voteOnSponsorTime', () => {
|
|||
fetch(getbaseURL()
|
||||
+ "/api/voteOnSponsorTime?userID=randomID&UUID=no-sponsor-segments-uuid-0&category=outro")
|
||||
.then(async res => {
|
||||
let row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
|
||||
const row = await db.prepare('get', `SELECT "category" FROM "sponsorTimes" WHERE "UUID" = ?`, ["no-sponsor-segments-uuid-0"]);
|
||||
if (res.status === 200 && row.category === "sponsor") {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -487,7 +487,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=1")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]);
|
||||
const row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]);
|
||||
if (row?.locked) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -505,7 +505,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-locking-uuid-1&type=0")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]);
|
||||
const row = await db.prepare('get', `SELECT "locked" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-locking-uuid-1"]);
|
||||
if (!row?.locked) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -523,7 +523,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=VIPUser&UUID=segment-hidden-uuid-1&type=1")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "hidden" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-hidden-uuid-1"]);
|
||||
const row = await db.prepare('get', `SELECT "hidden" FROM "sponsorTimes" WHERE "UUID" = ?`, ["segment-hidden-uuid-1"]);
|
||||
if (!row?.hidden) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -541,7 +541,7 @@ describe('voteOnSponsorTime', () => {
|
|||
+ "/api/voteOnSponsorTime?userID=randomID2&UUID=vote-uuid-2&type=20")
|
||||
.then(async res => {
|
||||
if (res.status === 200) {
|
||||
let row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
|
||||
const row = await db.prepare('get', `SELECT "votes" FROM "sponsorTimes" WHERE "UUID" = ?`, ["vote-uuid-2"]);
|
||||
if (row.votes === 10) {
|
||||
done();
|
||||
} else {
|
||||
|
|
@ -560,7 +560,7 @@ describe('voteOnSponsorTime', () => {
|
|||
if (res.status !== 400) done('non 400 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
it('Should not be able to vote with type 11', (done: Done) => {
|
||||
|
|
@ -569,7 +569,7 @@ describe('voteOnSponsorTime', () => {
|
|||
if (res.status !== 400) done('non 400 (' + res.status + ')');
|
||||
else done(); // pass
|
||||
})
|
||||
.catch(err => done('couldn\'t call endpoint'));
|
||||
.catch(() => done('couldn\'t call endpoint'));
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import {config} from '../src/config';
|
||||
|
||||
export function getbaseURL() {
|
||||
export function getbaseURL(): string {
|
||||
return "http://localhost:" + config.port;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import { APIVideoData, APIVideoInfo } from "../src/types/youtubeApi.model";
|
||||
|
||||
export class YouTubeApiMock {
|
||||
static async listVideos(videoID: string, ignoreCache = false): Promise<APIVideoInfo> {
|
||||
static async listVideos(videoID: string): Promise<APIVideoInfo> {
|
||||
const obj = {
|
||||
id: videoID
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue