This commit is contained in:
db-2001 2024-06-10 22:19:46 -04:00
parent 59bfb0e0c4
commit 23ecbd1b20
3 changed files with 19 additions and 14 deletions

View File

@ -338,8 +338,8 @@ function TestLunaSea(lunaseaWebhook){
} }
//Ntfy //Ntfy
function UpdateNtfy(ntfyEndpoint, ntfyAuth){ function UpdateNtfy(ntfyEndpoint, ntfyUser, ntfyPass){
var uri = `${apiUri}/NotificationConnectors/Update?notificationConnector=Ntfy&ntfyUrl=${ntfyEndpoint}&ntfyAuth=${ntfyAuth}`; var uri = `${apiUri}/NotificationConnectors/Update?notificationConnector=Ntfy&ntfyUrl=${ntfyEndpoint}&ntfyUser=${ntfyUser}&ntfyPass=${ntfyPass}`;
PostData(uri); PostData(uri);
} }
@ -348,8 +348,8 @@ function ResetNtfy(){
PostData(uri); PostData(uri);
} }
function TestNtfy(ntfyEndpoint, ntfyAuth){ function TestNtfy(ntfyEndpoint, ntfyUser, ntfyPass){
var uri = `${apiUri}/NotificationConnectors/Test?notificationConnector=Ntfy&ntfyUrl=${ntfyEndpoint}&ntfyAuth=${ntfyAuth}`; var uri = `${apiUri}/NotificationConnectors/Test?notificationConnector=Ntfy&ntfyUrl=${ntfyEndpoint}&ntfyUser=${ntfyUser}&ntfyPass=${ntfyPass}}`;
PostData(uri); PostData(uri);
} }

View File

@ -235,11 +235,12 @@
<div class="section-item"> <div class="section-item">
<span class="title"><img src='connector-icons/ntfy.svg'>Ntfy<connector-configured id="ntfyConfigured"></connector-configured></span> <span class="title"><img src='connector-icons/ntfy.svg'>Ntfy<connector-configured id="ntfyConfigured"></connector-configured></span>
<label for="ntfyEndpoint"></label><input placeholder="URL" id="ntfyEndpoint" type="text"> <label for="ntfyEndpoint"></label><input placeholder="URL" id="ntfyEndpoint" type="text">
<label for="ntfyAuth"></label><input placeholder="Auth" id="ntfyAuth" type="text"> <label for="ntfyUser"></label><input placeholder="Username" id="ntfyUser" type="text">
<label for="ntfyPass"></label><input placeholder="Password" id="ntfyPass" type="password">
<div class="section-buttons-container"> <div class="section-buttons-container">
<span onclick="TestNtfy(ntfyEndpoint.value, ntfyAuth.value);" class='section-button' id="test-connector">Test</span> <span onclick="TestNtfy(ntfyEndpoint.value, ntfyUser.value, ntfyPass.value);" class='section-button' id="test-connector">Test</span>
<span onclick="ClearNtfy()" class='section-button' id="reset">Reset</span> <span onclick="ClearNtfy()" class='section-button' id="reset">Reset</span>
<span onclick="UpdateNtfy(ntfyEndpoint.value, ntfyAuth.value);" class='section-button'>Apply</span> <span onclick="UpdateNtfy(ntfyEndpoint.value, ntfyUser.value, ntfyPass.value);" class='section-button'>Apply</span>
</div> </div>
</div> </div>
</div> </div>

View File

@ -60,7 +60,8 @@ const settingLunaseaWebhook = document.querySelector("#lunaseaWebhook");
//Ntfy //Ntfy
const settingNtfyEndpoint = document.querySelector("#ntfyEndpoint"); const settingNtfyEndpoint = document.querySelector("#ntfyEndpoint");
const settingNtfyAuth = document.querySelector("#ntfyAuth"); const settingNtfyUser = document.querySelector("#ntfyUser");
const settingNtfyPass = document.querySelector("#ntfyPass");
//Connector Configured //Connector Configured
const settingKomgaConfigured = document.querySelector("#komgaConfigured"); const settingKomgaConfigured = document.querySelector("#komgaConfigured");
@ -758,7 +759,7 @@ settingGotifyUrl.addEventListener("keypress", (event) => { if(event.key === "Ent
settingGotifyAppToken.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingGotifyAppToken.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); });
settingLunaseaWebhook.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingLunaseaWebhook.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); });
settingNtfyEndpoint.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingNtfyEndpoint.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); });
settingNtfyAuth.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingNtfyPass.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); });
settingUserAgent.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingUserAgent.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); });
settingApiUri.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); }); settingApiUri.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings(); });
@ -785,7 +786,8 @@ function OpenSettings(){
settingGotifyUrl.value = ""; settingGotifyUrl.value = "";
settingGotifyAppToken.value = ""; settingGotifyAppToken.value = "";
settingLunaseaWebhook.value = ""; settingLunaseaWebhook.value = "";
settingNtfyAuth.value = ""; settingNtfyUser.value = "";
settingNtfyPass.value = "";
settingNtfyEndpoint.value = ""; settingNtfyEndpoint.value = "";
settingUserAgent.value = ""; settingUserAgent.value = "";
settingApiUri.value = ""; settingApiUri.value = "";
@ -850,7 +852,8 @@ function OpenSettings(){
case "Ntfy": case "Ntfy":
settingNtfyConfigured.setAttribute("configuration", "Active"); settingNtfyConfigured.setAttribute("configuration", "Active");
settingNtfyEndpoint.placeholder = connector.endpoint; settingNtfyEndpoint.placeholder = connector.endpoint;
settingNtfyAuth.placeholder = "***"; settingNtfyUser.placeholder = "***"
settingNtfyPass.placeholder = "***";
break; break;
default: default:
console.log("Unknown type"); console.log("Unknown type");
@ -893,7 +896,8 @@ function ClearLunasea(){
function ClearNtfy(){ function ClearNtfy(){
settingNtfyEndpoint.value = ""; settingNtfyEndpoint.value = "";
settingNtfyAuth.value = ""; settingNtfyUser.value = "";
settingNtfyPass.value = "";
settingNtfyConfigured.setAttribute("configuration", "Not Configured"); settingNtfyConfigured.setAttribute("configuration", "Not Configured");
ResetNtfy(); ResetNtfy();
} }
@ -927,8 +931,8 @@ function UpdateSettings(){
} }
if(settingNtfyEndpoint.value != "" && if(settingNtfyEndpoint.value != "" &&
settingNtfyAuth.value != ""){ settingNtfyUser.value != ""){
UpdateNtfy(settingNtfyEndpoint.value, settingNtfyAuth.value); UpdateNtfy(settingNtfyEndpoint.value, settingNtfyUser.value, settingNtfyPass.value);
} }
if(settingUserAgent.value != ""){ if(settingUserAgent.value != ""){