From 1631ba34784d8231c422f46493fd957c0fa0e010 Mon Sep 17 00:00:00 2001
From: Ryan Mwangi <ryannganga13325@gmail.com>
Date: Mon, 4 Nov 2024 13:56:48 +0300
Subject: [PATCH] Fetch calendar data from URL

---
 server.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/server.js b/server.js
index 7956e34..8c72c89 100644
--- a/server.js
+++ b/server.js
@@ -52,7 +52,7 @@ app.post('/merge', async (req, res) => {
                     // Read calendar data from local file
                     const data = fs.readFileSync(path.resolve(calendar.url), 'utf-8');
                     return Promise.resolve({
-                        url: data,
+                        data: data,
                         prefix: calendar.prefix,
                         override: calendar.override,
                     });
@@ -62,18 +62,19 @@ app.post('/merge', async (req, res) => {
                     return Promise.resolve(null);
                 }
             } else {
-            return axios.get(calendar.url)
-                .then((response) => {
-                    return {
-                        data: response.data,
-                        prefix: calendar.prefix,
-                        override: calendar.override,
-                    };
-                })
-                .catch((error) => {
-                    console.error(`Error fetching calendar from ${calendar.url}:`, error);
-                    return null;
-                });
+                // Fetch calendar data from URL
+                return axios.get(calendar.url)
+                    .then((response) => {
+                        return {
+                            data: response.data,
+                            prefix: calendar.prefix,
+                            override: calendar.override,
+                        };
+                    })
+                    .catch((error) => {
+                        console.error(`Error fetching calendar from ${calendar.url}:`, error);
+                        return null;
+                    });
             }
         });