From bd83a660526cf018edbabfe256099df665399670 Mon Sep 17 00:00:00 2001
From: HF <hf@pixelplanet.fun>
Date: Sun, 11 Sep 2022 01:18:10 +0200
Subject: [PATCH] fix things

---
 src/components/Captcha.jsx        | 3 ++-
 src/components/LanguageSelect.jsx | 2 +-
 src/core/constants.js             | 2 +-
 src/core/ttag.js                  | 2 +-
 src/routes/captcha.js             | 1 +
 src/socket/MessageBroker.js       | 3 +++
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/Captcha.jsx b/src/components/Captcha.jsx
index 54d4fea..2989057 100644
--- a/src/components/Captcha.jsx
+++ b/src/components/Captcha.jsx
@@ -13,7 +13,8 @@ import { IoReloadCircleSharp } from 'react-icons/io5';
 import { shardOrigin } from '../store/actions/fetch';
 
 async function getUrlAndId() {
-  const url = `${shardOrigin}/captcha.svg`;
+  // const url = `${shardOrigin}/captcha.svg`;
+  const url = '/captcha.svg';
   const resp = await fetch(url, {
     cache: 'no-cache',
   });
diff --git a/src/components/LanguageSelect.jsx b/src/components/LanguageSelect.jsx
index dd55b24..411e72c 100644
--- a/src/components/LanguageSelect.jsx
+++ b/src/components/LanguageSelect.jsx
@@ -73,7 +73,7 @@ function LanguageSelect() {
             host = `.${host}`;
           }
           // eslint-disable-next-line max-len
-          document.cookie = `lang=${langSel};expires=${d.toUTCString()};path=/;domain=${host}`;
+          document.cookie = `plang=${langSel};expires=${d.toUTCString()};path=/;domain=${host}`;
           window.location.reload();
         }}
       >
diff --git a/src/core/constants.js b/src/core/constants.js
index 2e2c06f..4a8da21 100644
--- a/src/core/constants.js
+++ b/src/core/constants.js
@@ -70,7 +70,7 @@ export const TILE_SIZE = 256;
 // how much to scale for a new tiled zoomlevel
 export const TILE_ZOOM_LEVEL = 2;
 
-export const COOKIE_SESSION_NAME = 'pixelplanet.session';
+export const COOKIE_SESSION_NAME = 'ppfun.session';
 
 export const SECOND = 1000;
 export const MINUTE = 60 * SECOND;
diff --git a/src/core/ttag.js b/src/core/ttag.js
index 72721fa..315fa84 100644
--- a/src/core/ttag.js
+++ b/src/core/ttag.js
@@ -37,7 +37,7 @@ export function getTTag(lang) {
  */
 export function expressTTag(req, res, next) {
   const cookies = cookie.parse(req.headers.cookie || '');
-  const language = cookies.lang || req.headers['accept-language'];
+  const language = cookies.plang || req.headers['accept-language'];
   req.lang = languageFromLocalisation(language);
   req.ttag = getTTag(req.lang);
   next();
diff --git a/src/routes/captcha.js b/src/routes/captcha.js
index 8263f22..db0b8fa 100644
--- a/src/routes/captcha.js
+++ b/src/routes/captcha.js
@@ -8,6 +8,7 @@ import { setCaptchaSolution } from '../data/redis/captcha';
 
 export default (req, res) => {
   res.set({
+    'Access-Control-Expose-Headers': 'captcha-id',
     'Cache-Control': 'no-cache, no-store, must-revalidate',
   });
 
diff --git a/src/socket/MessageBroker.js b/src/socket/MessageBroker.js
index 09447f2..b4fdc84 100644
--- a/src/socket/MessageBroker.js
+++ b/src/socket/MessageBroker.js
@@ -182,6 +182,9 @@ class MessageBroker extends SocketEvents {
 
   emit(key, ...args) {
     super.emit(key, ...args);
+    if (key === 'recvChatMessage') {
+      return;
+    }
     const msg = `${this.thisShard}:${key},${JSON.stringify(args)}`;
     this.publisher.publish('bc', msg);
   }