From 702f4e62a285bacaae78439b1f5d7b9bc977724a Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Tue, 21 Jun 2022 12:43:35 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Fixing=20the=20AirDCPP=20socket?=
 =?UTF-8?q?=20issue=20on=20AcquisitionPanel=20on=20ComicDetails=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AirDCPPSettings/AirDCPPHubsForm.tsx       |  6 +-
 .../AirDCPPSettings/AirDCPPSettingsForm.tsx   |  4 +-
 .../ComicDetail/AcquisitionPanel.tsx          | 56 +++++++++++--------
 3 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx b/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx
index f70669f..9a2bb9e 100644
--- a/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx
+++ b/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx
@@ -10,12 +10,14 @@ export const AirDCPPHubsForm = (airDCPPClientUserSettings): ReactElement => {
   const dispatch = useDispatch();
   const [hubList, setHubList] = useState([]);
   const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-  const { AirDCPPSocket, settings } = airDCPPConfiguration;
+  const {
+    airDCPPState: { settings, socket },
+  } = airDCPPConfiguration;
 
   useEffect(() => {
     (async () => {
       if (!isEmpty(settings)) {
-        const hubs = await AirDCPPSocket.get(`hubs`);
+        const hubs = await socket.get(`hubs`);
         const hubSelectionOptions = hubs.map(({ hub_url, identity }) => ({
           value: hub_url,
           label: identity.name,
diff --git a/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx b/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx
index 744bb83..627be42 100644
--- a/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx
+++ b/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx
@@ -27,7 +27,9 @@ export const AirDCPPSettingsForm = (): ReactElement => {
   }, []);
   const validate = async () => {};
   console.log(airDCPPSettings.airDCPPState);
-  const initFormData = !isUndefined(airDCPPSettings.airDCPPState.settings.directConnect)
+  const initFormData = !isUndefined(
+    airDCPPSettings.airDCPPState.settings.directConnect,
+  )
     ? airDCPPSettings.airDCPPState.settings.directConnect.client.host
     : {};
 
diff --git a/src/client/components/ComicDetail/AcquisitionPanel.tsx b/src/client/components/ComicDetail/AcquisitionPanel.tsx
index f5b4ec7..2a5f9fc 100644
--- a/src/client/components/ComicDetail/AcquisitionPanel.tsx
+++ b/src/client/components/ComicDetail/AcquisitionPanel.tsx
@@ -46,24 +46,27 @@ export const AcquisitionPanel = (
 
   // const settings = useSelector((state: RootState) => state.settings.data);
   const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-  const { AirDCPPSocket, settings } = airDCPPConfiguration;
+
   const dispatch = useDispatch();
   const [dcppQuery, setDcppQuery] = useState({});
 
   useEffect(() => {
-    if (!isNil(settings)) {
+    if (!isEmpty(airDCPPConfiguration.airDCPPState.settings)) {
       // AirDC++ search query
       const dcppSearchQuery = {
         query: {
           pattern: `${sanitizedIssueName.replace(/#/g, "")}`,
           extensions: ["cbz", "cbr", "cb7"],
         },
-        hub_urls: map(settings.directConnect.client.hubs, (item) => item.value),
+        hub_urls: map(
+          airDCPPConfiguration.airDCPPState.settings.directConnect.client.hubs,
+          (item) => item.value,
+        ),
         priority: 5,
       };
       setDcppQuery(dcppSearchQuery);
     }
-  }, []);
+  }, [airDCPPConfiguration]);
 
   const getDCPPSearchResults = useCallback(
     async (searchQuery) => {
@@ -72,17 +75,20 @@ export const AcquisitionPanel = (
           pattern: `${searchQuery.issueName}`,
           extensions: ["cbz", "cbr", "cb7"],
         },
-        hub_urls: map(settings.directConnect.client.hubs, (item) => item.value),
+        hub_urls: map(
+          airDCPPConfiguration.airDCPPState.settings.directConnect.client.hubs,
+          (item) => item.value,
+        ),
         priority: 5,
       };
       dispatch(
-        search(manualQuery, AirDCPPSocket, {
-          username: `${settings.directConnect.client.host.username}`,
-          password: `${settings.directConnect.client.host.password}`,
+        search(manualQuery, airDCPPConfiguration.airDCPPState.socket, {
+          username: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.username}`,
+          password: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.password}`,
         }),
       );
     },
-    [dispatch, AirDCPPSocket],
+    [dispatch, airDCPPConfiguration],
   );
 
   // download via AirDC++
@@ -94,19 +100,23 @@ export const AcquisitionPanel = (
           resultId,
           comicBookObjectId,
           comicObject,
-          AirDCPPSocket,
+          airDCPPConfiguration.airDCPPState.socket,
           {
-            username: `${settings.directConnect.client.host.username}`,
-            password: `${settings.directConnect.client.host.password}`,
+            username: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.username}`,
+            password: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.password}`,
           },
         ),
       );
       // this is to update the download count badge on the downloads tab
       dispatch(
-        getBundlesForComic(comicBookObjectId, AirDCPPSocket, {
-          username: `${settings.directConnect.client.host.username}`,
-          password: `${settings.directConnect.client.host.password}`,
-        }),
+        getBundlesForComic(
+          comicBookObjectId,
+          airDCPPConfiguration.airDCPPState.socket,
+          {
+            username: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.username}`,
+            password: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.password}`,
+          },
+        ),
       );
     },
     [],
@@ -114,7 +124,7 @@ export const AcquisitionPanel = (
   return (
     <>
       <div className="comic-detail columns">
-        {!isEmpty(AirDCPPSocket) ? (
+        {!isEmpty(airDCPPConfiguration.airDCPPState.socket) ? (
           <Form
             onSubmit={getDCPPSearchResults}
             initialValues={{
@@ -185,11 +195,13 @@ export const AcquisitionPanel = (
                 <dl>
                   <dt>
                     <div className="tags mb-1">
-                      {settings.directConnect.client.hubs.map(({ value }) => (
-                        <span className="tag is-warning" key={value}>
-                          {value}
-                        </span>
-                      ))}
+                      {airDCPPConfiguration.airDCPPState.settings.directConnect.client.hubs.map(
+                        ({ value }) => (
+                          <span className="tag is-warning" key={value}>
+                            {value}
+                          </span>
+                        ),
+                      )}
                     </div>
                   </dt>
                   <dt>