1 files changed, 30 insertions, 16 deletions

diff --git a/components/manga/panels/thirdPanel.js b/components/manga/panels/thirdPanel.js
index d402f07..f13b49d 100644
--- a/components/manga/panels/thirdPanel.js
+++ b/components/manga/panels/thirdPanel.js
@@ -5,10 +5,12 @@ import {
   ArrowsPointingInIcon,
 } from "@heroicons/react/24/outline";
 import { useAniList } from "../../../lib/anilist/useAnilist";
+import { getHeaders } from "@/utils/imageUtils";
 
 export default function ThirdPanel({
   aniId,
   data,
+  chapterData,
   hasRun,
   currentId,
   currentChapter,
@@ -20,6 +22,7 @@ export default function ThirdPanel({
   scaleImg,
   setMobileVisible,
   mobileVisible,
+  providerId,
 }) {
   const [index, setIndex] = useState(0);
   const [image, setImage] = useState(null);
@@ -28,6 +31,7 @@ export default function ThirdPanel({
   useEffect(() => {
     setIndex(0);
     setSeekPage(0);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [data, currentId]);
 
   const seekToIndex = (newIndex) => {
@@ -39,6 +43,7 @@ export default function ThirdPanel({
 
   useEffect(() => {
     seekToIndex(seekPage);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [seekPage]);
 
   useEffect(() => {
@@ -60,13 +65,14 @@ export default function ThirdPanel({
           setSeekPage(index + 1);
         }
         if (index + 1 >= image.length - 2 && !hasRun.current) {
-          let chapterNumber = currentChapter?.number;
-          if (chapterNumber % 1 !== 0) {
-            // If it's a decimal, round it
-            chapterNumber = Math.round(chapterNumber);
-          }
+          const current = chapterData.chapters?.find(
+            (x) => x.id === currentChapter.id
+          );
+          const chapterNumber = chapterData.chapters.indexOf(current) + 1;
 
-          markProgress(aniId, chapterNumber);
+          if (chapterNumber) {
+            markProgress(aniId, chapterNumber);
+          }
           hasRun.current = true;
         }
       }
@@ -77,6 +83,8 @@ export default function ThirdPanel({
     return () => {
       window.removeEventListener("keydown", handleKeyDown);
     };
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [index, image]);
 
   const handleNext = () => {
@@ -85,13 +93,15 @@ export default function ThirdPanel({
       setSeekPage(index + 1);
     }
     if (index + 1 >= image.length - 2 && !hasRun.current) {
-      let chapterNumber = currentChapter?.number;
-      if (chapterNumber % 1 !== 0) {
-        // If it's a decimal, round it
-        chapterNumber = Math.round(chapterNumber);
+      const current = chapterData.chapters?.find(
+        (x) => x.id === currentChapter.id
+      );
+      const chapterNumber = chapterData.chapters.indexOf(current) + 1;
+
+      if (chapterNumber) {
+        markProgress(aniId, chapterNumber);
       }
 
-      markProgress(aniId, chapterNumber);
       hasRun.current = true;
     }
   };
@@ -119,11 +129,15 @@ export default function ThirdPanel({
                 onClick={() => setMobileVisible(!mobileVisible)}
                 src={`https://api.consumet.org/utils/image-proxy?url=${encodeURIComponent(
                   image[image.length - index - 1]?.url
-                )}&headers=${encodeURIComponent(
-                  JSON.stringify({
-                    Referer: image[image.length - index - 1]?.headers.Referer,
-                  })
-                )}`}
+                )}${
+                  image[image.length - index - 1]?.headers?.Referer
+                    ? `&headers=${encodeURIComponent(
+                        JSON.stringify(image[image.length - index - 1]?.headers)
+                      )}`
+                    : `&headers=${encodeURIComponent(
+                        JSON.stringify(getHeaders(providerId))
+                      )}`
+                }`}
                 alt="Manga Page"
                 style={{
                   transform: `scale(${scaleImg})`,