Hri7566
/
mpp-server-dev2
1
0
Fork 1
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Fix color generation bug

This commit is contained in:
Hri7566 2024-10-16 02:02:53 -04:00
parent e65159830f
commit b86d86b3f2
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util/id.ts
View File

@ -1,6 +1,10 @@
import { createHash, randomBytes } from "crypto"; import env from "./env"; import { createHash, randomBytes } from "crypto";
import env from "./env";
import { spoop_text } from "./helpers"; import { spoop_text } from "./helpers";
import { config } from "../ws/usersConfig"; import { config } from "../ws/usersConfig";
import { Logger } from "./Logger";
const logger = new Logger("IDGen");
export function createID() { export function createID() {
// Maybe I could make this funnier than it needs to be... // Maybe I could make this funnier than it needs to be...
@ -46,14 +50,20 @@ export function createSocketID() {
} }
export function createColor(_id: string) { export function createColor(_id: string) {
logger.debug(
"Creating color for " + _id + " using method " + config.colorGeneration
);
if (config.colorGeneration == "random") { if (config.colorGeneration == "random") {
return "#" + Math.floor(Math.random() * 16777215).toString(16); return "#" + Math.floor(Math.random() * 16777215).toString(16);
} else if (config.colorGeneration == "sha256") { } else if (config.colorGeneration == "sha256") {
return "#" + createHash("sha256") return (
"#" +
createHash("sha256")
.update(_id) .update(_id)
.update(env.SALT) .update(env.SALT)
.digest("hex") .digest("hex")
.substring(24, 24 + 6); .substring(24, 24 + 6)
);
} else if (config.colorGeneration == "mpp") { } else if (config.colorGeneration == "mpp") {
const hash = createHash("md5"); const hash = createHash("md5");
hash.update(_id + env.COLOR_SALT); hash.update(_id + env.COLOR_SALT);
@ -63,7 +73,13 @@ export function createColor(_id: string) {
const g = output.readUInt8(1) + 0x20; const g = output.readUInt8(1) + 0x20;
const b = output.readUInt8(2); const b = output.readUInt8(2);
return "#" + r.toString(16) + g.toString(16) + b.toString(16); logger.debug("Colors:", r, g, b);
return (
"#" +
r.toString(16).padStart(2, "0") +
g.toString(16).padStart(2, "0") +
b.toString(16).padStart(2, "0")
);
} else if (config.colorGeneration == "white") { } else if (config.colorGeneration == "white") {
return "#ffffff"; return "#ffffff";
} }