Resolved merge conflicts

consumet · Dec 21, 2024 · 1441604 · 1441604
1 parent 2bcc716
commit 1441604
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 47 deletions.
diff --git a/src/routes/movies/dramacool.ts b/src/routes/movies/dramacool.ts
@@ -8,28 +8,13 @@ const routes = async (fastify: FastifyInstance, options: RegisterOptions) => {
   fastify.get('/', (_, rp) => {
     rp.status(200).send({
       intro:
-<<<<<<< HEAD
-        "Welcome to the flixhq provider: check out the provider's website @ https://flixhq.to/",
-      routes: ['/:query', '/info', '/watch'],
-      documentation: 'https://docs.consumet.org/#tag/flixhq',
-=======
         "Welcome to the dramacool provider: check out the provider's website @ https://dramacool.com.pa/",
       routes: ['/:query', '/info', '/watch', '/popular','/recent-movies', '/recent-shows'],
       documentation: 'https://docs.consumet.org/#tag/dramacool',
->>>>>>> upstream/main
     });
   });
 
   fastify.get('/:query', async (request: FastifyRequest, reply: FastifyReply) => {
-<<<<<<< HEAD
-    const query = decodeURIComponent((request.params as { query: string }).query);
-
-    const page = (request.query as { page: number }).page;
-
-    const res = await dramacool.search(query, page);
-
-    reply.status(200).send(res);
-=======
     try {
       const query = decodeURIComponent((request.params as { query: string }).query);
 
@@ -44,7 +29,6 @@ const routes = async (fastify: FastifyInstance, options: RegisterOptions) => {
           'Something went wrong. Please try again later. or contact the developers.',
       });
     }
->>>>>>> upstream/main
   });
 
   fastify.get('/info', async (request: FastifyRequest, reply: FastifyReply) => {
@@ -100,8 +84,6 @@ const routes = async (fastify: FastifyInstance, options: RegisterOptions) => {
         .send({ message: 'Something went wrong. Please try again later.' });
     }
   })
-<<<<<<< HEAD
-=======
 
   fastify.get("/recent-movies", async (request: FastifyRequest, reply: FastifyReply) => {
     const page = (request.query as { page: number }).page;
@@ -126,7 +108,6 @@ const routes = async (fastify: FastifyInstance, options: RegisterOptions) => {
         .send({ message: 'Something went wrong. Please try again later.' });
     }
   })
->>>>>>> upstream/main
 };
 
 export default routes;
diff --git a/src/routes/movies/flixhq.ts b/src/routes/movies/flixhq.ts
@@ -13,11 +13,7 @@ const routes = async (fastify: FastifyInstance, options: RegisterOptions) => {
     rp.status(200).send({
       intro:
         "Welcome to the flixhq provider: check out the provider's website @ https://flixhq.to/",
-<<<<<<< HEAD
-      routes: ['/:query', '/info', '/watch','/recent-shows','/recent-movies','/trending','/servers'],
-=======
       routes: ['/:query', '/info', '/watch','/recent-shows','/recent-movies','/trending','/servers','/country','/genre'],
->>>>>>> upstream/main
       documentation: 'https://docs.consumet.org/#tag/flixhq',
     });
   });
@@ -210,29 +206,6 @@ const routes = async (fastify: FastifyInstance, options: RegisterOptions) => {
   });
 
 
-<<<<<<< HEAD
-fastify.get('/genre/:genre', async (request: FastifyRequest, reply: FastifyReply) => {
-  const genre = (request.params as { genre: string }).genre;
-  const page = (request.query as { page: number }).page ?? 1;
-  try {
-    let res = redis
-      ? await cache.fetch(
-        redis as Redis,
-        `flixhq:genre:${genre}:${page}`,
-        async () => await flixhq.fetchByGenre(genre, page),
-        60 * 60 * 3,
-      )
-      : await flixhq.fetchByGenre(genre, page);
-
-    reply.status(200).send(res);
-  } catch (error) {
-    reply.status(500).send({
-      message:
-        'Something went wrong. Please try again later. or contact the developers.',
-    });
-  }
-});
-=======
   fastify.get('/genre/:genre', async (request: FastifyRequest, reply: FastifyReply) => {
     const genre = (request.params as { genre: string }).genre;
     const page = (request.query as { page: number }).page ?? 1;
@@ -254,6 +227,5 @@ fastify.get('/genre/:genre', async (request: FastifyRequest, reply: FastifyReply
       });
     }
   });
->>>>>>> upstream/main
 };
 export default routes;