Nunux Keeper
diff --git a/internal/ui/feed_edit.go b/internal/ui/feed_edit.go
index e91b93c7..21cf5dc2 100644
--- a/internal/ui/feed_edit.go
+++ b/internal/ui/feed_edit.go
@@ -64,6 +64,8 @@ func (h *handler) showEditFeedPage(w http.ResponseWriter, r *http.Request) {
CategoryHidden: feed.Category.HideGlobally,
AppriseServiceURLs: feed.AppriseServiceURLs,
DisableHTTP2: feed.DisableHTTP2,
+ NtfyEnabled: feed.NtfyEnabled,
+ NtfyPriority: feed.NtfyPriority,
}
sess := session.New(h.store, request.SessionID(r))
diff --git a/internal/ui/form/feed.go b/internal/ui/form/feed.go
index c5345e9d..b9b05bc4 100644
--- a/internal/ui/form/feed.go
+++ b/internal/ui/form/feed.go
@@ -36,6 +36,8 @@ type FeedForm struct {
CategoryHidden bool // Category has "hide_globally"
AppriseServiceURLs string
DisableHTTP2 bool
+ NtfyEnabled bool
+ NtfyPriority int
}
// Merge updates the fields of the given feed.
@@ -65,6 +67,8 @@ func (f FeedForm) Merge(feed *model.Feed) *model.Feed {
feed.HideGlobally = f.HideGlobally
feed.AppriseServiceURLs = f.AppriseServiceURLs
feed.DisableHTTP2 = f.DisableHTTP2
+ feed.NtfyEnabled = f.NtfyEnabled
+ feed.NtfyPriority = f.NtfyPriority
return feed
}
@@ -74,6 +78,10 @@ func NewFeedForm(r *http.Request) *FeedForm {
if err != nil {
categoryID = 0
}
+ ntfyPriority, err := strconv.Atoi(r.FormValue("ntfy_priority"))
+ if err != nil {
+ ntfyPriority = 0
+ }
return &FeedForm{
FeedURL: r.FormValue("feed_url"),
SiteURL: r.FormValue("site_url"),
@@ -98,5 +106,7 @@ func NewFeedForm(r *http.Request) *FeedForm {
HideGlobally: r.FormValue("hide_globally") == "1",
AppriseServiceURLs: r.FormValue("apprise_service_urls"),
DisableHTTP2: r.FormValue("disable_http2") == "1",
+ NtfyEnabled: r.FormValue("ntfy_enabled") == "1",
+ NtfyPriority: ntfyPriority,
}
}
diff --git a/internal/ui/form/integration.go b/internal/ui/form/integration.go
index 5a6ac271..a60e9100 100644
--- a/internal/ui/form/integration.go
+++ b/internal/ui/form/integration.go
@@ -103,6 +103,13 @@ type IntegrationForm struct {
BetulaEnabled bool
BetulaURL string
BetulaToken string
+ NtfyEnabled bool
+ NtfyTopic string
+ NtfyURL string
+ NtfyAPIToken string
+ NtfyUsername string
+ NtfyPassword string
+ NtfyIconURL string
}
// Merge copy form values to the model.
@@ -195,6 +202,13 @@ func (i IntegrationForm) Merge(integration *model.Integration) {
integration.BetulaEnabled = i.BetulaEnabled
integration.BetulaURL = i.BetulaURL
integration.BetulaToken = i.BetulaToken
+ integration.NtfyEnabled = i.NtfyEnabled
+ integration.NtfyTopic = i.NtfyTopic
+ integration.NtfyURL = i.NtfyURL
+ integration.NtfyAPIToken = i.NtfyAPIToken
+ integration.NtfyUsername = i.NtfyUsername
+ integration.NtfyPassword = i.NtfyPassword
+ integration.NtfyIconURL = i.NtfyIconURL
}
// NewIntegrationForm returns a new IntegrationForm.
@@ -290,6 +304,13 @@ func NewIntegrationForm(r *http.Request) *IntegrationForm {
BetulaEnabled: r.FormValue("betula_enabled") == "1",
BetulaURL: r.FormValue("betula_url"),
BetulaToken: r.FormValue("betula_token"),
+ NtfyEnabled: r.FormValue("ntfy_enabled") == "1",
+ NtfyTopic: r.FormValue("ntfy_topic"),
+ NtfyURL: r.FormValue("ntfy_url"),
+ NtfyAPIToken: r.FormValue("ntfy_api_token"),
+ NtfyUsername: r.FormValue("ntfy_username"),
+ NtfyPassword: r.FormValue("ntfy_password"),
+ NtfyIconURL: r.FormValue("ntfy_icon_url"),
}
}
diff --git a/internal/ui/integration_show.go b/internal/ui/integration_show.go
index 0e93093f..8cc3bfe6 100644
--- a/internal/ui/integration_show.go
+++ b/internal/ui/integration_show.go
@@ -117,6 +117,13 @@ func (h *handler) showIntegrationPage(w http.ResponseWriter, r *http.Request) {
BetulaEnabled: integration.BetulaEnabled,
BetulaURL: integration.BetulaURL,
BetulaToken: integration.BetulaToken,
+ NtfyEnabled: integration.NtfyEnabled,
+ NtfyTopic: integration.NtfyTopic,
+ NtfyURL: integration.NtfyURL,
+ NtfyAPIToken: integration.NtfyAPIToken,
+ NtfyUsername: integration.NtfyUsername,
+ NtfyPassword: integration.NtfyPassword,
+ NtfyIconURL: integration.NtfyIconURL,
}
sess := session.New(h.store, request.SessionID(r))