api.go

@@ -129,18 +129,10 @@ func (app *appContext) checkInvites() {
 					msg, err := app.email.constructExpiry(code, data, app, false)
 					if err != nil {
 						app.err.Printf("%s: Failed to construct expiry notification: %v", code, err)
+					} else if err := app.email.send(msg, addr); err != nil {
+						app.err.Printf("%s: Failed to send expiry notification: %v", code, err)
 					} else {
-						// Check whether notify "address" is an email address of Jellyfin ID
+						app.info.Printf("Sent expiry notification to %s", addr)
-						if strings.Contains(addr, "@") {
-							err = app.email.send(msg, addr)
-						} else {
-							err = app.sendByID(msg, addr)
-						}
-						if err != nil {
-							app.err.Printf("%s: Failed to send expiry notification: %v", code, err)
-						} else {
-							app.info.Printf("Sent expiry notification to %s", addr)
-						}
 					}
 				}(address)
 			}
@@ -179,18 +171,10 @@ func (app *appContext) checkInvite(code string, used bool, username string) bool
 					msg, err := app.email.constructExpiry(code, inv, app, false)
 					if err != nil {
 						app.err.Printf("%s: Failed to construct expiry notification: %v", code, err)
+					} else if err := app.email.send(msg, addr); err != nil {
+						app.err.Printf("%s: Failed to send expiry notification: %v", code, err)
 					} else {
-						// Check whether notify "address" is an email address of Jellyfin ID
+						app.info.Printf("Sent expiry notification to %s", addr)
-						if strings.Contains(addr, "@") {
-							err = app.email.send(msg, addr)
-						} else {
-							err = app.sendByID(msg, addr)
-						}
-						if err != nil {
-							app.err.Printf("%s: Failed to send expiry notification: %v", code, err)
-						} else {
-							app.info.Printf("Sent expiry notification to %s", addr)
-						}
 					}
 				}(address)
 			}
@@ -486,18 +470,10 @@ func (app *appContext) newUser(req newUserDTO, confirmed bool) (f errorFunc, suc
 					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 if err := app.email.send(msg, address); err != nil {
+						app.err.Printf("%s: Failed to send user creation notification: %v", req.Code, err)
 					} else {
-						// Check whether notify "address" is an email address of Jellyfin ID
+						app.info.Printf("%s: Sent user creation notification to %v", req.Code, address)
-						if strings.Contains(address, "@") {
-							err = app.email.send(msg, address)
-						} else {
-							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", address)
-						}
 					}
 				}()
 			}
@@ -1364,16 +1340,15 @@ func (app *appContext) SetNotify(gc *gin.Context) {
 			return
 		}
 		var address string
