Skip to content

Modern Docker Management, Designed for Everyone

chore(deps): bump github.com/nicholas-fedor/shoutrrr from 0.16.1 to 0.16.2 in /backend (#3396)

dependabot[bot]3e6c5dfd77fe
diff --git a/backend/go.mod b/backend/go.mod
index 475fef329..192761950 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -40,7 +40,7 @@ require (
github.com/moby/buildkit v0.31.2
github.com/moby/moby/api v1.55.0
github.com/moby/moby/client v0.5.0
- github.com/nicholas-fedor/shoutrrr v0.16.1
+ github.com/nicholas-fedor/shoutrrr v0.16.2
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.1.1
github.com/orandin/slog-gorm v1.4.0
@@ -159,7 +159,7 @@ require (
github.com/labstack/gommon v0.5.0 // indirect
github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e // indirect
github.com/mattn/go-colorable v0.1.15 // indirect
- github.com/mattn/go-isatty v0.0.22 // indirect
+ github.com/mattn/go-isatty v0.0.23 // indirect
github.com/mattn/go-runewidth v0.0.24 // indirect
github.com/mattn/go-shellwords v1.0.13 // indirect
github.com/mfridman/interpolate v0.0.2 // indirect
@@ -179,7 +179,7 @@ require (
github.com/morikuni/aec v1.1.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/ncruces/go-strftime v1.0.0 // indirect
- github.com/pelletier/go-toml/v2 v2.3.1 // indirect
+ github.com/pelletier/go-toml/v2 v2.4.3 // indirect
github.com/pjbgf/sha1cd v0.6.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
diff --git a/backend/go.sum b/backend/go.sum
index b73998342..669bdf04a 100644
--- a/backend/go.sum
+++ b/backend/go.sum
@@ -263,8 +263,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/google/go-containerregistry v0.21.7 h1:/vPFuVXDjtFREsVArW+0h1CIl5urnOhzei4X2DMW9IU=
github.com/google/go-containerregistry v0.21.7/go.mod h1:kjSbt7/zMsKLWfnHrIvKvhXHUw91jbe9DNjPPJ32gXE=
-github.com/google/pprof v0.0.0-20260604005048-7023385849c0 h1:h1QTMDl6q9wDvDCJVpKQSjgleGFYnd2fOxmg2K+6BGE=
-github.com/google/pprof v0.0.0-20260604005048-7023385849c0/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
+github.com/google/pprof v0.0.0-20260709232956-b9395ee17fa0 h1:du0WGc8xSKq/++e0cglxhS/mXVqsR7+c7jLEi5Vqduw=
+github.com/google/pprof v0.0.0-20260709232956-b9395ee17fa0/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -341,8 +341,8 @@ github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e h1:Q6MvJtQK/iRcRt
github.com/lufia/plan9stats v0.0.0-20260330125221-c963978e514e/go.mod h1:autxFIvghDt3jPTLoqZ9OZ7s9qTGNAWmYCjVFWPX/zg=
github.com/mattn/go-colorable v0.1.15 h1:+u9SLTRGnXv73cEsnsmoZBom+dMU88B2M0aDcWy0/jY=
github.com/mattn/go-colorable v0.1.15/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
-github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4=
-github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/mattn/go-isatty v0.0.23 h1:cYwCQTQf3HB6xUC+BtyCLZNr7IzbOmoZbmssVNzSyiQ=
+github.com/mattn/go-isatty v0.0.23/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A=
github.com/mattn/go-runewidth v0.0.24 h1:cpokDiIn0MGnhdHwuWnJBITySJ20QyNGnY2kR/ay2DU=
github.com/mattn/go-runewidth v0.0.24/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
github.com/mattn/go-shellwords v1.0.13 h1:DC0OMEpGjm6LfNFU4ckYcvbQKyp2vE8atyFGXNtDcf4=
@@ -393,14 +393,14 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
-github.com/nicholas-fedor/shoutrrr v0.16.1 h1:MOzl3U6zprA45lOTKaTbQW/9wzkR7SC36IFrTr5xfkU=
-github.com/nicholas-fedor/shoutrrr v0.16.1/go.mod h1:lii4gQKKSV2c32b+D93ysEdKpEzVla6HTbyOajpNDpo=
+github.com/nicholas-fedor/shoutrrr v0.16.2 h1:Tb5WQx/EPPqMlmrm6vVJU5DNfn23yOqQO3Sld6wF4wU=
+github.com/nicholas-fedor/shoutrrr v0.16.2/go.mod h1:pOg3rBMm0hh2ZL3Y/OZyZvWYHpNMHHT9RKRLSs3Bfb8=
github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s=
github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ=
-github.com/onsi/ginkgo/v2 v2.29.0 h1:rfh+ZFjgJhYWRoIqVf3Uwx/W20yLrcrE2h2GmYVRaag=
-github.com/onsi/ginkgo/v2 v2.29.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
-github.com/onsi/gomega v1.41.0 h1:OwKp4pXNgVxf6sCplzYo794OFNuoL2q2SBMU5NSWOjA=
-github.com/onsi/gomega v1.41.0/go.mod h1:M/Uqpu/8qTjtzCLUA2zJHX9Iilrau25x1PdoSRbWh5A=
+github.com/onsi/ginkgo/v2 v2.32.0 h1:Hw7s2pVrQo/8Yz5N77qdnpHaoc+c6cC9WIV1Jce+J6E=
+github.com/onsi/ginkgo/v2 v2.32.0/go.mod h1:+aXOY+vzZ5mu2iI2HpTZUPmM//oQfsNFX6gU9kNcA44=
+github.com/onsi/gomega v1.42.1 h1:iN1rCUX+44NZ1Dc97MPoeFYbFR0vh8zxoxMFwKdyZ6I=
+github.com/onsi/gomega v1.42.1/go.mod h1:REff/hsDsodHoKlWsP2mAPhu1+5/6hVYNf9rIEBpeSg=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
@@ -411,8 +411,8 @@ github.com/orandin/slog-gorm v1.4.0 h1:FgA8hJufF9/jeNSYoEXmHPPBwET2gwlF3B85JdpsT
github.com/orandin/slog-gorm v1.4.0/go.mod h1:MoZ51+b7xE9lwGNPYEhxcUtRNrYzjdcKvA8QXQQGEPA=
github.com/package-url/packageurl-go v0.1.1 h1:KTRE0bK3sKbFKAk3yy63DpeskU7Cvs/x/Da5l+RtzyU=
github.com/package-url/packageurl-go v0.1.1/go.mod h1:uQd4a7Rh3ZsVg5j0lNyAfyxIeGde9yrlhjF78GzeW0c=
-github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc=
-github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
+github.com/pelletier/go-toml/v2 v2.4.3 h1:GTRvJQutkOSftxIFD5xw9aepkYNuPWmVJpffdDPYVpY=
+github.com/pelletier/go-toml/v2 v2.4.3/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
github.com/pjbgf/sha1cd v0.6.0 h1:3WJ8Wz8gvDz29quX1OcEmkAlUg9diU4GxJHqs0/XiwU=
github.com/pjbgf/sha1cd v0.6.0/go.mod h1:lhpGlyHLpQZoxMv8HcgXvZEhcGs0PG/vsZnEJ7H0iCM=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -650,8 +650,8 @@ golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q=
-golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA=
+golang.org/x/tools v0.48.0 h1:3+hClM1aLL5mjMKm5ovokw9epgRXPuu2tILgismM6RE=
+golang.org/x/tools v0.48.0/go.mod h1:08xX0orndb/F7jJxGDicx061tyd5pcMto75YMAXr6lk=
gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8=
diff --git a/backend/internal/models/notification.go b/backend/internal/models/notification.go
index 0db659488..964f55b25 100644
--- a/backend/internal/models/notification.go
+++ b/backend/internal/models/notification.go
@@ -158,14 +158,16 @@ type PushoverConfig struct {
}
type GotifyConfig struct {
- Host string `json:"host"`
- Port int `json:"port,omitempty"`
- Token string `json:"token"`
- Path string `json:"path,omitempty"`
- Priority int `json:"priority,omitempty"`
- Title string `json:"title,omitempty"`
- DisableTLS bool `json:"disableTls"`
- Events map[NotificationEventType]bool `json:"events,omitempty"`
+ Host string `json:"host"`
+ Port int `json:"port,omitempty"`
+ Token string `json:"token"`
+ Path string `json:"path,omitempty"`
+ Priority int `json:"priority,omitempty"`
+ Title string `json:"title,omitempty"`
+ DisableTLS bool `json:"disableTls"`
+ InsecureSkipVerify bool `json:"insecureSkipVerify"`
+ UseHeader bool `json:"useHeader"`
+ Events map[NotificationEventType]bool `json:"events,omitempty"`
}
type MatrixConfig struct {
diff --git a/backend/pkg/utils/notifications/discord_sender.go b/backend/pkg/utils/notifications/discord_sender.go
index a3dc39259..48f72f671 100644
--- a/backend/pkg/utils/notifications/discord_sender.go
+++ b/backend/pkg/utils/notifications/discord_sender.go
@@ -8,6 +8,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
"github.com/nicholas-fedor/shoutrrr"
"github.com/nicholas-fedor/shoutrrr/pkg/services/chat/discord"
+ shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types"
)
// BuildDiscordURL converts DiscordConfig to Shoutrrr URL format using shoutrrr's Config
@@ -37,7 +38,7 @@ func SendDiscord(ctx context.Context, config models.DiscordConfig, message strin
return errors.WrapIf(err, "failed to build shoutrrr Discord URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Discord sender")
}
diff --git a/backend/pkg/utils/notifications/generic_sender.go b/backend/pkg/utils/notifications/generic_sender.go
index eac32e9d9..2cf847d43 100644
--- a/backend/pkg/utils/notifications/generic_sender.go
+++ b/backend/pkg/utils/notifications/generic_sender.go
@@ -146,7 +146,7 @@ func SendGenericWithTitle(ctx context.Context, config models.GenericConfig, titl
return errors.WrapIf(err, "failed to build shoutrrr Generic URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Generic sender")
}
diff --git a/backend/pkg/utils/notifications/gotify_sender.go b/backend/pkg/utils/notifications/gotify_sender.go
index 2246725c9..de33a554d 100644
--- a/backend/pkg/utils/notifications/gotify_sender.go
+++ b/backend/pkg/utils/notifications/gotify_sender.go
@@ -53,6 +53,12 @@ func BuildGotifyURL(config models.GotifyConfig) (string, error) {
if config.DisableTLS {
q.Set("disabletls", "yes")
}
+ if config.InsecureSkipVerify {
+ q.Set("insecureskipverify", "yes")
+ }
+ if config.UseHeader {
+ q.Set("useheader", "yes")
+ }
u.RawQuery = q.Encode()
return u.String(), nil
@@ -65,7 +71,7 @@ func SendGotify(ctx context.Context, config models.GotifyConfig, message string)
return errors.WrapIf(err, "failed to build shoutrrr Gotify URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Gotify sender")
}
diff --git a/backend/pkg/utils/notifications/gotify_sender_test.go b/backend/pkg/utils/notifications/gotify_sender_test.go
index b3213e847..45423cad0 100644
--- a/backend/pkg/utils/notifications/gotify_sender_test.go
+++ b/backend/pkg/utils/notifications/gotify_sender_test.go
@@ -47,16 +47,18 @@ func TestBuildGotifyURL(t *testing.T) {
{
name: "config with all options",
config: models.GotifyConfig{
- Host: "gotify.example.com",
- Port: 80,
- Path: "mysubpath",
- Token: "A12345678901234",
- Priority: 5,
- Title: "My Title",
- DisableTLS: true,
+ Host: "gotify.example.com",
+ Port: 80,
+ Path: "mysubpath",
+ Token: "A12345678901234",
+ Priority: 5,
+ Title: "My Title",
+ DisableTLS: true,
+ InsecureSkipVerify: true,
+ UseHeader: true,
},
wantErr: false,
- expected: "gotify://gotify.example.com:80/mysubpath/A12345678901234?disabletls=yes&priority=5&title=My+Title",
+ expected: "gotify://gotify.example.com:80/mysubpath/A12345678901234?disabletls=yes&insecureskipverify=yes&priority=5&title=My+Title&useheader=yes",
},
{
name: "missing host",
diff --git a/backend/pkg/utils/notifications/matrix_sender.go b/backend/pkg/utils/notifications/matrix_sender.go
index cdb27fa65..06eeff81c 100644
--- a/backend/pkg/utils/notifications/matrix_sender.go
+++ b/backend/pkg/utils/notifications/matrix_sender.go
@@ -64,7 +64,7 @@ func SendMatrix(ctx context.Context, config models.MatrixConfig, message string)
return errors.WrapIf(err, "failed to build shoutrrr Matrix URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Matrix sender")
}
diff --git a/backend/pkg/utils/notifications/ntfy_sender.go b/backend/pkg/utils/notifications/ntfy_sender.go
index 32d2afa24..77186d792 100644
--- a/backend/pkg/utils/notifications/ntfy_sender.go
+++ b/backend/pkg/utils/notifications/ntfy_sender.go
@@ -101,7 +101,7 @@ func SendNtfy(ctx context.Context, config models.NtfyConfig, message string) err
return errors.WrapIf(err, "failed to build shoutrrr Ntfy URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Ntfy sender")
}
diff --git a/backend/pkg/utils/notifications/pushover_sender.go b/backend/pkg/utils/notifications/pushover_sender.go
index dbdbf4a28..6f27514ed 100644
--- a/backend/pkg/utils/notifications/pushover_sender.go
+++ b/backend/pkg/utils/notifications/pushover_sender.go
@@ -10,6 +10,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
"github.com/nicholas-fedor/shoutrrr"
+ shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types"
)
// BuildPushoverURL converts PushoverConfig to Shoutrrr URL format.
@@ -73,7 +74,7 @@ func SendPushover(ctx context.Context, config models.PushoverConfig, message str
return errors.WrapIf(err, "failed to build shoutrrr Pushover URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Pushover sender")
}
diff --git a/backend/pkg/utils/notifications/signal_sender.go b/backend/pkg/utils/notifications/signal_sender.go
index 050892206..4d41f1c3f 100644
--- a/backend/pkg/utils/notifications/signal_sender.go
+++ b/backend/pkg/utils/notifications/signal_sender.go
@@ -8,6 +8,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
"github.com/nicholas-fedor/shoutrrr"
"github.com/nicholas-fedor/shoutrrr/pkg/services/chat/signal"
+ shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types"
)
// BuildSignalURL converts SignalConfig to Shoutrrr URL format using shoutrrr's Config
@@ -57,7 +58,7 @@ func SendSignal(ctx context.Context, config models.SignalConfig, message string)
return errors.WrapIf(err, "failed to build shoutrrr Signal URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Signal sender")
}
diff --git a/backend/pkg/utils/notifications/slack_sender.go b/backend/pkg/utils/notifications/slack_sender.go
index 986fc99af..657ae9676 100644
--- a/backend/pkg/utils/notifications/slack_sender.go
+++ b/backend/pkg/utils/notifications/slack_sender.go
@@ -8,6 +8,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
"github.com/nicholas-fedor/shoutrrr"
"github.com/nicholas-fedor/shoutrrr/pkg/services/chat/slack"
+ shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types"
)
// BuildSlackURL converts SlackConfig to Shoutrrr URL format using shoutrrr's Config
@@ -47,7 +48,7 @@ func SendSlack(ctx context.Context, config models.SlackConfig, message string) e
return errors.WrapIf(err, "failed to build shoutrrr Slack URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Slack sender")
}
diff --git a/backend/pkg/utils/notifications/telegram_sender.go b/backend/pkg/utils/notifications/telegram_sender.go
index 3670b4938..f9796924f 100644
--- a/backend/pkg/utils/notifications/telegram_sender.go
+++ b/backend/pkg/utils/notifications/telegram_sender.go
@@ -8,6 +8,7 @@ import (
"github.com/getarcaneapp/arcane/backend/v2/internal/models"
"github.com/nicholas-fedor/shoutrrr"
"github.com/nicholas-fedor/shoutrrr/pkg/services/chat/telegram"
+ shoutrrrTypes "github.com/nicholas-fedor/shoutrrr/pkg/types"
)
// BuildTelegramURL converts TelegramConfig to Shoutrrr URL format using shoutrrr's Config
@@ -52,7 +53,7 @@ func SendTelegram(ctx context.Context, config models.TelegramConfig, message str
return errors.WrapIf(err, "failed to build shoutrrr Telegram URL")
}
- sender, err := shoutrrr.CreateSender(shoutrrrURL)
+ sender, err := shoutrrr.CreateSenderWithOptions(shoutrrrTypes.SenderOptions{}, shoutrrrURL)
if err != nil {
return errors.WrapIf(err, "failed to create shoutrrr Telegram sender")
}
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 9e8e64ff7..5e32a7e4e 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -2298,6 +2298,10 @@
"notifications_gotify_path_placeholder": "/gotify",
"notifications_gotify_path_help": "Optional subpath if Gotify is installed in a subdirectory",
"notifications_gotify_priority_help": "Priority level (-2 to 10). Higher values are more urgent",
+ "notifications_gotify_use_header_label": "Header Authentication",
+ "notifications_gotify_use_header_help": "Send the application token in the X-Gotify-Key header instead of the URL query string",
+ "skip_tls_verification": "Skip TLS Verification",
+ "skip_tls_verification_help": "Skip TLS certificate verification. Only enable for self-signed certificates",
"disable_tls": "Disable TLS",
"use_http_instead_of_https_not_recommended_for_production": "Use HTTP instead of HTTPS (not recommended for production)",
"notifications_matrix_description": "Send notifications via Matrix when container updates are detected",
diff --git a/frontend/src/lib/types/notifications.ts b/frontend/src/lib/types/notifications.ts
index 0ca442a0a..85c519a46 100644
--- a/frontend/src/lib/types/notifications.ts
+++ b/frontend/src/lib/types/notifications.ts
@@ -136,6 +136,8 @@ export interface GotifyFormValues extends BaseProviderFormValues {
priority: number;
title: string;
disableTls: boolean;
+ insecureSkipVerify: boolean;
+ useHeader: boolean;
}
export interface MatrixFormValues extends BaseProviderFormValues {
@@ -473,6 +475,8 @@ export function gotifySettingsToFormValues(settings?: NotificationSettings): Got
priority: Number(cfg['priority'] ?? 0),
title: getString(cfg, 'title'),
disableTls: getBoolean(cfg, 'disableTls', false),
+ insecureSkipVerify: getBoolean(cfg, 'insecureSkipVerify', false),
+ useHeader: getBoolean(cfg, 'useHeader', false),
...eventFlagsToFormValues(events)
};
}
@@ -581,6 +585,8 @@ export function gotifyFormValuesToSettings(values: GotifyFormValues): Notificati
priority: values.priority,
title: values.title,
disableTls: values.disableTls,
+ insecureSkipVerify: values.insecureSkipVerify,
+ useHeader: values.useHeader,
events: {
image_update: values.eventImageUpdate,
container_update: values.eventContainerUpdate,
diff --git a/frontend/src/routes/(app)/settings/notifications/+page.svelte b/frontend/src/routes/(app)/settings/notifications/+page.svelte
index 43f7e53a5..3f51945bb 100644
--- a/frontend/src/routes/(app)/settings/notifications/+page.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/+page.svelte
@@ -45,6 +45,7 @@
genericFormValuesToSettings
} from '#lib/types/notifications';
import { NotificationsIcon } from '#lib/icons';
+ import { TabBar, type TabItem } from '#lib/components/tab-bar';
import { BuiltInProviderForm } from './providers';
let { data } = $props();
@@ -59,6 +60,13 @@
defaultTab: () => 'email'
});
const providerTab = $derived(urlTab.value);
+ const providerTabItems = NOTIFICATION_PROVIDER_KEYS.map(
+ (provider) =>
+ ({
+ value: provider,
+ label: provider.charAt(0).toUpperCase() + provider.slice(1)
+ }) satisfies TabItem
+ );
const isReadOnly = $derived.by(() => $settingsStore.uiConfigDisabled);
@@ -434,14 +442,8 @@
>
{#snippet mainContent()}
<fieldset disabled={isReadOnly} class="relative w-full min-w-0">
- <Tabs.Root value={providerTab} onValueChange={urlTab.select} class="flex min-h-0 w-full min-w-0 flex-col">
- <Tabs.List class="scrollbar-hide flex w-full max-w-full justify-start gap-4 overflow-x-auto">
- {#each NOTIFICATION_PROVIDER_KEYS as provider (provider)}
- <Tabs.Trigger value={provider} class="shrink-0">
- {provider.charAt(0).toUpperCase() + provider.slice(1)}
- </Tabs.Trigger>
- {/each}
- </Tabs.List>
+ <Tabs.Root value={providerTab} class="flex min-h-0 w-full min-w-0 flex-col">
+ <TabBar items={providerTabItems} value={providerTab} onValueChange={urlTab.select} class="self-start" />
<Tabs.Content value="email" class="mt-4 space-y-4">
<BuiltInProviderForm
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
index 137d07520..8cf0d2f19 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/BuiltInProviderForm.svelte
@@ -312,9 +312,11 @@
port: z.coerce.number().int().min(0).max(65535),
token: z.string(),
path: z.string(),
- priority: z.coerce.number().int(),
+ priority: z.coerce.number().int().min(-2).max(10),
title: z.string(),
disableTls: z.boolean(),
+ insecureSkipVerify: z.boolean(),
+ useHeader: z.boolean(),
...eventSubscriptionSchemaFields
})
.superRefine((d, ctx) => {
@@ -939,6 +941,20 @@
id: 'gotify-disable-tls',
label: m.disable_tls(),
description: m.use_http_instead_of_https_not_recommended_for_production()
+ },
+ {
+ kind: 'switch',
+ key: 'insecureSkipVerify',
+ id: 'gotify-insecure-skip-verify',
+ label: m.skip_tls_verification(),
+ description: m.skip_tls_verification_help()
+ },
+ {
+ kind: 'switch',
+ key: 'useHeader',
+ id: 'gotify-use-header',
+ label: m.notifications_gotify_use_header_label(),
+ description: m.notifications_gotify_use_header_help()
}
],
matrix: [
diff --git a/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte b/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
index 96a00a6eb..79afc3bb0 100644
--- a/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
+++ b/frontend/src/routes/(app)/settings/notifications/providers/ProviderFormWrapper.svelte
@@ -15,7 +15,6 @@
</script>
<div class="space-y-4">
- <h3 class="text-base font-semibold">{title}</h3>
<SettingsRow label={title} {description} layout="inline">
<Switch id="{id}-enabled" bind:checked={enabled} {disabled} />
</SettingsRow>