api-messages.go

@@ -32,7 +32,6 @@ func (app *appContext) GetCustomContent(gc *gin.Context) {
 		"UserDeleted":       {Name: app.storage.lang.Email[lang].UserDeleted["name"], Enabled: app.storage.MustGetCustomContentKey("UserDeleted").Enabled},
 		"UserDisabled":      {Name: app.storage.lang.Email[lang].UserDisabled["name"], Enabled: app.storage.MustGetCustomContentKey("UserDisabled").Enabled},
 		"UserEnabled":       {Name: app.storage.lang.Email[lang].UserEnabled["name"], Enabled: app.storage.MustGetCustomContentKey("UserEnabled").Enabled},
-		"UserExpiryAdjusted": {Name: app.storage.lang.Email[lang].UserExpiryAdjusted["name"], Enabled: app.storage.MustGetCustomContentKey("UserExpiryAdjusted").Enabled},
 		"InviteEmail":       {Name: app.storage.lang.Email[lang].InviteEmail["name"], Enabled: app.storage.MustGetCustomContentKey("InviteEmail").Enabled},
 		"WelcomeEmail":      {Name: app.storage.lang.Email[lang].WelcomeEmail["name"], Enabled: app.storage.MustGetCustomContentKey("WelcomeEmail").Enabled},
 		"EmailConfirmation": {Name: app.storage.lang.Email[lang].EmailConfirmation["name"], Enabled: app.storage.MustGetCustomContentKey("EmailConfirmation").Enabled},
@@ -52,6 +51,39 @@ func (app *appContext) GetCustomContent(gc *gin.Context) {
 	gc.JSON(200, list)
 }
 
+// No longer needed, these are stored by string keys in the database now.
+/* func (app *appContext) getCustomMessage(id string) *CustomContent {
+	switch id {
+	case "Announcement":
+		return &CustomContent{}
+	case "UserCreated":
+		return &app.storage.customEmails.UserCreated
+	case "InviteExpiry":
+		return &app.storage.customEmails.InviteExpiry
+	case "PasswordReset":
+		return &app.storage.customEmails.PasswordReset
+	case "UserDeleted":
+		return &app.storage.customEmails.UserDeleted
+	case "UserDisabled":
+		return &app.storage.customEmails.UserDisabled
+	case "UserEnabled":
+		return &app.storage.customEmails.UserEnabled
+	case "InviteEmail":
+		return &app.storage.customEmails.InviteEmail
+	case "WelcomeEmail":
+		return &app.storage.customEmails.WelcomeEmail
+	case "EmailConfirmation":
+		return &app.storage.customEmails.EmailConfirmation
+	case "UserExpired":
+		return &app.storage.customEmails.UserExpired
+	case "UserLogin":
+		return &app.storage.userPage.Login
+	case "UserPage":
+		return &app.storage.userPage.Page
+	}
+	return nil
+} */
+
 // @Summary Sets the corresponding custom content.
 // @Produce json
 // @Param CustomContent body CustomContent true "Content = email (in markdown)."
@@ -185,11 +217,6 @@ func (app *appContext) GetCustomMessageTemplate(gc *gin.Context) {
 			msg, err = app.email.constructEnabled("", app, true)
 		}
 		values = app.email.deletedValues(app.storage.lang.Email[lang].Strings.get("reason"), app, false)
-	case "UserExpiryAdjusted":
-		if noContent {
-			msg, err = app.email.constructExpiryAdjusted("", time.Time{}, "", app, true)
-		}
-		values = app.email.expiryAdjustedValues(username, time.Now(), app.storage.lang.Email[lang].Strings.get("reason"), app, false, true)
 	case "InviteEmail":
 		if noContent {
 			msg, err = app.email.constructInvite("", Invite{}, app, true)

api-users.go

@@ -293,24 +293,24 @@ func (app *appContext) newUser(req newUserDTO, confirmed bool, gc *gin.Context)
 	if emailEnabled && app.config.Section("notifications").Key("enabled").MustBool(false) {
 		for address, settings := range invite.Notify {
 			if settings["notify-creation"] {
-				go func(addr string) {
+				go func() {
 					msg, err := app.email.constructCreated(req.Code, req.Username, req.Email, invite, app, false)
 					if err != nil {
 						app.err.Printf("%s: Failed to construct user creation notification: %v", req.Code, err)
 					} else {
-						// Check whether notify "addr" is an email address of Jellyfin ID
+						// Check whether notify "address" is an email address of Jellyfin ID
-						if strings.Contains(addr, "@") {
+						if strings.Contains(address, "@") {
-							err = app.email.send(msg, addr)
+							err = app.email.send(msg, address)
 						} else {
-							err = app.sendByID(msg, addr)
+							err = app.sendByID(msg, address)
 						}
 						if err != nil {
 							app.err.Printf("%s: Failed to send user creation notification: %v", req.Code, err)
 						} else {
-							app.info.Printf("Sent user creation notification to %s", addr)
+							app.info.Printf("Sent user creation notification to %s", address)
 						}
 					}
-				}(address)
+				}()
 			}
 		}
 	}
@@ -739,22 +739,6 @@ func (app *appContext) ExtendExpiry(gc *gin.Context) {
 			expiry.Expiry = base.AddDate(0, req.Months, req.Days).Add(time.Duration(((60 * req.Hours) + req.Minutes)) * time.Minute)
 		}
 		app.storage.SetUserExpiryKey(id, expiry)
-		if messagesEnabled && req.Notify {
-			go func(uid string, exp time.Time) {
-				user, status, err := app.jf.UserByID(uid, false)
-				if status != 200 || err != nil {
-					return
-				}
-				msg, err := app.email.constructExpiryAdjusted(user.Name, exp, req.Reason, app, false)
-				if err != nil {
-					app.err.Printf("%s: Failed to construct expiry adjustment notification: %v", uid, err)
-					return
-				}
-				if err := app.sendByID(msg, uid); err != nil {
-					app.err.Printf("%s: Failed to send expiry adjustment notification: %v", uid, err)
-				}
-			}(id, expiry.Expiry)
-		}
 	}
 	respondBool(204, true, gc)
 }

config.go

@@ -105,9 +105,6 @@ func (app *appContext) loadConfig() error {
 	app.MustSetValue("user_expiry", "email_html", "jfa-go:"+"user-expired.html")
 	app.MustSetValue("user_expiry", "email_text", "jfa-go:"+"user-expired.txt")
 
-	app.MustSetValue("user_expiry", "adjustment_email_html", "jfa-go:"+"expiry-adjusted.html")
-	app.MustSetValue("user_expiry", "adjustment_email_text", "jfa-go:"+"expiry-adjusted.txt")
-
 	app.MustSetValue("matrix", "topic", "Jellyfin notifications")
 	app.MustSetValue("matrix", "show_on_reg", "true")
 

config/config-base.json

@@ -1713,7 +1713,7 @@
             "order": [],
             "meta": {
                 "name": "User Expiry",
-                "description": "When set on an invite, users will be deleted or disabled a specified amount of time after they create their account. Expiries can also be set and extended for invididual users, optionally with a message why."
+                "description": "When set on an invite, users will be deleted or disabled a specified amount of time after they create their account."
             },
             "settings": {
                 "behaviour": {
@@ -1765,35 +1765,6 @@
                     "type": "text",
                     "value": "",
                     "description": "Path to custom email in plain text"
-                },
-                "adjustment_subject": {
-                    "name": "Adjustment: email subject",
-                    "required": false,
-                    "requires_restart": false,
-                    "depends_true": "messages|enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Subject of adjustment emails, sent optionally when setting/extending an expiry."
-                },
-                "adjustment_email_html": {
-                    "name": "Adjustment: Custom email (HTML)",
-                    "required": false,
-                    "requires_restart": false,
-                    "advanced": true,
-                    "depends_true": "messages|enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to custom email html"
-                },
-                "adjustment_email_text": {
-                    "name": "Adjustment: Custom email (plaintext)",
-                    "required": false,
-                    "requires_restart": false,
-                    "advanced": true,
-                    "depends_true": "messages|enabled",
-                    "type": "text",
-                    "value": "",
-                    "description": "Path to custom email in plain text"
                 }
             }
         },

email.go

@@ -741,72 +741,6 @@ func (emailer *Emailer) constructEnabled(reason string, app *appContext, noSub b
 	return email, nil
 }
 
-func (emailer *Emailer) expiryAdjustedValues(username string, expiry time.Time, reason string, app *appContext, noSub bool, custom bool) map[string]interface{} {
-	template := map[string]interface{}{
-		"yourExpiryWasAdjusted": emailer.lang.UserExpiryAdjusted.get("yourExpiryWasAdjusted"),
-		"ifPreviouslyDisabled":  emailer.lang.UserExpiryAdjusted.get("ifPreviouslyDisabled"),
-		"reasonString":          emailer.lang.Strings.get("reason"),
-		"newExpiry":             "",
-		"message":               "",
-	}
-	if noSub {
-		template["helloUser"] = emailer.lang.Strings.get("helloUser")
-		empty := []string{"reason", "newExpiry"}
-		for _, v := range empty {
-			template[v] = "{" + v + "}"
-		}
-	} else {
-		template["reason"] = reason
-		template["message"] = app.config.Section("messages").Key("message").String()
-		template["helloUser"] = emailer.lang.Strings.template("helloUser", tmpl{"username": username})
-		exp := app.formatDatetime(expiry)
-		if !expiry.IsZero() {
-			if custom {
-				template["newExpiry"] = exp
-			} else if !expiry.IsZero() {
-				template["newExpiry"] = emailer.lang.UserExpiryAdjusted.template("newExpiry", tmpl{
-					"date": exp,
-				})
-			}
-		}
-	}
-	return template
-}
-
-func (emailer *Emailer) constructExpiryAdjusted(username string, expiry time.Time, reason string, app *appContext, noSub bool) (*Message, error) {
-	email := &Message{
-		Subject: app.config.Section("user_expiry").Key("adjustment_subject").MustString(emailer.lang.UserExpiryAdjusted.get("title")),
-	}
-	var err error
-	var template map[string]interface{}
-	message := app.storage.MustGetCustomContentKey("UserExpiryAdjusted")
-	if message.Enabled {
-		template = emailer.expiryAdjustedValues(username, expiry, reason, app, noSub, true)
-	} else {
-		template = emailer.expiryAdjustedValues(username, expiry, reason, app, noSub, false)
-	}
-	if noSub {
-		template["newExpiry"] = emailer.lang.UserExpiryAdjusted.template("newExpiry", tmpl{
-			"date": "{newExpiry}",
-		})
-	}
-	if message.Enabled {
-		content := templateEmail(
-			message.Content,
-			message.Variables,
-			nil,
-			template,
-		)
-		email, err = emailer.constructTemplate(email.Subject, content, app)
-	} else {
-		email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "user_expiry", "adjustment_email_", template)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return email, nil
-}
-
 func (emailer *Emailer) welcomeValues(username string, expiry time.Time, app *appContext, noSub bool, custom bool) map[string]interface{} {
 	template := map[string]interface{}{
 		"welcome":               emailer.lang.WelcomeEmail.get("welcome"),

go.mod

@@ -18,7 +18,6 @@ replace github.com/hrfee/jfa-go/easyproxy => ./easyproxy
 
 require (
 	github.com/bwmarrin/discordgo v0.27.1
-	github.com/dgraph-io/badger/v3 v3.2103.5
 	github.com/emersion/go-autostart v0.0.0-20210130080809-00ed301c8e9a
 	github.com/fatih/color v1.15.0
 	github.com/fsnotify/fsnotify v1.6.0
@@ -31,11 +30,10 @@ require (
 	github.com/gomarkdown/markdown v0.0.0-20230322041520-c84983bdbf2a
 	github.com/hrfee/jfa-go/common v0.0.0-20230626224816-f72960635dc3
 	github.com/hrfee/jfa-go/docs v0.0.0-20230626224816-f72960635dc3
-	github.com/hrfee/jfa-go/easyproxy v0.0.0-00010101000000-000000000000
 	github.com/hrfee/jfa-go/linecache v0.0.0-20230626224816-f72960635dc3
 	github.com/hrfee/jfa-go/logger v0.0.0-20230626224816-f72960635dc3
 	github.com/hrfee/jfa-go/ombi v0.0.0-20230626224816-f72960635dc3
-	github.com/hrfee/mediabrowser v0.3.13
+	github.com/hrfee/mediabrowser v0.3.12
 	github.com/itchyny/timefmt-go v0.1.5
 	github.com/lithammer/shortuuid/v3 v3.0.7
 	github.com/mailgun/mailgun-go/v4 v4.9.1
@@ -56,6 +54,7 @@ require (
 	github.com/cespare/xxhash v1.1.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/dgraph-io/badger/v3 v3.2103.5 // indirect
 	github.com/dgraph-io/ristretto v0.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@@ -88,6 +87,7 @@ require (
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/mux v1.8.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/hrfee/jfa-go/easyproxy v0.0.0-00010101000000-000000000000 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.16.6 // indirect

go.sum

@@ -224,8 +224,8 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hrfee/mediabrowser v0.3.13 h1:NgQNbq+JWwsP68BdWXL/rwbpfE/oO5LJ5KVkE+aNbX8=
+github.com/hrfee/mediabrowser v0.3.12 h1:fqDxt1be3e+ZNjAtlKc8MTqg7peo6fuGCrk2wOXo20k=
-github.com/hrfee/mediabrowser v0.3.13/go.mod h1:PnHZbdxmbv1wCVdAQyM7nwPwpVj9fdKx2EcET7sAk+U=
+github.com/hrfee/mediabrowser v0.3.12/go.mod h1:PnHZbdxmbv1wCVdAQyM7nwPwpVj9fdKx2EcET7sAk+U=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm6GE=
 github.com/itchyny/timefmt-go v0.1.5/go.mod h1:nEP7L+2YmAbT2kZ2HfSs1d8Xtw9LY8D2stDBckWakZ8=
@@ -394,6 +394,8 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/writeas/go-strip-markdown v2.0.1+incompatible h1:IIqxTM5Jr7RzhigcL6FkrCNfXkvbR+Nbu1ls48pXYcw=
 github.com/writeas/go-strip-markdown v2.0.1+incompatible/go.mod h1:Rsyu10ZhbEK9pXdk8V6MVnZmTzRG0alMNLMwa0J01fE=
+github.com/xhit/go-simple-mail/v2 v2.13.0 h1:OANWU9jHZrVfBkNkvLf8Ww0fexwpQVF/v/5f96fFTLI=
+github.com/xhit/go-simple-mail/v2 v2.13.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
 github.com/xhit/go-simple-mail/v2 v2.16.0 h1:ouGy/Ww4kuaqu2E2UrDw7SvLaziWTB60ICLkIkNVccA=
 github.com/xhit/go-simple-mail/v2 v2.16.0/go.mod h1:b7P5ygho6SYE+VIqpxA6QkYfv4teeyG4MKqB3utRu98=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
@@ -435,6 +437,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
+golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
 golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
 golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -474,6 +478,8 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.11.0 h1:Gi2tvZIJyBtO9SDr1q9h5hEQCp/4L2RQ+ar0qjx2oNU=
+golang.org/x/net v0.11.0/go.mod h1:2L/ixqYpgIVXmeoSA/4Lu7BzTG4KIyPIryS4IsOd1oQ=
 golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
 golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -517,6 +523,8 @@ golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -528,6 +536,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
 golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=

html/admin.html

@@ -554,7 +554,7 @@
                 <div class="card @low dark:~d_neutral">
                     <span class="heading">{{ .strings.create }}</span>
                     <div class="flex flex-col md:flex-row gap-3 mt-2" id="create-inv">
-                        <div class="card ~neutral @low flex flex-col gap-2 grow">
+                        <div class="card ~neutral @low flex flex-col gap-2 w-1/2">
                             <div class="flex flex-row gap-2">
                                 <label class="w-1/2">
                                     <input type="radio" name="duration" class="unfocused" id="radio-inv-duration" checked>
@@ -662,7 +662,7 @@
                                 <input type="text" id="create-user-label" class="input ~neutral @low">
                             </div>
                         </div>
-                        <div class="card ~neutral @low flex flex-col justify-between gap-2 grow">
+                        <div class="card ~neutral @low flex flex-col justify-between gap-2 w-1/2">
                             <div class="flex flex-col gap-2">
                                 <div class="flex flex-col gap-4">
                                     <label class="label supra" for="create-uses">{{ .strings.inviteNumberOfUses }}</label>

html/header.html

@@ -2,7 +2,6 @@
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 <meta name="Description" content="jfa-go, a better way to manage Jellyfin users.">
 <meta name="color-scheme" content="dark light">
-<meta name="robots" content="noindex">
 
 <link rel="apple-touch-icon" sizes="180x180" href="{{ .urlBase }}/apple-touch-icon.png">
 <link rel="icon" type="image/png" sizes="32x32" href="{{ .urlBase }}/favicon-32x32.png">

lang.go

@@ -101,7 +101,6 @@ type emailLang struct {
 	UserDeleted       langSection `json:"userDeleted"`
 	UserDisabled      langSection `json:"userDisabled"`
 	UserEnabled       langSection `json:"userEnabled"`
-	UserExpiryAdjusted langSection `json:"userExpiryAdjusted"`
 	InviteEmail       langSection `json:"inviteEmail"`
 	WelcomeEmail      langSection `json:"welcomeEmail"`
 	EmailConfirmation langSection `json:"emailConfirmation"`

lang/email/en-us.json

@@ -45,13 +45,6 @@
         "title": "Your account has been re-enabled - Jellyfin",
         "yourAccountWasEnabled": "Your account was re-enabled."
     },
-    "userExpiryAdjusted": {
-        "name": "Expiry adjusted",
-        "title": "Account expiry adjusted - Jellyfin",
-        "yourExpiryWasAdjusted": "Your account's expiry date has been adjusted.",
-        "ifPreviouslyDisabled": "If your account was previously disabled, it may have been re-enabled.",
-        "newExpiry": "Your account will now expire on {date}."
-    },
     "inviteEmail": {
         "name": "Invite email",
         "title": "Invite - Jellyfin",

mail/expiry-adjusted.mjml

@@ -1,83 +0,0 @@
-<mjml>
-  <mj-head>
-    <mj-raw>
-      <meta name="color-scheme" content="light dark">
-      <meta name="supported-color-schemes" content="light dark">
-    </mj-raw>
-    <mj-style>
-        :root {
-            Color-scheme: light dark;
-            supported-color-schemes: light dark;
-        }
-        @media (prefers-color-scheme: light) {
-            Color-scheme: dark;
-            .body {
-                background: #242424 !important;
-                background-color: #242424 !important;
-            }
-            [data-ogsc] .body {
-                background: #242424 !important;
-                background-color: #242424 !important;
-            }
-            [data-ogsb] .body {
-                background: #242424 !important;
-                background-color: #242424 !important;
-            }
-        }
-        @media (prefers-color-scheme: dark) {
-            Color-scheme: dark;
-            .body {
-                background: #242424 !important;
-                background-color: #242424 !important;
-            }
-            [data-ogsc] .body {
-                background: #242424 !important;
-                background-color: #242424 !important;
-            }
-            [data-ogsb] .body {
-                background: #242424 !important;
-                background-color: #242424 !important;
-            }
-        }
-    </mj-style>
-    <mj-attributes>
-      <mj-class name="bg" background-color="#101010" />
-      <mj-class name="bg2" background-color="#242424" />
-      <mj-class name="text" color="#cacaca" />
-      <mj-class name="bold" color="rgba(255,255,255,0.87)" />
-      <mj-class name="secondary" color="rgb(153,153,153)" />
-      <mj-class name="blue" background-color="rgb(0,164,220)" />
-    </mj-attributes>
-    <mj-font name="Quicksand" href="https://fonts.googleapis.com/css2?family=Quicksand" />
-    <mj-font name="Noto Sans" href="https://fonts.googleapis.com/css2?family=Noto+Sans" />
-  </mj-head>
-  <mj-body>
-    <mj-section mj-class="bg2">
-      <mj-column>
-          <mj-text mj-class="bold" font-size="25px" font-family="Quicksand, Noto Sans, Helvetica, Arial, sans-serif"> {{ .jellyfin }} </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-section mj-class="bg">
-      <mj-column>
-        <mj-text mj-class="text" font-size="16px" font-family="Noto Sans, Helvetica, Arial, sans-serif">
-            <p>{{ .helloUser }}</p>
-
-            <h3>{{ .yourExpiryWasAdjusted }}</h3>
-
-            <p>{{ .ifPreviouslyDisabled }}</p>
-
-            <h4>{{ .newExpiry }}</h4>
-
-            <p>{{ .reasonString }}: <i>{{ .reason }}</i></p>
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    <mj-section mj-class="bg2">
-      <mj-column>
-        <mj-text mj-class="secondary" font-style="italic" font-size="14px">
-          {{ .message }}
-        </mj-text>
-      </mj-column>
-    </mj-section>
-    </body>
-</mjml>

mail/expiry-adjusted.txt

@@ -1,11 +0,0 @@
-{{ .helloUser }}
-
-{{ .yourExpiryWasAdjusted }}
-
-{{ .ifPreviouslyDisabled }}
-
-{{ .newExpiry }}
-
-{{ .reasonString }}: {{ .reason }}
-
-{{ .message }}

migrations.go

@@ -17,7 +17,6 @@ func runMigrations(app *appContext) {
 	linkExistingOmbiDiscordTelegram(app)
 	// migrateHyphens(app)
 	migrateToBadger(app)
-	intialiseCustomContent(app)
 }
 
 // Migrate pre-0.2.0 user templates to profiles
@@ -330,8 +329,6 @@ func migrateToBadger(app *appContext) {
 		app.storage.SetCustomContentKey("UserPage", app.storage.deprecatedUserPageContent.Page)
 	}
 
-	// Custom content not present here was added post-badger.
-
 	err := app.storage.db.Upsert("migrated_to_db", MigrationStatus{true})
 	if err != nil {
 		app.err.Fatalf("Failed to migrate to DB: %v\n", err)
@@ -339,53 +336,6 @@ func migrateToBadger(app *appContext) {
 	app.info.Println("All data migrated to database. JSON files in the config folder can be deleted if you are sure all data is correct in the app. Create an issue if you have problems.")
 }
 
-// Simply creates an emply CC template if not imn the DB already.
-// Add new CC types here!
-func intialiseCustomContent(app *appContext) {
-	emptyCC := CustomContent{
-		Enabled: false,
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserCreated"); !ok {
-		app.storage.SetCustomContentKey("UserCreated", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("InviteExpiry"); !ok {
-		app.storage.SetCustomContentKey("InviteExpiry", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("PasswordReset"); !ok {
-		app.storage.SetCustomContentKey("PasswordReset", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserDeleted"); !ok {
-		app.storage.SetCustomContentKey("UserDeleted", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserDisabled"); !ok {
-		app.storage.SetCustomContentKey("UserDisabled", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserEnabled"); !ok {
-		app.storage.SetCustomContentKey("UserEnabled", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("InviteEmail"); !ok {
-		app.storage.SetCustomContentKey("InviteEmail", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("WelcomeEmail"); !ok {
-		app.storage.SetCustomContentKey("WelcomeEmail", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("EmailConfirmation"); !ok {
-		app.storage.SetCustomContentKey("EmailConfirmation", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserExpired"); !ok {
-		app.storage.SetCustomContentKey("UserExpired", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserLogin"); !ok {
-		app.storage.SetCustomContentKey("UserLogin", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserPage"); !ok {
-		app.storage.SetCustomContentKey("UserPage", emptyCC)
-	}
-	if _, ok := app.storage.GetCustomContentKey("UserExpiryAdjusted"); !ok {
-		app.storage.SetCustomContentKey("UserExpiryAdjusted", emptyCC)
-	}
-}
-
 // Migrate between hyphenated & non-hyphenated user IDs. Doesn't seem to happen anymore, so disabled.
 // func migrateHyphens(app *appContext) {
 // 	checkVersion := func(version string) int {

models.go

@@ -267,8 +267,6 @@ type extendExpiryDTO struct {
 	Hours     int      `json:"hours" example:"2"`   // Number of hours to add.
 	Minutes   int      `json:"minutes" example:"3"` // Number of minutes to add.
 	Timestamp int64    `json:"timestamp"`           // Optional, exact time to expire at. Overrides other fields.
-	Notify    bool     `json:"notify"`                          // Whether to message the user(s) about the change.
-	Reason    string   `json:"reason" example:"i felt like it"` // Reason for adjustment.
 }
 
 type checkUpdateDTO struct {

package-lock.json

@@ -15,6 +15,7 @@
         "any-date-parser": "^1.5.4",
         "browserslist": "^4.21.7",
         "cheerio": "^1.0.0-rc.12",
+        "esbuild": "^0.18.20",
         "fs-cheerio": "^3.0.0",
         "inline-source": "^8.0.2",
         "jsdom": "^22.1.0",

storage.go

@@ -616,7 +616,6 @@ type customEmails struct {
 	UserDeleted       CustomContent `json:"userDeleted"`
 	UserDisabled      CustomContent `json:"userDisabled"`
 	UserEnabled       CustomContent `json:"userEnabled"`
-	UserExpiryAdjusted CustomContent `json:"userExpiryAdjusted"`
 	InviteEmail       CustomContent `json:"inviteEmail"`
 	WelcomeEmail      CustomContent `json:"welcomeEmail"`
 	EmailConfirmation CustomContent `json:"emailConfirmation"`
@@ -1226,7 +1225,6 @@ func (st *Storage) loadLangEmail(filesystems ...fs.FS) error {
 					patchLang(&lang.UserDeleted, &fallback.UserDeleted, &english.UserDeleted)
 					patchLang(&lang.UserDisabled, &fallback.UserDisabled, &english.UserDisabled)
 					patchLang(&lang.UserEnabled, &fallback.UserEnabled, &english.UserEnabled)
-					patchLang(&lang.UserExpiryAdjusted, &fallback.UserExpiryAdjusted, &english.UserExpiryAdjusted)
 					patchLang(&lang.InviteEmail, &fallback.InviteEmail, &english.InviteEmail)
 					patchLang(&lang.WelcomeEmail, &fallback.WelcomeEmail, &english.WelcomeEmail)
 					patchLang(&lang.EmailConfirmation, &fallback.EmailConfirmation, &english.EmailConfirmation)
@@ -1241,7 +1239,6 @@ func (st *Storage) loadLangEmail(filesystems ...fs.FS) error {
 				patchLang(&lang.UserDeleted, &english.UserDeleted)
 				patchLang(&lang.UserDisabled, &english.UserDisabled)
 				patchLang(&lang.UserEnabled, &english.UserEnabled)
-				patchLang(&lang.UserExpiryAdjusted, &english.UserExpiryAdjusted)
 				patchLang(&lang.InviteEmail, &english.InviteEmail)
 				patchLang(&lang.WelcomeEmail, &english.WelcomeEmail)
 				patchLang(&lang.EmailConfirmation, &english.EmailConfirmation)

ts/modules/accounts.ts

@@ -1684,25 +1684,22 @@ export class accountsList {
             applyList.push(id);
         }
         this._enableExpiryReason.classList.add("unfocused");
-        this._enableExpiryNotify.parentElement.classList.remove("unfocused");
-        this._enableExpiryNotify.checked = false;
-        this._enableExpiryReason.value = "";
         let header: string;
         if (enableUser) {
             header = window.lang.quantity("reEnableUsers", list.length);
+            this._enableExpiryNotify.parentElement.classList.remove("unfocused");
+            this._enableExpiryNotify.checked = false;
+            this._enableExpiryReason.value = "";
         } else if (this._settingExpiry) {
             header = window.lang.quantity("setExpiry", list.length);
-            // this._enableExpiryNotify.parentElement.classList.add("unfocused");
+            this._enableExpiryNotify.parentElement.classList.add("unfocused");
         } else {
             header = window.lang.quantity("extendExpiry", applyList.length);
-            // this._enableExpiryNotify.parentElement.classList.add("unfocused");
+            this._enableExpiryNotify.parentElement.classList.add("unfocused");
         }
         document.getElementById("header-extend-expiry").textContent = header;
         const extend = () => {
-            let send = { "users": applyList, "timestamp": 0, "notify": this._enableExpiryNotify.checked }
+            let send = { "users": applyList, "timestamp": 0 }
-            if (this._enableExpiryNotify.checked) {
-                send["reason"] = this._enableExpiryReason.value;
-            }
             if (this._usingExtendExpiryTextInput) {
                 let date = (Date as any).fromString(this._extendExpiryTextInput.value) as Date;
                 send["timestamp"] = Math.floor(date.getTime() / 1000);
@@ -1731,7 +1728,7 @@ export class accountsList {
         this._extendExpiryForm.onsubmit = (event: Event) => {
             event.preventDefault();
             if (enableUser) {
-                this._enableDisableUsers(applyList, true, this._enableExpiryNotify.checked, this._enableExpiryNotify.checked ? this._enableExpiryReason.value : null, (req: XMLHttpRequest) => {
+                this._enableDisableUsers(applyList, true, this._enableExpiryNotify.checked, this._enableExpiryNotify ? this._enableExpiryReason.value : null, (req: XMLHttpRequest) => {
                     if (req.readyState == 4) {
                         if (req.status != 200 && req.status != 204) {
                             window.modals.extendExpiry.close();