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

remove empty rows from userNames

Browse Source
This commit is contained in:
Michael C
2021-12-18 21:32:13 -05:00
parent caf94a7a93
commit 544af7ce15
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/routes/setUsername.ts
View File

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

11
test/cases/setUsername.ts
View File

@@ -20,6 +20,7 @@ const user06PrivateUserID = "setUsername_06";
const username06 = "Username 06"; const username06 = "Username 06";
const user07PrivateUserID = "setUsername_07"; const user07PrivateUserID = "setUsername_07";
const username07 = "Username 07"; const username07 = "Username 07";
const user08PrivateUserID = "setUsername_08";
async function addUsername(userID: string, userName: string, locked = 0) { async function addUsername(userID: string, userName: string, locked = 0) {
await db.prepare("run", 'INSERT INTO "userNames" ("userID", "userName", "locked") VALUES(?, ?, ?)', [userID, userName, locked]); await db.prepare("run", 'INSERT INTO "userNames" ("userID", "userName", "locked") VALUES(?, ?, ?)', [userID, userName, locked]);
@@ -231,4 +232,14 @@ describe("setUsername", () => {
}) })
.catch((err) => done(err)); .catch((err) => done(err));
}); });
it("Should delete row if new username is same as publicID", (done) => {
const publicID = getHash(user08PrivateUserID);
postSetUserName(getHash(user08PrivateUserID), publicID)
.then(async () => {
const usernameInfo = await getUsernameInfo(getHash(user08PrivateUserID));
assert.strictEqual(usernameInfo, null);
done();
});
});
}); });