action/notifications: fix webui base url for trailing slash #414

Author: bogenpirat

src/util/action.ts

@@ -1,11 +1,12 @@
 import { TorrentWebUI } from "../models/webui";
+import { addTrailingSlash } from "./utils";
 
 
 export function registerClickActionForIcon(webUi: TorrentWebUI | null): (tab: chrome.tabs.Tab) => Promise<void> {
     const clickActionListener = async (tab: chrome.tabs.Tab) => {
         if (webUi) {
             await chrome.tabs.create({
-                url: webUi.createBaseUrl(),
+                url: addTrailingSlash(webUi.createBaseUrl()),
                 active: true,
             });
         }

src/util/messaging.ts

@@ -13,7 +13,6 @@ import {
     IUpdateActionBadgeTextMessage,
     TestNotificationMessage
 } from "../models/messages";
-import { RTASettings } from "../models/settings";
 import { SerializedTorrent, Torrent, TorrentUploadConfig } from "../models/torrent";
 import { TorrentAddingResult, TorrentWebUI, WebUISettings } from "../models/webui";
 import { updateBadgeText } from "./action";
@@ -22,6 +21,7 @@ import { downloadTorrent } from "./download";
 import { showNotification } from "./notifications";
 import { serializeSettings, convertTorrentToSerialized, convertSerializedToTorrent, deserializeSettings } from "./serializer";
 import { Settings } from "./settings";
+import { addTrailingSlash } from "./utils";
 import { initiateWebUis } from "./webuis";
 
 
@@ -212,7 +212,7 @@ function downloadAndAddTorrentToWebUi(webUi: TorrentWebUI, url: string, config:
                             true,
                             settings.notificationsDurationMs,
                             settings.notificationsSoundEnabled,
-                            webUi.createBaseUrl());
+                            addTrailingSlash(webUi.createBaseUrl()));
             });
         } else {
             console.error("No WebUI found for addTorrentMessage:", message);
@@ -221,7 +221,7 @@ function downloadAndAddTorrentToWebUi(webUi: TorrentWebUI, url: string, config:
                         true,
                         settings.notificationsDurationMs,
                         settings.notificationsSoundEnabled,
-                        webUi.createBaseUrl());
+                        addTrailingSlash(webUi.createBaseUrl()));
         }
     });
 }
@@ -259,7 +259,7 @@ function getAutoLabelDirResultForConfig(torrent: Torrent, webUiSettings: WebUISe
 
 function sendTorrentToWebUi(webUi: TorrentWebUI, torrent: Torrent, config: TorrentUploadConfig | null) {
     new Settings().loadSettings().then(settings => {
-        const webUiUrl = webUi.createBaseUrl();
+        const webUiUrl = addTrailingSlash(webUi.createBaseUrl());
         webUi.sendTorrent(torrent, config).then((torrentAddingResult: TorrentAddingResult) => {
             console.log(`Torrent sent successfully: ${torrent.name} to -> ${webUi.name}`);
             if (settings.notificationsEnabled) {

src/util/utils.ts

@@ -14,3 +14,10 @@ export function clearListeners(listeners: RegisteredListeners): void {
 export function isMatchedByRegexes(url: string, regexes: RegExp[]): boolean {
     return regexes.some(regex => regex.test(url));
 }
+
+export function addTrailingSlash(url: string): string {
+    if (!url.endsWith("/")) {
+        return url + "/";
+    }
+    return url;
+}