Mirror/SponsorBlockServer
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlockServer.git synced 2025-12-16 08:26:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael C
2021-12-20 00:27:09 -05:00
parent d1ed4376ef f54b9f7ae1
commit b730383293
5 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/routes/getSearchSegments.ts
View File

@@ -109,7 +109,7 @@ function filterSegments(segments: DBSegment[], page: number, filters: Record<str
|| (segment.views < filters.minViews || segment.views > filters.maxViews)
|| (!filters.locked && segment.locked)
|| (!filters.hidden && segment.hidden)
|| (!filters.ignored && (segment.hidden || segment.shadowHidden))
|| (!filters.ignored && ((segment.votes <= -2) || segment.hidden || segment.shadowHidden))
|| (filters.categories.length > 0 && !filters.categories.includes(segment.category)))
// return false if any of the conditions are met
// return true if none of the conditions are met

6
src/routes/setUsername.ts
View File

@@ -70,7 +70,11 @@ export async function setUsername(req: Request, res: Response): Promise<Response
if (row?.userName !== undefined) {
//already exists, update this row
oldUserName = row.userName;
await db.prepare("run", `UPDATE "userNames" SET "userName" = ?, "locked" = ? WHERE "userID" = ?`, [userName, locked, userID]);
if (userName == userID && !locked) {
await db.prepare("run", `DELETE FROM "userNames" WHERE "userID" = ?`, [userID]);
} else {
await db.prepare("run", `UPDATE "userNames" SET "userName" = ?, "locked" = ? WHERE "userID" = ?`, [userName, locked, userID]);
}
} else {
//add to the db
await db.prepare("run", `INSERT INTO "userNames"("userID", "userName", "locked") VALUES(?, ?, ?)`, [userID, userName, locked]);