From a8232757b152db183fda289d0d7d7e543749ffe8 Mon Sep 17 00:00:00 2001
From: HF <pixelplanetdev@gmail.com>
Date: Thu, 10 Feb 2022 22:53:38 +0100
Subject: [PATCH] give unregistered people access to chat channels

---
 .../contextmenus/ChannelDropDown.jsx          |  2 +-
 src/components/windows/Chat.jsx               | 58 +++++++++++--------
 src/reducers/chat.js                          |  2 +-
 src/styles/default.css                        |  1 +
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/components/contextmenus/ChannelDropDown.jsx b/src/components/contextmenus/ChannelDropDown.jsx
index bc66899..4e2a58f 100644
--- a/src/components/contextmenus/ChannelDropDown.jsx
+++ b/src/components/contextmenus/ChannelDropDown.jsx
@@ -108,7 +108,7 @@ const ChannelDropDown = ({
     if (channels[chatChannel]) {
       setChatChannelName(channels[chatChannel][0]);
     }
-  }, [chatChannel]);
+  }, [chatChannel, channels]);
 
   return (
     <div
diff --git a/src/components/windows/Chat.jsx b/src/components/windows/Chat.jsx
index 6cac12b..af78692 100644
--- a/src/components/windows/Chat.jsx
+++ b/src/components/windows/Chat.jsx
@@ -167,14 +167,20 @@ const Chat = ({
             )))
         }
       </ul>
-      {(ownName) ? (
-        <div className="chatinput">
-          <form
-            onSubmit={(e) => handleSubmit(e)}
-            style={{ display: 'flex', flexDirection: 'row', height: '100%' }}
-          >
+      <form
+        className="chatinput"
+        onSubmit={(e) => handleSubmit(e)}
+        style={{
+          display: 'flex',
+        }}
+      >
+        {(ownName) ? (
+          <>
             <input
-              style={{ flexGrow: 1, minWidth: 40 }}
+              style={{
+                flexGrow: 1,
+                minWidth: 40,
+              }}
               id={`chtipt-${windowId}`}
               value={inputMessage}
               onChange={(e) => dispatch(
@@ -192,23 +198,27 @@ const Chat = ({
             >
               ‣
             </button>
-            <ChannelDropDown
-              setChatChannel={setChannel}
-              chatChannel={chatChannel}
-            />
-          </form>
-        </div>
-      ) : (
-        <div
-          className="modallink"
-          onClick={() => dispatch(showUserAreaModal())}
-          style={{ textAlign: 'center', fontSize: 13 }}
-          role="button"
-          tabIndex={0}
-        >
-          {t`You must be logged in to chat`}
-        </div>
-      )}
+          </>
+        ) : (
+          <div
+            className="modallink"
+            onClick={() => dispatch(showUserAreaModal())}
+            style={{
+              textAlign: 'center',
+              fontSize: 13,
+              flexGrow: 1,
+            }}
+            role="button"
+            tabIndex={0}
+          >
+            {t`You must be logged in to chat`}
+          </div>
+        )}
+        <ChannelDropDown
+          setChatChannel={setChannel}
+          chatChannel={chatChannel}
+        />
+      </form>
     </div>
   );
 };
diff --git a/src/reducers/chat.js b/src/reducers/chat.js
index 2346515..dd54cac 100644
--- a/src/reducers/chat.js
+++ b/src/reducers/chat.js
@@ -55,7 +55,7 @@ export default function chat(
       const keys = Object.keys(channels);
       for (let i = 0; i < keys.length; i += 1) {
         const cid = keys[i];
-        if (channels[cid][1] === 0) {
+        if (channels[cid][1] !== 0) {
           delete messages[cid];
           delete channels[cid];
         }
diff --git a/src/styles/default.css b/src/styles/default.css
index 65fa32b..f262ba5 100644
--- a/src/styles/default.css
+++ b/src/styles/default.css
@@ -664,6 +664,7 @@ tr:nth-child(even) {
 .chatinput {
   height: 24px;
   white-space: nowrap;
+  display: flex;
 }
 .chathead {
   display: flex;