Assclaw/jfa-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

emails: fix and confirm function of all emails

Browse Source 
both custom and standard emails tested, quite a few fixes made,
including to an old bug with admin notifs.
This commit is contained in:
Harvey Tindall
2025-08-31 17:12:50 +01:00
parent 60dbfa2d1e
commit e67f1bf1a9
12 changed files with 135 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api-users.go
+25 -28
View File
@@ -380,19 +380,6 @@ func (app *appContext) EnableDisableUsers(gc *gin.Context) {
"SetPolicy": map[string]string{},
}
sendMail := messagesEnabled
var msg *Message
var err error
if sendMail {
if req.Enabled {
msg, err = app.email.constructEnabled(req.Reason, false)
} else {
msg, err = app.email.constructDisabled(req.Reason, false)
}
if err != nil {
app.err.Printf(lm.FailedConstructEnableDisableMessage, "?", err)
sendMail = false
}
}
activityType := ActivityDisabled
if req.Enabled {
activityType = ActivityEnabled
@@ -404,6 +391,18 @@ func (app *appContext) EnableDisableUsers(gc *gin.Context) {
app.err.Printf(lm.FailedGetUser, user.ID, lm.Jellyfin, err)
continue
}
var msg *Message
if sendMail {
if req.Enabled {
msg, err = app.email.constructEnabled(user.Name, req.Reason, false)
} else {
msg, err = app.email.constructDisabled(user.Name, req.Reason, false)
}
if err != nil {
app.err.Printf(lm.FailedConstructEnableDisableMessage, "?", err)
sendMail = false
}
}
err, _, _ = app.SetUserDisabled(user, !req.Enabled)
if err != nil {
errors["SetPolicy"][user.ID] = err.Error()
@@ -449,15 +448,6 @@ func (app *appContext) DeleteUsers(gc *gin.Context) {
gc.BindJSON(&req)
errors := map[string]string{}
sendMail := messagesEnabled
var msg *Message
var err error
if sendMail {
msg, err = app.email.constructDeleted(req.Reason, false)
if err != nil {
app.err.Printf(lm.FailedConstructDeletionMessage, "?", err)
sendMail = false
}
}
for _, userID := range req.Users {
user, err := app.jf.UserByID(userID, false)
if err != nil {
@@ -465,6 +455,15 @@ func (app *appContext) DeleteUsers(gc *gin.Context) {
errors[userID] = err.Error()
}
var msg *Message = nil
if sendMail {
msg, err = app.email.constructDeleted(user.Name, req.Reason, false)
if err != nil {
app.err.Printf(lm.FailedConstructDeletionMessage, "?", err)
sendMail = false
}
}
deleted := false
err, deleted = app.DeleteUser(user)
if err != nil {
@@ -677,11 +676,10 @@ func (app *appContext) Announce(gc *gin.Context) {
app.err.Printf(lm.FailedGetUser, userID, lm.Jellyfin, err)
continue
}
msg := &Message{}
err = app.email.construct(AnnouncementCustomContent(req.Subject), CustomContent{
msg, err := app.email.construct(AnnouncementCustomContent(req.Subject), CustomContent{
Enabled: true,
Content: req.Message,
}, map[string]any{"username": user.Name}, msg)
}, map[string]any{"username": user.Name})
if err != nil {
app.err.Printf(lm.FailedConstructAnnouncementMessage, userID, err)
respondBool(500, false, gc)
@@ -694,11 +692,10 @@ func (app *appContext) Announce(gc *gin.Context) {
}
// app.info.Printf(lm.SentAnnouncementMessage, "*", "?")
} else {
msg := &Message{}
err := app.email.construct(AnnouncementCustomContent(req.Subject), CustomContent{
msg, err := app.email.construct(AnnouncementCustomContent(req.Subject), CustomContent{
Enabled: true,
Content: req.Message,
}, map[string]any{"username": ""}, msg)
}, map[string]any{"username": ""})
if err != nil {
app.err.Printf(lm.FailedConstructAnnouncementMessage, "*", err)
respondBool(500, false, gc)