From e09f2bc55f13a4fd6ccec69b354fc4e390e2fff0 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Sat, 25 Jun 2022 15:13:29 +0200
Subject: [PATCH] Correct pings in moderation chat message change void listener

---
 src/core/Void.js           | 5 ++---
 src/core/adminfunctions.js | 2 +-
 src/routes/api/modtools.js | 7 ++-----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/core/Void.js b/src/core/Void.js
index 1528407..ba68d25 100644
--- a/src/core/Void.js
+++ b/src/core/Void.js
@@ -130,7 +130,7 @@ class Void {
           // it does skip some pixel, but thats ok
           this.curRadius += 1;
           if (this.curRadius > TARGET_RADIUS) {
-            this.ended = true;
+            this.cancel();
             return;
           }
           this.curAngleDelta = 2 * Math.PI / (2 * this.curRadius * Math.PI);
@@ -161,13 +161,12 @@ class Void {
   }
 
   cancel() {
-    socketEvents.removeListener('pixelUpdate', this.broadcastPixelBuffer);
     this.ended = true;
+    socketEvents.removeListener('pixelUpdate', this.broadcastPixelBuffer);
   }
 
   checkStatus() {
     if (this.ended) {
-      socketEvents.removeListener('pixelUpdate', this.broadcastPixelBuffer);
       return 100;
     }
     return Math.floor(this.curRadius * 100 / TARGET_RADIUS);
diff --git a/src/core/adminfunctions.js b/src/core/adminfunctions.js
index 069ff52..3354a35 100644
--- a/src/core/adminfunctions.js
+++ b/src/core/adminfunctions.js
@@ -207,7 +207,7 @@ export async function executeCleanerAction(
     return [403, error];
   }
   // eslint-disable-next-line max-len
-  const report = `set Canvas Cleaner to ${action} from #${canvasid},${x},${y} to #${canvasid},${u},${v}`;
+  const report = `set Canvas Cleaner to ${action} from #${canvas.ident},${x},${y} to #${canvas.ident},${u},${v}`;
   if (logger) logger(report);
   return [200, report];
 }
diff --git a/src/routes/api/modtools.js b/src/routes/api/modtools.js
index 7000970..fc4e749 100644
--- a/src/routes/api/modtools.js
+++ b/src/routes/api/modtools.js
@@ -2,12 +2,9 @@
  * basic mod api
  * is used by ../components/Modtools
  *
- * @flow
- *
  */
 
 import express from 'express';
-import type { Request, Response } from 'express';
 import multer from 'multer';
 
 import CanvasCleaner from '../../core/CanvasCleaner';
@@ -76,7 +73,7 @@ router.use(async (req, res, next) => {
 router.post('/', upload.single('image'), async (req, res, next) => {
   const aLogger = (text) => {
     const timeString = new Date().toLocaleTimeString();
-    const logText = `@${req.user.regUser.name}[${req.user.id}] ${text}`;
+    const logText = `@[${req.user.regUser.name}](${req.user.id}) ${text}`;
     modtoolsLogger.info(
       // eslint-disable-next-line max-len
       `${timeString} | MODTOOLS> ${logText}`,
@@ -227,7 +224,7 @@ router.post('/', async (req, res, next) => {
 });
 
 
-router.use(async (req: Request, res: Response) => {
+router.use(async (req, res) => {
   res.status(400).send('Invalid request');
 });