2 files changed, 9 insertions, 30 deletions
diff --git a/pages/en/manga/[id].js b/pages/en/manga/[id].js
index eb53a93..bb3cbc2 100644
--- a/pages/en/manga/[id].js
+++ b/pages/en/manga/[id].js
@@ -9,12 +9,12 @@ import { useEffect, useState } from "react";
 import { setCookie } from "nookies";
 import { getServerSession } from "next-auth";
 import { authOptions } from "../../api/auth/[...nextauth]";
+import getAnifyInfo from "../../../lib/anify/info";
 
 export default function Manga({ info, userManga, chapters }) {
   const [domainUrl, setDomainUrl] = useState("");
   const [firstEp, setFirstEp] = useState();
-  const chaptersData =
-    info.chapters.data.length === 0 ? chapters : info.chapters.data;
+  const chaptersData = info.chapters.data;
 
   useEffect(() => {
     setDomainUrl(window.location.origin);
@@ -84,8 +84,7 @@ export async function getServerSideProps(context) {
 
   const { id } = context.query;
   const key = process.env.API_KEY;
-  const res = await fetch(`https://api.anify.tv/info/${id}?apikey=${key}`);
-  const data = await res.json();
+  const data = await getAnifyInfo(id, key);
 
   let userManga = null;
 
@@ -152,27 +151,10 @@ export async function getServerSideProps(context) {
     };
   }
 
-  let chapter = null;
-
-  if (data?.chapters?.data.length === 0) {
-    const res2 = await fetch(
-      `https://api.anify.tv/chapters/${id}?apikey=${key}`
-    );
-    const data2 = await res2.json();
-    if (data2.error) {
-      return {
-        notFound: true
-      }
-    } else {
-      chapter = data2; 
-    }
-  }
-
   return {
     props: {
       info: data,
       userManga,
-      chapters: chapter || null,
     },
   };
 }
diff --git a/pages/en/manga/read/[...params].js b/pages/en/manga/read/[...params].js
index dbabb3d..e608d16 100644
--- a/pages/en/manga/read/[...params].js
+++ b/pages/en/manga/read/[...params].js
@@ -15,6 +15,7 @@ import Head from "next/head";
 import nookies from "nookies";
 import ShortCutModal from "../../../../components/manga/modals/shortcutModal";
 import ChapterModal from "../../../../components/manga/modals/chapterModal";
+import getAnifyPage from "../../../../lib/anify/page";
 
 export default function Read({ data, currentId, sessions }) {
   const [info, setInfo] = useState();
@@ -228,6 +229,8 @@ export async function getServerSideProps(context) {
 
   const cookies = nookies.get(context);
 
+  const key = process.env.API_KEY;
+
   const query = context.query;
   const providerId = query.params[0];
   const chapterId = query.chapterId;
@@ -243,18 +246,12 @@ export async function getServerSideProps(context) {
 
   const session = await getServerSession(context.req, context.res, authOptions);
 
-  const key = process.env.API_KEY;
-  const res = await fetch(
-    `https://api.anify.tv/pages?providerId=${providerId}&readId=${encodeURIComponent(
-      chapterId
-    )}&apikey=${key}`
-  );
+  const data = await getAnifyPage(mediaId, providerId, chapterId, key);
 
-  const data = await res.json();
   if (data.error) {
     return {
-      notFound: true
-    }
+      notFound: true,
+    };
   }
 
   return {