diff --git a/packages/server/src/api.ts b/packages/server/src/api.ts index 2aae3ac..614e082 100644 --- a/packages/server/src/api.ts +++ b/packages/server/src/api.ts @@ -30,6 +30,14 @@ app.get("/callback", async (req, res) => { }), }).then((a) => a.json()); + if (!who.success) { + res.json({ + error: "AUTHENTICATION FAILED", + error_message: who.error || "no error specified", + }); + return; + } + const [username, hostname] = who.user.sub.split("@"); await prisma.user.upsert({ diff --git a/packages/server/src/lib/Canvas.ts b/packages/server/src/lib/Canvas.ts index 58ac773..11994ce 100644 --- a/packages/server/src/lib/Canvas.ts +++ b/packages/server/src/lib/Canvas.ts @@ -14,7 +14,7 @@ class Canvas { size: this.CANVAS_SIZE, zoom: 7, pixel: { - cooldown: 60, + cooldown: 10, multiplier: 3, maxStack: 6, }, diff --git a/packages/server/src/lib/SocketServer.ts b/packages/server/src/lib/SocketServer.ts index d8ba892..be6f018 100644 --- a/packages/server/src/lib/SocketServer.ts +++ b/packages/server/src/lib/SocketServer.ts @@ -80,22 +80,25 @@ export class SocketServer { // - needs to be exponential (takes longer to aquire more pixels stacked) // - convert to config options instead of hard-coded setInterval(async () => { - Logger.debug("Running pixel stacking..."); + const DEBUG = false; + + if (DEBUG) Logger.debug("Running pixel stacking..."); const redis = await Redis.getClient(); const sockets = await this.io.local.fetchSockets(); for (const socket of sockets) { const sub = await redis.get(Redis.key("socketToSub", socket.id)); if (!sub) { - Logger.warn(`Socket ${socket.id} has no user`); + if (DEBUG) Logger.warn(`Socket ${socket.id} has no user`); continue; } const user = await User.fromSub(sub); if (!user) { - Logger.warn( - `Socket ${socket.id}'s user (${sub}) does not exist in the database` - ); + if (DEBUG) + Logger.warn( + `Socket ${socket.id}'s user (${sub}) does not exist in the database` + ); continue; } @@ -116,7 +119,9 @@ export class SocketServer { user.pixelStack < getClientConfig().canvas.pixel.maxStack ) { await user.modifyStack(1); - Logger.debug(sub + " has gained another pixel in their stack"); + + if (DEBUG) + Logger.debug(sub + " has gained another pixel in their stack"); } } }, 1000);