Merge remote-tracking branch 'upstream/master'

package-lock.json

@@ -33,7 +33,7 @@
         "underscore.string": "^3.3.6",
         "ws": "^8.9.0",
         "ygopro-deck-encode": "^1.0.15",
-        "ygopro-msg-encode": "^1.1.9",
+        "ygopro-msg-encode": "^1.1.10",
         "ygopro-yrp-encode": "^1.0.1"
       },
       "devDependencies": {
@@ -1447,6 +1447,7 @@
       "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz",
       "integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@ioredis/commands": "^1.1.1",
         "cluster-key-slot": "^1.1.0",
@@ -3025,9 +3026,9 @@
       "license": "MIT"
     },
     "node_modules/ygopro-msg-encode": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.9.tgz",
-      "integrity": "sha512-sY/jveNdcN25pcTsf8MpC0hvZnNQ2vTpIjuVhP3zjAZw8Uw8+8kEqTZSFEnnpS4QAmu3QYSEaFH1Rb0CfG2jFA==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.10.tgz",
+      "integrity": "sha512-lRTbBwf3Gr6x1hIvTeojdbcWw91/UlbYAhjgPgH9RgUk+2Av18iq8hayKkZgpjqbYhdlHqyZj4aBMgDI+F5eJw==",
       "license": "MIT",
       "dependencies": {
         "typed-reflector": "^1.0.14",
@@ -4066,6 +4067,7 @@
       "version": "5.6.1",
       "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-5.6.1.tgz",
       "integrity": "sha512-UxC0Yv1Y4WRJiGQxQkP0hfdL0/5/6YvdfOOClRgJ0qppSarkhneSa6UvkMkms0AkdGimSH3Ikqm+6mkMmX7vGA==",
+      "peer": true,
       "requires": {
         "@ioredis/commands": "^1.1.1",
         "cluster-key-slot": "^1.1.0",
@@ -5260,9 +5262,9 @@
       "integrity": "sha512-NMvgWuC3SKant50RDu0bHa3QIRlwBhdTR3bNDrMpNthTTQmCCq8i2HZaWFiCmYIBi9fR3W9CkFIgK6hI4d+PzQ=="
     },
     "ygopro-msg-encode": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.9.tgz",
-      "integrity": "sha512-sY/jveNdcN25pcTsf8MpC0hvZnNQ2vTpIjuVhP3zjAZw8Uw8+8kEqTZSFEnnpS4QAmu3QYSEaFH1Rb0CfG2jFA==",
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/ygopro-msg-encode/-/ygopro-msg-encode-1.1.10.tgz",
+      "integrity": "sha512-lRTbBwf3Gr6x1hIvTeojdbcWw91/UlbYAhjgPgH9RgUk+2Av18iq8hayKkZgpjqbYhdlHqyZj4aBMgDI+F5eJw==",
       "requires": {
         "typed-reflector": "^1.0.14",
         "ygopro-deck-encode": "^1.0.15",

package.json

@@ -35,7 +35,7 @@
     "underscore.string": "^3.3.6",
     "ws": "^8.9.0",
     "ygopro-deck-encode": "^1.0.15",
-    "ygopro-msg-encode": "^1.1.9",
+    "ygopro-msg-encode": "^1.1.10",
     "ygopro-yrp-encode": "^1.0.1"
   },
   "license": "AGPL-3.0",

ygopro-server.coffee

@@ -1440,6 +1440,7 @@ class Room
     @welcome = ''
     @scores = {}
     @decks = {}
+    @deck_history = {}
     @duel_count = 0
     @death = 0
     @turn = 0
@@ -1749,8 +1750,10 @@ class Room
       form_data.append 'userscoreB', score_array[1].score
       form_data.append 'userdeckA', score_array[0].deck
       form_data.append 'userdeckB', score_array[1].deck
-      form_data.append 'userdeckAHistory', score_array[0].deck_history
-      form_data.append 'userdeckBHistory', score_array[1].deck_history
+      if score_array[0].deck_history?
+        form_data.append 'userdeckAHistory', JSON.stringify(score_array[0].deck_history)
+      if score_array[1].deck_history?
+        form_data.append 'userdeckBHistory', JSON.stringify(score_array[1].deck_history)
       form_data.append 'first', JSON.stringify @first_list
       form_data.append 'replays', JSON.stringify formatted_replays
       form_data.append 'start', @start_time
@@ -3469,7 +3472,6 @@ ygopro.stoc_follow 'DUEL_START', true, (buffer, info, client, server, datas)->
   if client.main and client.main.length
     deck_text = '#ygopro-server deck log\n#main\n' + client.main.join('\n') + '\n!side\n' + client.side.join('\n') + '\n'
     room.decks[client.name] = deck_text unless room.decks[client.name]
-    room.deck_history = {} unless room.deck_history
     room.deck_history[client.name] = [] if !room.deck_history[client.name]
     room.deck_history[client.name].push deck_text
   if settings.modules.deck_log.enabled and deck_text and not client.deck_saved and not room.windbot

ygopro-server.js

@@ -1884,6 +1884,7 @@
       this.welcome = '';
       this.scores = {};
       this.decks = {};
+      this.deck_history = {};
       this.duel_count = 0;
       this.death = 0;
       this.turn = 0;
@@ -2276,8 +2277,12 @@
         form_data.append('userscoreB', score_array[1].score);
         form_data.append('userdeckA', score_array[0].deck);
         form_data.append('userdeckB', score_array[1].deck);
-        form_data.append('userdeckAHistory', score_array[0].deck_history);
-        form_data.append('userdeckBHistory', score_array[1].deck_history);
+        if (score_array[0].deck_history != null) {
+          form_data.append('userdeckAHistory', JSON.stringify(score_array[0].deck_history));
+        }
+        if (score_array[1].deck_history != null) {
+          form_data.append('userdeckBHistory', JSON.stringify(score_array[1].deck_history));
+        }
         form_data.append('first', JSON.stringify(this.first_list));
         form_data.append('replays', JSON.stringify(formatted_replays));
         form_data.append('start', this.start_time);
@@ -4626,9 +4631,6 @@
       if (!room.decks[client.name]) {
         room.decks[client.name] = deck_text;
       }
-      if (!room.deck_history) {
-        room.deck_history = {};
-      }
       if (!room.deck_history[client.name]) {
         room.deck_history[client.name] = [];
       }