Skip to content

[pull] master from monkeytypegame:master #703

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 27, 2025
Merged

[pull] master from monkeytypegame:master #703

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12f206e
fix: ts issues (how did this get past ci?)
Miodec Nov 26, 2025
f910c8a
chore: prettier upgrade (@miodec) (#7159)
Miodec Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/pretty-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
version: ${{ env.PNPM_VERSION }}

- name: Install prettier
run: pnpm add -g prettier@2.8.8
run: pnpm add -g prettier@3.6.2

- name: Get changed files
id: get-changed-files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pretty-fix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
version: ${{ env.PNPM_VERSION }}

- name: Install prettier
run: pnpm add -g prettier@2.8.8
run: pnpm add -g prettier@3.6.2

- name: Get changed files
id: get-changed-files
Expand Down
1 change: 1 addition & 0 deletions .prettierrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"tabWidth": 2,
"useTabs": false,
"htmlWhitespaceSensitivity": "ignore",
"trailingComma": "all",
"endOfLine": "lf",
"overrides": [
{
Expand Down
15 changes: 7 additions & 8 deletions backend/__migration__/testActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ if (require.main === module) {
async function main(): Promise<void> {
try {
console.log(
`Connecting to database ${process.env["DB_NAME"]} on ${process.env["DB_URI"]}...`
`Connecting to database ${process.env["DB_NAME"]} on ${process.env["DB_URI"]}...`,
);

//@ts-ignore
if (!readlineSync.keyInYN("Ready to start migration?")) {
appRunning = false;
}
Expand Down Expand Up @@ -222,7 +221,7 @@ async function migrateUsers(uids: string[]): Promise<void> {
},
},
],
{ allowDiskUse: true }
{ allowDiskUse: true },
)
.toArray();
}
Expand All @@ -232,19 +231,19 @@ async function handleUsersWithNoResults(uids: string[]): Promise<void> {
{
$and: [{ uid: { $in: uids } }, filter],
},
{ $set: { testActivity: {} } }
{ $set: { testActivity: {} } },
);
}

function updateProgress(
all: number,
current: number,
start: number,
previousBatchSizeTime: number
previousBatchSizeTime: number,
): void {
const percentage = (current / all) * 100;
const timeLeft = Math.round(
(((new Date().valueOf() - start) / percentage) * (100 - percentage)) / 1000
(((new Date().valueOf() - start) / percentage) * (100 - percentage)) / 1000,
);

process.stdout.clearLine?.(0);
Expand All @@ -253,7 +252,7 @@ function updateProgress(
`Previous batch took ${Math.round(previousBatchSizeTime)}ms (~${
previousBatchSizeTime / batchSize
}ms per user) ${Math.round(
percentage
)}% done, estimated time left ${timeLeft} seconds.`
percentage,
)}% done, estimated time left ${timeLeft} seconds.`,
);
}
62 changes: 31 additions & 31 deletions backend/__tests__/__integration__/dal/blocklist.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ describe("BlocklistDal", () => {
await expect(
BlacklistDal.getCollection().findOne({
emailHash: BlacklistDal.hash(email),
})
}),
).resolves.toMatchObject({
emailHash: BlacklistDal.hash(email),
timestamp: now,
Expand All @@ -45,7 +45,7 @@ describe("BlocklistDal", () => {
await expect(
BlacklistDal.getCollection().findOne({
usernameHash: BlacklistDal.hash(name),
})
}),
).resolves.toMatchObject({
usernameHash: BlacklistDal.hash(name),
timestamp: now,
Expand All @@ -67,7 +67,7 @@ describe("BlocklistDal", () => {
await expect(
BlacklistDal.getCollection().findOne({
discordIdHash: BlacklistDal.hash(discordId),
})
}),
).resolves.toMatchObject({
discordIdHash: BlacklistDal.hash(discordId),
timestamp: now,
Expand All @@ -92,21 +92,21 @@ describe("BlocklistDal", () => {
.find({
usernameHash: BlacklistDal.hash(name),
})
.toArray()
.toArray(),
).resolves.toHaveLength(1);
await expect(
BlacklistDal.getCollection()
.find({
emailHash: BlacklistDal.hash(email),
})
.toArray()
.toArray(),
).resolves.toHaveLength(1);
await expect(
BlacklistDal.getCollection()
.find({
emailHash: BlacklistDal.hash(email2),
})
.toArray()
.toArray(),
).resolves.toHaveLength(1);
});
it("adds user should not create duplicate email", async () => {
Expand All @@ -128,7 +128,7 @@ describe("BlocklistDal", () => {
.find({
emailHash: BlacklistDal.hash(email),
})
.toArray()
.toArray(),
).resolves.toHaveLength(1);
});
it("adds user should not create duplicate discordId", async () => {
Expand All @@ -153,7 +153,7 @@ describe("BlocklistDal", () => {
.find({
discordIdHash: BlacklistDal.hash(discordId),
})
.toArray()
.toArray(),
).resolves.toHaveLength(1);
});
});
Expand All @@ -170,33 +170,33 @@ describe("BlocklistDal", () => {
//by name
await expect(BlacklistDal.contains({ name })).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ name: name.toUpperCase() })
BlacklistDal.contains({ name: name.toUpperCase() }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ name, email: "unknown", discordId: "unknown" })
BlacklistDal.contains({ name, email: "unknown", discordId: "unknown" }),
).resolves.toBeTruthy();

//by email
await expect(BlacklistDal.contains({ email })).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ email: email.toUpperCase() })
BlacklistDal.contains({ email: email.toUpperCase() }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ name: "unknown", email, discordId: "unknown" })
BlacklistDal.contains({ name: "unknown", email, discordId: "unknown" }),
).resolves.toBeTruthy();

//by discordId
await expect(BlacklistDal.contains({ discordId })).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ discordId: discordId.toUpperCase() })
BlacklistDal.contains({ discordId: discordId.toUpperCase() }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ name: "unknown", email: "unknown", discordId })
BlacklistDal.contains({ name: "unknown", email: "unknown", discordId }),
).resolves.toBeTruthy();

//by name and email and discordId
await expect(
BlacklistDal.contains({ name, email, discordId })
BlacklistDal.contains({ name, email, discordId }),
).resolves.toBeTruthy();
});
it("does not contain user", async () => {
Expand All @@ -206,20 +206,20 @@ describe("BlocklistDal", () => {

//WHEN / THEN
await expect(
BlacklistDal.contains({ name: "unknown" })
BlacklistDal.contains({ name: "unknown" }),
).resolves.toBeFalsy();
await expect(
BlacklistDal.contains({ email: "unknown" })
BlacklistDal.contains({ email: "unknown" }),
).resolves.toBeFalsy();
await expect(
BlacklistDal.contains({ discordId: "unknown" })
BlacklistDal.contains({ discordId: "unknown" }),
).resolves.toBeFalsy();
await expect(
BlacklistDal.contains({
name: "unknown",
email: "unknown",
discordId: "unknown",
})
}),
).resolves.toBeFalsy();

await expect(BlacklistDal.contains({})).resolves.toBeFalsy();
Expand All @@ -243,10 +243,10 @@ describe("BlocklistDal", () => {

//decoy still exists
await expect(
BlacklistDal.contains({ name: "test" })
BlacklistDal.contains({ name: "test" }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ email: "[email protected]" })
BlacklistDal.contains({ email: "[email protected]" }),
).resolves.toBeTruthy();
});
it("removes existing email", async () => {
Expand All @@ -265,10 +265,10 @@ describe("BlocklistDal", () => {

//decoy still exists
await expect(
BlacklistDal.contains({ name: "test" })
BlacklistDal.contains({ name: "test" }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ email: "[email protected]" })
BlacklistDal.contains({ email: "[email protected]" }),
).resolves.toBeTruthy();
});
it("removes existing discordId", async () => {
Expand All @@ -293,13 +293,13 @@ describe("BlocklistDal", () => {

//decoy still exists
await expect(
BlacklistDal.contains({ name: "test" })
BlacklistDal.contains({ name: "test" }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ email: "[email protected]" })
BlacklistDal.contains({ email: "[email protected]" }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ discordId: "testDiscordId" })
BlacklistDal.contains({ discordId: "testDiscordId" }),
).resolves.toBeTruthy();
});
it("removes existing username,email and discordId", async () => {
Expand All @@ -324,13 +324,13 @@ describe("BlocklistDal", () => {

//decoy still exists
await expect(
BlacklistDal.contains({ name: "test" })
BlacklistDal.contains({ name: "test" }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ email: "[email protected]" })
BlacklistDal.contains({ email: "[email protected]" }),
).resolves.toBeTruthy();
await expect(
BlacklistDal.contains({ discordId: "testDiscordId" })
BlacklistDal.contains({ discordId: "testDiscordId" }),
).resolves.toBeTruthy();
});

Expand All @@ -355,8 +355,8 @@ describe("BlocklistDal", () => {
it("hashes case insensitive", () => {
["test", "TEST", "tESt"].forEach((value) =>
expect(BlacklistDal.hash(value)).toEqual(
"9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08"
)
"9f86d081884c7d659a2feaa0c55ad015a3bf4f1b2b0b822cd15d6c15b0f00a08",
),
);
});
});
Expand Down
2 changes: 1 addition & 1 deletion backend/__tests__/__integration__/dal/config.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe("ConfigDal", () => {

//THEN
const savedConfig = (await ConfigDal.getConfig(
uid
uid,
)) as ConfigDal.DBConfig;

expect(savedConfig.config.ads).toBe("off");
Expand Down
Loading
Loading