From 6cdc47eb62ccc99cccf0720e008ed09590a29a71 Mon Sep 17 00:00:00 2001
From: Nikhil Tanwar <2002nikhiltanwar@gmail.com>
Date: Wed, 11 May 2022 15:48:22 +0530
Subject: [PATCH] Use real magnet link in download modal

Previously, on clicking Magnet, we were redirecting to a different site:
https://download.kiwix.org/zim/other/xyzBookWithDate.zim.magnet

This had the real magnet link as page content
Now we use the real magnet link in the href, thus not redirecting and starting the download right away.
Fix #767
---
 static/skin/index.js | 20 ++++++++++++++++----
 test/server.cpp      |  2 +-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/static/skin/index.js b/static/skin/index.js
index 5c435ac6b..62e6d5d6c 100644
--- a/static/skin/index.js
+++ b/static/skin/index.js
@@ -142,10 +142,21 @@
         }
     }
 
+    async function getMagnetLink(downloadLink) {
+        const magnetUrl = downloadLink + '.magnet';
+        const controller = new AbortController();
+        setTimeout(() => controller.abort(), 5000);
+        const magnetLink = await fetch(magnetUrl, { signal: controller.signal }).then(response => {
+            return response.ok ? response.text() : '';
+        }).catch((_error) => '');
+        return magnetLink;
+    }
+
     function insertModal(button) {
         const downloadLink = button.getAttribute('data-link');
-        button.addEventListener('click', (event) => {
+        button.addEventListener('click', async (event) => {
             event.preventDefault();
+            const magnetLink = await getMagnetLink(downloadLink);
             document.body.insertAdjacentHTML('beforeend', `<div class="modal-wrapper">
                 <div class="modal">
                     <div class="modal-heading">
@@ -181,12 +192,13 @@
                                 <div>Sha256 hash</div>
                             </a>
                         </div>
-                        <div class="modal-regular-download">
-                            <a href="${downloadLink}.magnet" target="_blank">
+                        ${magnetLink ? 
+                        `<div class="modal-regular-download">
+                            <a href="${magnetLink}" target="_blank">
                                 <img src="../skin/magnet.png?KIWIXCACHEID" alt="download magnet" />
                                 <div>Magnet link</div>
                             </a>
-                        </div>
+                        </div>` : ``}
                         <div class="modal-regular-download">
                             <a href="${downloadLink}.torrent" download>
                                 <img src="../skin/bittorrent.png?KIWIXCACHEID" alt="download torrent" />
diff --git a/test/server.cpp b/test/server.cpp
index 217f72b54..b3d5ec834 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -319,7 +319,7 @@ R"EXPECTEDRESULT(      src="/ROOT/skin/jquery-ui/external/jquery/jquery.js?cache
           src: url("/ROOT/skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
     <script src="/ROOT/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=0951f06f" defer></script>
+    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=c434aa35" defer></script>
 )EXPECTEDRESULT"
     },
     {