-		jellyfinLogin := app.config.Section("ui").Key("jellyfin_login").MustBool(false)
+		if app.config.Section("ui").Key("jellyfin_login").MustBool(false) {
-		if jellyfinLogin {
+			addr, ok := app.storage.emails[gc.GetString("jfId")]
-			var addressAvailable bool = app.getAddressOrName(gc.GetString("jfId")) != ""
+			if !ok {
-			if !addressAvailable {
+				app.err.Printf("%s: Couldn't find email address. Make sure it's set", code)
-				app.err.Printf("%s: Couldn't find contact method for admin. Make sure one is set.", code)
 				app.debug.Printf("%s: User ID \"%s\"", code, gc.GetString("jfId"))
-				respond(500, "Missing user contact method", gc)
+				respond(500, "Missing user email", gc)
 				return
 			}
-			address = gc.GetString("jfId")
+			address = addr.Addr
 		} else {
 			address = app.config.Section("ui").Key("email").String()
 		}

config.go

@@ -96,11 +96,6 @@ func (app *appContext) loadConfig() error {
 	app.MustSetValue("user_expiry", "email_text", "jfa-go:"+"user-expired.txt")
 
 	app.MustSetValue("matrix", "topic", "Jellyfin notifications")
-	app.MustSetValue("matrix", "show_on_reg", "true")
-
-	app.MustSetValue("discord", "show_on_reg", "true")
-
-	app.MustSetValue("telegram", "show_on_reg", "true")
 
 	app.config.Section("jellyfin").Key("version").SetValue(version)
 	app.config.Section("jellyfin").Key("device").SetValue("jfa-go")

config/config-base.json

@@ -579,19 +579,10 @@
                     "value": false,
                     "description": "Enable signup verification through Discord and the sending of notifications through it.\nSee the jfa-go wiki for setting up a bot."
                 },
-                "show_on_reg": {
-                    "name": "Show on user registration",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "bool",
-                    "depends_true": "enabled",
-                    "value": true,
-                    "description": "Allow users to link their Discord on the registration page."
-                },
                 "required": {
                     "name": "Require on sign-up",
                     "required": false,
-                    "requires_restart": true,
+                    "required_restart": true,
                     "depends_true": "enabled",
                     "type": "bool",
                     "value": false,
@@ -671,15 +662,6 @@
                     "value": false,
                     "description": "Enable signup verification through Telegram and the sending of notifications through it.\nSee the jfa-go wiki for setting up a bot."
                 },
-                "show_on_reg": {
-                    "name": "Show on user registration",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "bool",
-                    "depends_true": "enabled",
-                    "value": true,
-                    "description": "Allow users to link their Telegram on the registration page."
-                },
                 "required": {
                     "name": "Require on sign-up",
                     "required": false,
@@ -727,15 +709,6 @@
                     "value": false,
                     "description": "Enable signup verification through Matrix and the sending of notifications through it.\nSee the jfa-go wiki for setting up a bot."
                 },
-                "show_on_reg": {
-                    "name": "Show on user registration",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "bool",
-                    "depends_true": "enabled",
-                    "value": true,
-                    "description": "Allow users to link their Matrix on the registration page."
-                },
                 "required": {
                     "name": "Require on sign-up",
                     "required": false,

lang/admin/nl-nl.json

@@ -43,7 +43,7 @@
         "settingsRequiredOrRestartMessage": "Opmerking: {n} is een verplicht veld, {n} geeft aan dat na wijzigen een herstart nodig is.",
         "settingsSave": "Opslaan",
         "ombiUserDefaults": "Ombi gebruiker standaardinstellingen",
-        "ombiUserDefaultsDescription": "Maak een Ombi gebruiker aan met de gewenste instellingen, en selecteer deze hieronder. Deze instellingen/rechten worden opgeslagen en toegepast voor nieuwe Ombi gebruikers die jfa-go aanmaakt als dit profiel is geselecteerd.",
+        "ombiUserDefaultsDescription": "Maak een Ombi gebruiker aan met de gewenste instellingen, en selecteer deze hieronder. Deze instellingen/rechten worden opgeslagen en toegepast voor nieuwe Ombi gebruikers die jfa-go aanmaakt",
         "userProfiles": "Gebruikersprofielen",
         "userProfilesDescription": "Profielen worden toegepast op gebruikers wanneer ze een account aanmaken. Een profiel bevat rechten voor bibliotheken en indeling van de startpagina.",
         "userProfilesIsDefault": "Standaard",
@@ -110,8 +110,7 @@
         "sendPWRSuccessManual": "Als de gebruiker hem niet heeft ontvangen, druk dan op kopiëren om een link te krijgen die je handmatig kunt sturen.",
         "sendPWR": "Verstuur wachtwoordreset",
         "sendPWRSuccess": "Wachtwoordreset-link verstuurd.",
-        "sendPWRValidFor": "De link is 30m geldig.",
+        "sendPWRValidFor": "De link is 30m geldig."
-        "ombiProfile": "Ombi gebruikersprofiel"
     },
     "notifications": {
         "changedEmailAddress": "E-mailadres van {n} gewijzigd.",
@@ -152,9 +151,7 @@
         "telegramVerified": "Telegram-account goedgekeurd.",
         "updateAppliedRefresh": "Update toegepast, ververs alsjeblieft.",
         "accountConnected": "Account gekoppeld.",
-        "savedAnnouncement": "Aankondiging opgeslagen.",
+        "savedAnnouncement": "Aankondiging opgeslagen."
-        "setOmbiProfile": "Opgeslagen ombi-profiel.",
-        "errorSetOmbiProfile": "Opslaan van ombi-profiel mislukt."
     },
     "quantityStrings": {
         "modifySettingsFor": {

lang/email/en-us.json

@@ -12,14 +12,14 @@
         "title": "Notice: User created",
         "aUserWasCreated": "A user was created using code {code}.",
         "time": "Time",
-        "notificationNotice": "Note: Notification messages can be toggled on the admin dashboard."
+        "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard."
     },
     "inviteExpiry": {
         "name": "Invite expiry",
         "title": "Notice: Invite expired",
         "inviteExpired": "Invite expired.",
         "expiredAt": "Code {code} expired at {time}.",
-        "notificationNotice": "Note: Notification messages can be toggled on the admin dashboard."
+        "notificationNotice": "Note: Notification emails can be toggled on the admin dashboard."
     },
     "passwordReset": {
         "name": "Password reset",

migrations.go

@@ -13,7 +13,6 @@ func runMigrations(app *appContext) {
 	migrateProfiles(app)
 	migrateBootstrap(app)
 	migrateEmailStorage(app)
-	migrateNotificationMethods(app)
 	// migrateHyphens(app)
 }
 
@@ -124,40 +123,6 @@ func migrateEmailStorage(app *appContext) error {
 	return nil
 }
 
-// Pre-0.3.10, Admin notifications for invites were indexed by and only sent to email addresses. Now, when Jellyfin Login is enabled, They are indexed by the admin's Jellyfin ID, and send by any method enabled for them. This migrates storage to that format.
-func migrateNotificationMethods(app *appContext) error {
-	if !app.config.Section("ui").Key("jellyfin_login").MustBool(false) {
-		return nil
-	}
-	changes := false
-	for code, invite := range app.storage.invites {
-		if invite.Notify == nil {
-			continue
-		}
-		for address, notifyPrefs := range invite.Notify {
-			if !strings.Contains(address, "@") {
-				continue
-			}
-			for id, email := range app.storage.emails {
-				if email.Addr == address {
-					invite.Notify[id] = notifyPrefs
-					delete(invite.Notify, address)
-					changes = true
-					break
-				}
-			}
-		}
-		if changes {
-			app.storage.invites[code] = invite
-		}
-	}
-	if changes {
-		app.info.Printf("Migrated to modified invite storage format.")
-		return app.storage.storeInvites()
-	}
-	return nil
-}
-
 // Migrate between hyphenated & non-hyphenated user IDs. Doesn't seem to happen anymore, so disabled.
 // func migrateHyphens(app *appContext) {
 // 	checkVersion := func(version string) int {

ts/modules/settings.ts

@@ -32,7 +32,7 @@ interface Setting {
 const splitDependant = (section: string, dep: string): string[] => {
     let parts = dep.split("|");
     if (parts.length == 1) {
-        parts = [section, dep];
+        parts = [section, parts[0]];
     }
     return parts
 };

views.go

@@ -327,10 +327,6 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
 	if strings.Contains(email, "Failed") || !strings.Contains(email, "@") {
 		email = ""
 	}
-	telegram := telegramEnabled && app.config.Section("telegram").Key("show_on_reg").MustBool(true)
-	discord := discordEnabled && app.config.Section("discord").Key("show_on_reg").MustBool(true)
-	matrix := matrixEnabled && app.config.Section("matrix").Key("show_on_reg").MustBool(true)
-
 	data := gin.H{
 		"urlBase":           app.getURLBase(gc),
 		"cssClass":          app.cssClass,
@@ -355,21 +351,21 @@ func (app *appContext) InviteProxy(gc *gin.Context) {
 		"userExpiryMessage": app.storage.lang.Form[lang].Strings.get("yourAccountIsValidUntil"),
 		"langName":          lang,
 		"passwordReset":     false,
-		"telegramEnabled":   telegram,
+		"telegramEnabled":   telegramEnabled,
-		"discordEnabled":    discord,
+		"discordEnabled":    discordEnabled,
-		"matrixEnabled":     matrix,
+		"matrixEnabled":     matrixEnabled,
 	}
-	if telegram {
+	if telegramEnabled {
 		data["telegramPIN"] = app.telegram.NewAuthToken()
 		data["telegramUsername"] = app.telegram.username
 		data["telegramURL"] = app.telegram.link
 		data["telegramRequired"] = app.config.Section("telegram").Key("required").MustBool(false)
 	}
-	if matrix {
+	if matrixEnabled {
 		data["matrixRequired"] = app.config.Section("matrix").Key("required").MustBool(false)
 		data["matrixUser"] = app.matrix.userID
 	}
-	if discord {
+	if discordEnabled {
 		data["discordPIN"] = app.discord.NewAuthToken()
 		data["discordUsername"] = app.discord.username
 		data["discordRequired"] = app.config.Section("discord").Key("required").MustBool(false)