diff --git a/src/cronjob/downvoteSegmentArchiveJob.ts b/src/cronjob/downvoteSegmentArchiveJob.ts index 5ff2282..aba645f 100644 --- a/src/cronjob/downvoteSegmentArchiveJob.ts +++ b/src/cronjob/downvoteSegmentArchiveJob.ts @@ -3,7 +3,6 @@ import { CronJob } from "cron"; import { config as serverConfig } from "../config"; import { Logger } from "../utils/logger"; import { db } from "../databases/databases"; -import { DBSegment } from "../types/segments.model"; const jobConfig = serverConfig?.crons?.downvoteSegmentArchive; @@ -14,18 +13,18 @@ export const archiveDownvoteSegment = async (dayLimit: number, voteLimit: number Logger.info(`DownvoteSegmentArchiveJob starts at ${timeNow}`); try { // insert into archive sponsorTime - await db.prepare( - "run", - `INSERT INTO "archivedSponsorTimes" - SELECT * - FROM "sponsorTimes" - WHERE "votes" < ? AND (? - "timeSubmitted") > ?`, - [ - voteLimit, - timeNow, - threshold - ] - ) as DBSegment[]; + await db.prepare( + "run", + `INSERT INTO "archivedSponsorTimes" + SELECT * + FROM "sponsorTimes" + WHERE "votes" < ? AND (? - "timeSubmitted") > ?`, + [ + voteLimit, + timeNow, + threshold + ] + ); } catch (err) { Logger.error("Execption when insert segment in archivedSponsorTimes"); @@ -35,15 +34,15 @@ export const archiveDownvoteSegment = async (dayLimit: number, voteLimit: number // remove from sponsorTime try { - await db.prepare( - "run", - 'DELETE FROM "sponsorTimes" WHERE "votes" < ? AND (? - "timeSubmitted") > ?', - [ - voteLimit, - timeNow, - threshold - ] - ) as DBSegment[]; + await db.prepare( + "run", + 'DELETE FROM "sponsorTimes" WHERE "votes" < ? AND (? - "timeSubmitted") > ?', + [ + voteLimit, + timeNow, + threshold + ] + ); } catch (err) { Logger.error("Execption when deleting segment in sponsorTimes"); diff --git a/src/databases/IDatabase.ts b/src/databases/IDatabase.ts index 5aaceda..6072916 100644 --- a/src/databases/IDatabase.ts +++ b/src/databases/IDatabase.ts @@ -6,11 +6,14 @@ export interface QueryOption { export interface IDatabase { init(): Promise; - prepare(type: QueryType, query: string, params?: any[], options?: QueryOption): Promise; + prepare(type: "run", query: string, params?: any[], options?: QueryOption): Promise; + prepare(type: "get", query: string, params?: any[], options?: QueryOption): Promise; + prepare(type: "all", query: string, params?: any[], options?: QueryOption): Promise; + prepare(type: QueryType, query: string, params?: any[], options?: QueryOption): Promise; highLoad(): boolean; shouldUseRedisTimeout(): boolean; } -export type QueryType = "get" | "all" | "run"; \ No newline at end of file +export type QueryType = "get" | "all" | "run"; diff --git a/src/databases/Postgres.ts b/src/databases/Postgres.ts index b6409c2..df1a279 100644 --- a/src/databases/Postgres.ts +++ b/src/databases/Postgres.ts @@ -109,7 +109,7 @@ export class Postgres implements IDatabase { } } - async prepare(type: QueryType, query: string, params?: any[], options: QueryOption = {}): Promise { + async prepare(type: QueryType, query: string, params?: any[], options: QueryOption = {}): Promise { // Convert query to use numbered parameters let count = 1; for (let char = 0; char < query.length; char++) { diff --git a/src/databases/Sqlite.ts b/src/databases/Sqlite.ts index a178f1f..4e97787 100644 --- a/src/databases/Sqlite.ts +++ b/src/databases/Sqlite.ts @@ -13,7 +13,7 @@ export class Sqlite implements IDatabase { } // eslint-disable-next-line require-await - async prepare(type: QueryType, query: string, params: any[] = []): Promise { + async prepare(type: QueryType, query: string, params: any[] = []): Promise { // Logger.debug(`prepare (sqlite): type: ${type}, query: ${query}, params: ${params}`); const preparedQuery = this.db.prepare(Sqlite.processQuery(query)); diff --git a/src/routes/setUsername.ts b/src/routes/setUsername.ts index 975c082..a0c6e10 100644 --- a/src/routes/setUsername.ts +++ b/src/routes/setUsername.ts @@ -7,7 +7,7 @@ import { isUserBanned } from "../utils/checkBan"; import { HashedUserID } from "../types/user.model"; import { isRequestInvalid } from "../utils/requestValidator"; -function logUserNameChange(userID: string, newUserName: string, oldUserName: string, updatedByAdmin: boolean): Promise { +function logUserNameChange(userID: string, newUserName: string, oldUserName: string, updatedByAdmin: boolean): Promise { return privateDB.prepare("run", `INSERT INTO "userNameLogs"("userID", "newUserName", "oldUserName", "updatedByAdmin", "updatedAt") VALUES(?, ?, ?, ?, ?)`, [userID, newUserName, oldUserName, + updatedByAdmin, new Date().getTime()]