From 1b20d3f9e7ec0cff6ae727b10bd9e64e4acc2121 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Thu, 11 Aug 2022 18:19:07 +0200
Subject: [PATCH] send amount of ranked pixel in PixelReturn package

---
 src/client.js                     |  8 +++-----
 src/components/HistorySelect.jsx  |  1 +
 src/components/SocialSettings.jsx |  1 +
 src/core/draw.js                  |  1 +
 src/socket/SocketServer.js        | 13 ++++++++++---
 src/socket/packets/PixelReturn.js | 17 +++++++++++++----
 src/ui/placePixel.js              |  3 ++-
 7 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/src/client.js b/src/client.js
index f4d90a1..3aed96e 100644
--- a/src/client.js
+++ b/src/client.js
@@ -39,11 +39,9 @@ function init() {
       receivePixelUpdate(store, i, j, offset, color & 0x7F);
     });
   });
-  SocketClient.on('pixelReturn', ({
-    retCode, wait, coolDownSeconds, pxlCnt,
-  }) => {
-    receivePixelReturn(store, retCode, wait, coolDownSeconds, pxlCnt);
-  });
+  SocketClient.on('pixelReturn',
+    (args) => receivePixelReturn(store, ...args),
+  );
   SocketClient.on('cooldownPacket', (coolDown) => {
     store.dispatch(receiveCoolDown(coolDown));
   });
diff --git a/src/components/HistorySelect.jsx b/src/components/HistorySelect.jsx
index 457c309..d95612b 100644
--- a/src/components/HistorySelect.jsx
+++ b/src/components/HistorySelect.jsx
@@ -127,6 +127,7 @@ const HistorySelect = () => {
               >
                 {times.map((value) => (
                   <option
+                    key={value}
                     value={value}
                   >
                     {value}
diff --git a/src/components/SocialSettings.jsx b/src/components/SocialSettings.jsx
index dbe0025..860a82e 100644
--- a/src/components/SocialSettings.jsx
+++ b/src/components/SocialSettings.jsx
@@ -61,6 +61,7 @@ const SocialSettings = ({ done }) => {
             {
             blocked.map((bl) => (
               <div
+                key={bl[0]}
                 role="button"
                 tabIndex={0}
                 onClick={() => {
diff --git a/src/core/draw.js b/src/core/draw.js
index 8273498..0ac49dc 100644
--- a/src/core/draw.js
+++ b/src/core/draw.js
@@ -252,6 +252,7 @@ export async function drawByOffsets(
     wait,
     coolDown,
     pxlCnt,
+    rankedPxlCnt,
     retCode,
   };
 }
diff --git a/src/socket/SocketServer.js b/src/socket/SocketServer.js
index 72e6148..aeae0f6 100644
--- a/src/socket/SocketServer.js
+++ b/src/socket/SocketServer.js
@@ -490,7 +490,7 @@ class SocketServer {
           // check if captcha needed
           if (await needCaptcha(ip)) {
             // need captcha
-            failureRet = PixelReturn.dehydrate(10, 0, 0);
+            failureRet = PixelReturn.dehydrate(10);
           } else {
             // (re)check for Proxy
             const allowed = await isIPAllowed(ip);
@@ -504,7 +504,7 @@ class SocketServer {
                 // range banned
                 failureStatus = 15;
               }
-              failureRet = PixelReturn.dehydrate(failureStatus, 0, 0);
+              failureRet = PixelReturn.dehydrate(failureStatus);
             }
           }
           if (failureRet !== null) {
@@ -526,6 +526,7 @@ class SocketServer {
             wait,
             coolDown,
             pxlCnt,
+            rankedPxlCnt,
             retCode,
           } = await drawByOffsets(
             ws.user,
@@ -533,7 +534,13 @@ class SocketServer {
             i, j,
             pixels,
           );
-          ws.send(PixelReturn.dehydrate(retCode, wait, coolDown, pxlCnt));
+          ws.send(PixelReturn.dehydrate(
+            retCode,
+            wait,
+            coolDown,
+            pxlCnt,
+            rankedPxlCnt,
+          ));
           break;
         }
         case RegisterCanvas.OP_CODE: {
diff --git a/src/socket/packets/PixelReturn.js b/src/socket/packets/PixelReturn.js
index c81eb72..28465d2 100644
--- a/src/socket/packets/PixelReturn.js
+++ b/src/socket/packets/PixelReturn.js
@@ -8,22 +8,31 @@ export default {
     const wait = data.getUint32(2);
     const coolDownSeconds = data.getInt16(6);
     const pxlCnt = data.getUint8(8);
-    return {
+    const rankedPxlCnt = data.getUint8(9);
+    return [
       retCode,
       wait,
       coolDownSeconds,
       pxlCnt,
-    };
+      rankedPxlCnt,
+    ];
   },
-  dehydrate(retCode, wait, coolDown, pxlCnt) {
+  dehydrate(
+    retCode,
+    wait = 0,
+    coolDown = 0,
+    pxlCnt = 0,
+    rankedPxlCnt = 0,
+  ) {
     // Server (sender)
-    const buffer = Buffer.allocUnsafe(1 + 1 + 4 + 2 + 1);
+    const buffer = Buffer.allocUnsafe(1 + 1 + 4 + 2 + 1 + 1);
     buffer.writeUInt8(OP_CODE, 0);
     buffer.writeUInt8(retCode, 1);
     buffer.writeUInt32BE(wait, 2);
     const coolDownSeconds = Math.round(coolDown / 1000);
     buffer.writeInt16BE(coolDownSeconds, 6);
     buffer.writeUInt8(pxlCnt, 8);
+    buffer.writeUInt8(rankedPxlCnt, 9);
     return buffer;
   },
 };
diff --git a/src/ui/placePixel.js b/src/ui/placePixel.js
index 1793cc3..6b193a9 100644
--- a/src/ui/placePixel.js
+++ b/src/ui/placePixel.js
@@ -156,6 +156,7 @@ export function receivePixelReturn(
   wait,
   coolDownSeconds,
   pxlCnt,
+  rankedPxlCnt,
 ) {
   clearTimeout(pixelTimeout);
 
@@ -189,7 +190,7 @@ export function receivePixelReturn(
   let type = 'error';
   switch (retCode) {
     case 0:
-      store.dispatch(placedPixels(pxlCnt));
+      store.dispatch(placedPixels(rankedPxlCnt));
       break;
     case 1:
       errorTitle = t`Invalid Canvas`;