1
0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-22 09:00:10 +00:00

jellyseer: auto-null NotifTypes field

changed to a pointer so it can be nil-ed, and an Empty() receiver method
is used to check if it needs it in ApplyNotificationsTemplateToUser.
This commit is contained in:
Harvey Tindall 2024-07-30 16:49:35 +01:00
parent a97bccc88f
commit 769a7c45da
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 15 additions and 8 deletions

View File

@ -356,6 +356,9 @@ func (js *Jellyseerr) GetNotificationPreferencesByID(jellyseerrID int64) (Notifi
} }
func (js *Jellyseerr) ApplyNotificationsTemplateToUser(jfID string, tmpl NotificationsTemplate) error { func (js *Jellyseerr) ApplyNotificationsTemplateToUser(jfID string, tmpl NotificationsTemplate) error {
if tmpl.NotifTypes.Empty() {
tmpl.NotifTypes = nil
}
u, err := js.MustGetUser(jfID) u, err := js.MustGetUser(jfID)
if err != nil { if err != nil {
return err return err

View File

@ -81,6 +81,10 @@ type NotificationTypes struct {
Webpush int64 `json:"webpush,omitempty"` Webpush int64 `json:"webpush,omitempty"`
} }
func (nt *NotificationTypes) Empty() bool {
return nt.Discord == 0 && nt.Email == 0 && nt.Pushbullet == 0 && nt.Pushover == 0 && nt.Slack == 0 && nt.Telegram == 0 && nt.Webhook == 0 && nt.Webpush == 0
}
type NotificationsField string type NotificationsField string
const ( const (
@ -102,12 +106,12 @@ type Notifications struct {
} }
type NotificationsTemplate struct { type NotificationsTemplate struct {
EmailEnabled bool `json:"emailEnabled,omitempty"` EmailEnabled bool `json:"emailEnabled,omitempty"`
DiscordEnabled bool `json:"discordEnabled,omitempty"` DiscordEnabled bool `json:"discordEnabled,omitempty"`
DiscordEnabledTypes int64 `json:"discordEnabledTypes,omitempty"` DiscordEnabledTypes int64 `json:"discordEnabledTypes,omitempty"`
PushoverSound any `json:"pushoverSound,omitempty"` PushoverSound any `json:"pushoverSound,omitempty"`
TelegramEnabled bool `json:"telegramEnabled,omitempty"` TelegramEnabled bool `json:"telegramEnabled,omitempty"`
TelegramSendSilently any `json:"telegramSendSilently,omitempty"` TelegramSendSilently any `json:"telegramSendSilently,omitempty"`
WebPushEnabled bool `json:"webPushEnabled,omitempty"` WebPushEnabled bool `json:"webPushEnabled,omitempty"`
NotifTypes NotificationTypes `json:"notificationTypes,omitempty"` NotifTypes *NotificationTypes `json:"notificationTypes,omitempty"`
} }