Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-20 22:48:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

use seperate queries

Browse Source
This commit is contained in:
Ajay
2023-01-28 02:12:33 -05:00
parent 36f1d15605
commit b91114165e
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/databases/Sqlite.ts
View File

@@ -14,21 +14,6 @@ export class Sqlite implements IDatabase {
// eslint-disable-next-line require-await // eslint-disable-next-line require-await
async prepare(type: QueryType, query: string, params: any[] = []): Promise<any[]> { async prepare(type: QueryType, query: string, params: any[] = []): Promise<any[]> {
if (query.includes(";")) {
const promises = [];
let paramsCount = 0;
for (const q of query.split(";")) {
if (q.trim() !== "") {
const currentParamCount = q.match(/\?/g)?.length ?? 0;
promises.push(this.prepare(type, q, params.slice(paramsCount, paramsCount + currentParamCount)));
paramsCount += currentParamCount;
}
}
return (await Promise.all(promises)).flat();
}
// Logger.debug(`prepare (sqlite): type: ${type}, query: ${query}, params: ${params}`); // Logger.debug(`prepare (sqlite): type: ${type}, query: ${query}, params: ${params}`);
const preparedQuery = this.db.prepare(Sqlite.processQuery(query)); const preparedQuery = this.db.prepare(Sqlite.processQuery(query));

28
src/routes/postBranding.ts
View File

@@ -29,8 +29,8 @@ export async function postBranding(req: Request, res: Response) {
if (!videoID || !userID || userID.length < 30 || !service if (!videoID || !userID || userID.length < 30 || !service
|| ((!title || !title.title) || ((!title || !title.title)
&& (!thumbnail || thumbnail.original == null && (!thumbnail || thumbnail.original == null
|| (!thumbnail.original && !(thumbnail as TimeThumbnailSubmission).timestamp)))) { || (!thumbnail.original && !(thumbnail as TimeThumbnailSubmission).timestamp)))) {
res.status(400).send("Bad Request"); res.status(400).send("Bad Request");
return; return;
} }
@@ -53,9 +53,11 @@ export async function postBranding(req: Request, res: Response) {
if (existingUUID) { if (existingUUID) {
await updateVoteTotals(BrandingType.Title, existingVote, UUID, isVip); await updateVoteTotals(BrandingType.Title, existingVote, UUID, isVip);
} else { } else {
await db.prepare("run", `INSERT INTO "titles" ("videoID", "title", "original", "userID", "service", "hashedVideoID", "timeSubmitted", "UUID") VALUES (?, ?, ?, ?, ?, ?, ?, ?); await db.prepare("run", `INSERT INTO "titles" ("videoID", "title", "original", "userID", "service", "hashedVideoID", "timeSubmitted", "UUID") VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
INSERT INTO "titleVotes" ("UUID", "votes", "locked", "shadowHidden") VALUES (?, 0, ?, 0);`, [videoID, title.title, title.original ? 1 : 0, hashedUserID, service, hashedVideoID, now, UUID]);
[videoID, title.title, title.original ? 1 : 0, hashedUserID, service, hashedVideoID, now, UUID, UUID, isVip ? 1 : 0]);
await db.prepare("run", `INSERT INTO "titleVotes" ("UUID", "votes", "locked", "shadowHidden") VALUES (?, 0, ?, 0);`,
[UUID, isVip ? 1 : 0]);
} }
} }
})(), (async () => { })(), (async () => {
@@ -70,13 +72,17 @@ export async function postBranding(req: Request, res: Response) {
if (existingUUID) { if (existingUUID) {
await updateVoteTotals(BrandingType.Thumbnail, existingVote, UUID, isVip); await updateVoteTotals(BrandingType.Thumbnail, existingVote, UUID, isVip);
} else { } else {
await db.prepare("run", `INSERT INTO "thumbnails" ("videoID", "original", "userID", "service", "hashedVideoID", "timeSubmitted", "UUID") VALUES (?, ?, ?, ?, ?, ?, ?); await db.prepare("run", `INSERT INTO "thumbnails" ("videoID", "original", "userID", "service", "hashedVideoID", "timeSubmitted", "UUID") VALUES (?, ?, ?, ?, ?, ?, ?)`,
INSERT INTO "thumbnailVotes" ("UUID", "votes", "locked", "shadowHidden") VALUES (?, 0, ?, 0); [videoID, thumbnail.original ? 1 : 0, hashedUserID, service, hashedVideoID, now, UUID]);
${thumbnail.original ? "" : `INSERT INTO "thumbnailTimestamps" ("UUID", "timestamp") VALUES (?, ?)`}`,
[videoID, thumbnail.original ? 1 : 0, hashedUserID, service, hashedVideoID, now, UUID, UUID,
isVip ? 1 : 0, thumbnail.original ? null : UUID, thumbnail.original ? null : (thumbnail as TimeThumbnailSubmission).timestamp]);
}
await db.prepare("run", `INSERT INTO "thumbnailVotes" ("UUID", "votes", "locked", "shadowHidden") VALUES (?, 0, ?, 0)`,
[UUID, isVip ? 1 : 0]);
if (!thumbnail.original) {
await db.prepare("run", `INSERT INTO "thumbnailTimestamps" ("UUID", "timestamp") VALUES (?, ?)`,
[UUID, (thumbnail as TimeThumbnailSubmission).timestamp]);
}
}
} }
})()]); })()]);