Merge 97506c0bcd into 5702e8012c

api-invites.go

@@ -17,18 +17,6 @@ const (
 	CAPTCHA_VALIDITY = 20 * 60 // Seconds
 )
 
-// GenerateInviteCode generates an invite code in the correct format.
-func GenerateInviteCode() string {
-	// make sure code doesn't begin with number
-	inviteCode := shortuuid.New()
-	_, err := strconv.Atoi(string(inviteCode[0]))
-	for err == nil {
-		inviteCode = shortuuid.New()
-		_, err = strconv.Atoi(string(inviteCode[0]))
-	}
-	return inviteCode
-}
-
 func (app *appContext) checkInvites() {
 	currentTime := time.Now()
 	for _, data := range app.storage.GetInvites() {
@@ -162,8 +150,14 @@ func (app *appContext) GenerateInvite(gc *gin.Context) {
 	currentTime := time.Now()
 	validTill := currentTime.AddDate(0, req.Months, req.Days)
 	validTill = validTill.Add(time.Hour*time.Duration(req.Hours) + time.Minute*time.Duration(req.Minutes))
+	// make sure code doesn't begin with number
+	inviteCode := shortuuid.New()
+	_, err := strconv.Atoi(string(inviteCode[0]))
+	for err == nil {
+		inviteCode = shortuuid.New()
+		_, err = strconv.Atoi(string(inviteCode[0]))
+	}
 	var invite Invite
-	invite.Code = GenerateInviteCode()
 	if req.Label != "" {
 		invite.Label = req.Label
 	}
@@ -191,7 +185,7 @@ func (app *appContext) GenerateInvite(gc *gin.Context) {
 	if req.SendTo != "" && app.config.Section("invite_emails").Key("enabled").MustBool(false) {
 		addressValid := false
 		discord := ""
-		app.debug.Printf("%s: Sending invite message", invite.Code)
+		app.debug.Printf("%s: Sending invite message", inviteCode)
 		if discordEnabled && !strings.Contains(req.SendTo, "@") {
 			users := app.discord.GetUsers(req.SendTo)
 			if len(users) == 0 {
@@ -208,10 +202,10 @@ func (app *appContext) GenerateInvite(gc *gin.Context) {
 			invite.SendTo = req.SendTo
 		}
 		if addressValid {
-			msg, err := app.email.constructInvite(invite.Code, invite, app, false)
+			msg, err := app.email.constructInvite(inviteCode, invite, app, false)
 			if err != nil {
 				invite.SendTo = fmt.Sprintf("Failed to send to %s", req.SendTo)
-				app.err.Printf("%s: Failed to construct invite message: %v", invite.Code, err)
+				app.err.Printf("%s: Failed to construct invite message: %v", inviteCode, err)
 			} else {
 				var err error
 				if discord != "" {
@@ -221,9 +215,9 @@ func (app *appContext) GenerateInvite(gc *gin.Context) {
 				}
 				if err != nil {
 					invite.SendTo = fmt.Sprintf("Failed to send to %s", req.SendTo)
-					app.err.Printf("%s: %s: %v", invite.Code, invite.SendTo, err)
+					app.err.Printf("%s: %s: %v", inviteCode, invite.SendTo, err)
 				} else {
-					app.info.Printf("%s: Sent invite email to \"%s\"", invite.Code, req.SendTo)
+					app.info.Printf("%s: Sent invite email to \"%s\"", inviteCode, req.SendTo)
 				}
 			}
 		}
@@ -235,7 +229,7 @@ func (app *appContext) GenerateInvite(gc *gin.Context) {
 			invite.Profile = "Default"
 		}
 	}
-	app.storage.SetInvitesKey(invite.Code, invite)
+	app.storage.SetInvitesKey(inviteCode, invite)
 	respondBool(200, true, gc)
 }
 

api-ombi.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 
 	"github.com/gin-gonic/gin"
-	"github.com/hrfee/mediabrowser"
 )
 
 func (app *appContext) getOmbiUser(jfID string) (map[string]interface{}, int, error) {
@@ -30,31 +29,7 @@ func (app *appContext) getOmbiUser(jfID string) (map[string]interface{}, int, er
 			return ombiUser, code, err
 		}
 	}
-	return nil, 400, fmt.Errorf("couldn't find user")
+	return nil, 400, fmt.Errorf("Couldn't find user")
-}
-
-// Returns a user with the given name who has been imported from Jellyfin/Emby by Ombi
-func (app *appContext) getOmbiImportedUser(name string) (map[string]interface{}, int, error) {
-	// Ombi User Types: 3/4 = Emby, 5 = Jellyfin
-	ombiUsers, code, err := app.ombi.GetUsers()
-	if err != nil || code != 200 {
-		return nil, code, err
-	}
-	for _, ombiUser := range ombiUsers {
-		if ombiUser["userName"].(string) == name {
-			uType, ok := ombiUser["userType"].(int)
-			if !ok { // Don't know if Ombi somehow allows duplicate usernames
-				continue
-			}
-			if serverType == mediabrowser.JellyfinServer && uType != 5 { // Jellyfin
-				continue
-			} else if uType != 3 && uType != 4 { // Emby
-				continue
-			}
-			return ombiUser, code, err
-		}
-	}
-	return nil, 400, fmt.Errorf("couldn't find user")
 }
 
 // @Summary Get a list of Ombi users.
@@ -132,18 +107,3 @@ func (app *appContext) DeleteOmbiProfile(gc *gin.Context) {
 	app.storage.SetProfileKey(profileName, profile)
 	respondBool(204, true, gc)
 }
-
-func (app *appContext) applyOmbiProfile(user map[string]interface{}, profile map[string]interface{}) (status int, err error) {
-	for k, v := range profile {
-		switch v.(type) {
-		case map[string]interface{}, []interface{}:
-			user[k] = v
-		default:
-			if v != user[k] {
-				user[k] = v
-			}
-		}
-	}
-	status, err = app.ombi.ModifyUser(user)
-	return
-}

api-profiles.go

@@ -1,9 +1,11 @@
 package main
 
 import (
+	"strconv"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/lithammer/shortuuid/v3"
 	"github.com/timshannon/badgerhold/v4"
 )
 
@@ -104,10 +106,6 @@ func (app *appContext) CreateProfile(gc *gin.Context) {
 		}
 	}
 	app.storage.SetProfileKey(req.Name, profile)
-	// Refresh discord bots, profile list
-	if discordEnabled {
-		app.discord.UpdateCommands()
-	}
 	respondBool(200, true, gc)
 }
 
@@ -153,7 +151,13 @@ func (app *appContext) EnableReferralForProfile(gc *gin.Context) {
 	}
 
 	// Generate new code for referral template
-	inv.Code = GenerateInviteCode()
+	inv.Code = shortuuid.New()
+	// make sure code doesn't begin with number
+	_, err := strconv.Atoi(string(inv.Code[0]))
+	for err == nil {
+		inv.Code = shortuuid.New()
+		_, err = strconv.Atoi(string(inv.Code[0]))
+	}
 	inv.Created = time.Now()
 	inv.ValidTill = inv.Created.Add(REFERRAL_EXPIRY_DAYS * 24 * time.Hour)
 	inv.IsReferral = true

api-userpage.go

@@ -3,11 +3,13 @@ package main
 import (
 	"net/http"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"
+	"github.com/lithammer/shortuuid/v3"
 	"github.com/timshannon/badgerhold/v4"
 )
 
@@ -671,7 +673,13 @@ func (app *appContext) GetMyReferral(gc *gin.Context) {
 			respondBool(400, false, gc)
 			return
 		}
-		inv.Code = GenerateInviteCode()
+		inv.Code = shortuuid.New()
+		// make sure code doesn't begin with number
+		_, err := strconv.Atoi(string(inv.Code[0]))
+		for err == nil {
+			inv.Code = shortuuid.New()
+			_, err = strconv.Atoi(string(inv.Code[0]))
+		}
 		inv.Created = time.Now()
 		inv.ValidTill = inv.Created.Add(REFERRAL_EXPIRY_DAYS * 24 * time.Hour)
 		inv.IsReferral = true
@@ -681,7 +689,13 @@ func (app *appContext) GetMyReferral(gc *gin.Context) {
 		// 3. We found an invite for us, but it's expired.
 		//    We delete it from storage, and put it back with a fresh code and expiry.
 		app.storage.DeleteInvitesKey(inv.Code)
-		inv.Code = GenerateInviteCode()
+		inv.Code = shortuuid.New()
+		// make sure code doesn't begin with number
+		_, err := strconv.Atoi(string(inv.Code[0]))
+		for err == nil {
+			inv.Code = shortuuid.New()
+			_, err = strconv.Atoi(string(inv.Code[0]))
+		}
 		inv.Created = time.Now()
 		inv.ValidTill = inv.Created.Add(REFERRAL_EXPIRY_DAYS * 24 * time.Hour)
 		app.storage.SetInvitesKey(inv.Code, inv)

api-users.go

@@ -3,12 +3,14 @@ package main
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt"
 	"github.com/hrfee/mediabrowser"
+	"github.com/lithammer/shortuuid/v3"
 	"github.com/timshannon/badgerhold/v4"
 )
 
@@ -375,47 +377,30 @@ func (app *appContext) newUser(req newUserDTO, confirmed bool) (f errorFunc, suc
 		if profile.Ombi != nil && len(profile.Ombi) != 0 {
 			template := profile.Ombi
 			errors, code, err := app.ombi.NewUser(req.Username, req.Password, req.Email, template)
-			accountExists := false
-			var ombiUser map[string]interface{}
 			if err != nil || code != 200 {
-				// Check if on the off chance, Ombi's user importer has already added the account.
+				app.info.Printf("Failed to create Ombi user (%d): %s", code, err)
-				ombiUser, status, err = app.getOmbiImportedUser(req.Username)
+				app.debug.Printf("Errors reported by Ombi: %s", strings.Join(errors, ", "))
-				if status == 200 && err == nil {
-					app.info.Println("Found existing Ombi user, applying changes")
-					accountExists = true
-					template["password"] = req.Password
-					status, err = app.applyOmbiProfile(ombiUser, template)
-					if status != 200 || err != nil {
-						app.err.Printf("Failed to modify existing Ombi user (%d): %v\n", status, err)
-					}
-				} else {
-					app.info.Printf("Failed to create Ombi user (%d): %s", code, err)
-					app.debug.Printf("Errors reported by Ombi: %s", strings.Join(errors, ", "))
-				}
 			} else {
-				ombiUser, status, err = app.getOmbiUser(id)
+				app.info.Println("Created Ombi user")
-				if status != 200 || err != nil {
-					app.err.Printf("Failed to get Ombi user (%d): %v", status, err)
-				} else {
-					app.info.Println("Created Ombi user")
-					accountExists = true
-				}
-			}
-			if accountExists {
 				if discordVerified || telegramVerified {
-					dID := ""
+					ombiUser, status, err := app.getOmbiUser(id)
-					tUser := ""
+					if status != 200 || err != nil {
-					if discordVerified {
+						app.err.Printf("Failed to get Ombi user (%d): %v", status, err)
-						dID = discordUser.ID
+					} else {
-					}
+						dID := ""
-					if telegramVerified {
+						tUser := ""
-						u, _ := app.storage.GetTelegramKey(user.ID)
+						if discordVerified {
-						tUser = u.Username
+							dID = discordUser.ID
-					}
+						}
-					resp, status, err := app.ombi.SetNotificationPrefs(ombiUser, dID, tUser)
+						if telegramVerified {
-					if !(status == 200 || status == 204) || err != nil {
+							u, _ := app.storage.GetTelegramKey(user.ID)
-						app.err.Printf("Failed to link Telegram/Discord to Ombi (%d): %v", status, err)
+							tUser = u.Username
-						app.debug.Printf("Response: %v", resp)
+						}
+						resp, status, err := app.ombi.SetNotificationPrefs(ombiUser, dID, tUser)
+						if !(status == 200 || status == 204) || err != nil {
+							app.err.Printf("Failed to link Telegram/Discord to Ombi (%d): %v", status, err)
+							app.debug.Printf("Response: %v", resp)
+						}
 					}
 				}
 			}
@@ -705,7 +690,13 @@ func (app *appContext) EnableReferralForUsers(gc *gin.Context) {
 
 		// 2. Generate referral invite.
 		inv := baseInv
-		inv.Code = GenerateInviteCode()
+		inv.Code = shortuuid.New()
+		// make sure code doesn't begin with number
+		_, err := strconv.Atoi(string(inv.Code[0]))
+		for err == nil {
+			inv.Code = shortuuid.New()
+			_, err = strconv.Atoi(string(inv.Code[0]))
+		}
 		inv.Created = time.Now()
 		inv.ValidTill = inv.Created.Add(REFERRAL_EXPIRY_DAYS * 24 * time.Hour)
 		inv.IsReferral = true
@@ -1223,7 +1214,17 @@ func (app *appContext) ApplySettings(gc *gin.Context) {
 				// newUser["userName"] = user["userName"]
 				// newUser["alias"] = user["alias"]
 				// newUser["emailAddress"] = user["emailAddress"]
-				status, err = app.applyOmbiProfile(user, ombi)
+				for k, v := range ombi {
+					switch v.(type) {
+					case map[string]interface{}, []interface{}:
+						user[k] = v
+					default:
+						if v != user[k] {
+							user[k] = v
+						}
+					}
+				}
+				status, err = app.ombi.ModifyUser(user)
 				if status != 200 || err != nil {
 					errorString += fmt.Sprintf("Apply %d: %v ", status, err)
 				}

api.go

@@ -182,7 +182,7 @@ func (app *appContext) ResetSetPassword(gc *gin.Context) {
 	}
 	if app.config.Section("ombi").Key("enabled").MustBool(false) {
 		// Silently fail for changing ombi passwords
-		if (status != 200 && status != 204) || err != nil {
+		if status != 200 || err != nil {
 			app.err.Printf("Failed to get user \"%s\" from jellyfin/emby (%d): %v", username, status, err)
 			respondBool(200, true, gc)
 			return

config/config-base.json

@@ -395,123 +395,6 @@
                     "type": "password",
                     "value": "",
                     "description": "Leave blank for no Authentication."
-                },
-                "debug_log_emails": {
-                    "name": "Debug Storage Logging: Emails",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_discord": {
-                    "name": "Debug Storage Logging: Discord",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_telegram": {
-                    "name": "Debug Storage Logging: Telegram",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_matrix": {
-                    "name": "Debug Storage Logging: Matrix",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_invites": {
-                    "name": "Debug Storage Logging: Invites",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_announcements": {
-                    "name": "Debug Storage Logging: Announcements",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_expiries": {
-                    "name": "Debug Storage Logging: User Expiries",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_profiles": {
-                    "name": "Debug Storage Logging: Profiles",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
-                },
-                "debug_log_custom_content": {
-                    "name": "Debug Storage Logging: Custom Message Content",
-                    "required": false,
-                    "requires_restart": true,
-                    "type": "select",
-                    "options": [
-                        ["none", "None"],
-                        ["all", "All Writes"],
-                        ["deletion", "Deletion Only*"]
-                    ],
-                    "value": "none",
-                    "description": "Extra debug logging for writes to the database. *: Deletion also includes blanking out major fields, e.g. an email address."
                 }
             }
         },

discord.go

@@ -24,7 +24,6 @@ type DiscordDaemon struct {
 	app                                                        *appContext
 	commandHandlers                                            map[string]func(s *dg.Session, i *dg.InteractionCreate, lang string)
 	commandIDs                                                 []string
-	commandDescriptions                                        []*dg.ApplicationCommand
 }
 
 func newDiscordDaemon(app *appContext) (*DiscordDaemon, error) {
@@ -51,7 +50,6 @@ func newDiscordDaemon(app *appContext) (*DiscordDaemon, error) {
 	dd.commandHandlers[app.config.Section("discord").Key("start_command").MustString("start")] = dd.cmdStart
 	dd.commandHandlers["lang"] = dd.cmdLang
 	dd.commandHandlers["pin"] = dd.cmdPIN
-	dd.commandHandlers["inv"] = dd.cmdInvite
 	for _, user := range app.storage.GetDiscord() {
 		dd.users[user.ID] = user
 	}
@@ -129,7 +127,6 @@ func (d *DiscordDaemon) run() {
 			d.inviteChannelName = invChannel
 		}
 	}
-	err = d.bot.UpdateGameStatus(0, "/"+d.app.config.Section("discord").Key("start_command").MustString("start"))
 	defer d.deregisterCommands()
 	defer d.bot.Close()
 
@@ -223,6 +220,7 @@ func (d *DiscordDaemon) NewTempInvite(ageSeconds, maxUses int) (inviteURL, iconU
 		d.app.err.Printf("Discord: Failed to get guild: %v", err)
 		return
 	}
+	// FIXME: Fix CSS, and handle no icon
 	iconURL = guild.IconURL("256")
 	return
 }
@@ -310,7 +308,7 @@ func (d *DiscordDaemon) Shutdown() {
 }
 
 func (d *DiscordDaemon) registerCommands() {
-	d.commandDescriptions = []*dg.ApplicationCommand{
+	commands := []*dg.ApplicationCommand{
 		{
 			Name:        d.app.config.Section("discord").Key("start_command").MustString("start"),
 			Description: "Start the Discord linking process. The bot will send further instructions.",
@@ -340,73 +338,26 @@ func (d *DiscordDaemon) registerCommands() {
 				},
 			},
 		},
-		{
-			Name:        "inv",
-			Description: "Send an invite to a discord user (admin only).",
-			Options: []*dg.ApplicationCommandOption{
-				{
-					Type:        dg.ApplicationCommandOptionUser,
-					Name:        "user",
-					Description: "User to Invite.",
-					Required:    true,
-				},
-				{
-					Type:        dg.ApplicationCommandOptionInteger,
-					Name:        "expiry",
-					Description: "Time in minutes before expiration.",
-					Required:    false,
-				},
-				/* Label should be automatically set to something like "Discord invite for @username"
-				{
-					Type:        dg.ApplicationCommandOptionString,
-					Name:        "label",
-					Description: "Label given to this invite (shown on the Admin page)",
-					Required:    false,
-				}, */
-				{
-					Type:        dg.ApplicationCommandOptionString,
-					Name:        "user_label",
-					Description: "Label given to users created with this invite.",
-					Required:    false,
-				},
-				{
-					Type:        dg.ApplicationCommandOptionString,
-					Name:        "profile",
-					Description: "Profile to apply to the created user.",
-					Required:    false,
-				},
-			},
-		},
 	}
-	d.commandDescriptions[1].Options[0].Choices = make([]*dg.ApplicationCommandOptionChoice, len(d.app.storage.lang.Telegram))
+	commands[1].Options[0].Choices = make([]*dg.ApplicationCommandOptionChoice, len(d.app.storage.lang.Telegram))
 	i := 0
 	for code := range d.app.storage.lang.Telegram {
-		d.app.debug.Printf("Discord: registering lang choice \"%s\":\"%s\"\n", d.app.storage.lang.Telegram[code].Meta.Name, code)
+		d.app.debug.Printf("Registering choice \"%s\":\"%s\"\n", d.app.storage.lang.Telegram[code].Meta.Name, code)
-		d.commandDescriptions[1].Options[0].Choices[i] = &dg.ApplicationCommandOptionChoice{
+		commands[1].Options[0].Choices[i] = &dg.ApplicationCommandOptionChoice{
 			Name:  d.app.storage.lang.Telegram[code].Meta.Name,
 			Value: code,
 		}
 		i++
 	}
 
-	profiles := d.app.storage.GetProfiles()
-	d.commandDescriptions[3].Options[3].Choices = make([]*dg.ApplicationCommandOptionChoice, len(profiles))
-	for i, profile := range profiles {
-		d.app.debug.Printf("Discord: registering profile choice \"%s\"", profile.Name)
-		d.commandDescriptions[3].Options[3].Choices[i] = &dg.ApplicationCommandOptionChoice{
-			Name:  profile.Name,
-			Value: profile.Name,
-		}
-	}
-
 	// d.deregisterCommands()
 
-	d.commandIDs = make([]string, len(d.commandDescriptions))
+	d.commandIDs = make([]string, len(commands))
 	// cCommands, err := d.bot.ApplicationCommandBulkOverwrite(d.bot.State.User.ID, d.guildID, commands)
 	// if err != nil {
 	// 	d.app.err.Printf("Discord: Cannot create commands: %v", err)
 	// }
-	for i, cmd := range d.commandDescriptions {
+	for i, cmd := range commands {
 		command, err := d.bot.ApplicationCommandCreate(d.bot.State.User.ID, d.guildID, cmd)
 		if err != nil {
 			d.app.err.Printf("Discord: Cannot create command \"%s\": %v", cmd.Name, err)
@@ -424,32 +375,12 @@ func (d *DiscordDaemon) deregisterCommands() {
 		return
 	}
 	for _, cmd := range existingCommands {
-		if err := d.bot.ApplicationCommandDelete(d.bot.State.User.ID, d.guildID, cmd.ID); err != nil {
+		if err := d.bot.ApplicationCommandDelete(d.bot.State.User.ID, "", cmd.ID); err != nil {
-			d.app.err.Printf("Discord: Failed to deregister command: %v", err)
+			d.app.err.Printf("Failed to deregister command: %v", err)
 		}
 	}
 }
 
-// UpdateCommands updates commands which have defined lists of options, to be used when changes occur.
-func (d *DiscordDaemon) UpdateCommands() {
-	// Reload Profile List
-	profiles := d.app.storage.GetProfiles()
-	d.commandDescriptions[3].Options[3].Choices = make([]*dg.ApplicationCommandOptionChoice, len(profiles))
-	for i, profile := range profiles {
-		d.app.debug.Printf("Discord: registering profile choice \"%s\"", profile.Name)
-		d.commandDescriptions[3].Options[3].Choices[i] = &dg.ApplicationCommandOptionChoice{
-			Name:  profile.Name,
-			Value: profile.Name,
-		}
-	}
-	cmd, err := d.bot.ApplicationCommandEdit(d.bot.State.User.ID, d.guildID, d.commandIDs[3], d.commandDescriptions[3])
-	if err != nil {
-		d.app.err.Printf("Discord: Failed to update profile list: %v\n", err)
-	} else {
-		d.commandIDs[3] = cmd.ID
-	}
-}
-
 func (d *DiscordDaemon) commandHandler(s *dg.Session, i *dg.InteractionCreate) {
 	if h, ok := d.commandHandlers[i.ApplicationCommandData().Name]; ok {
 		if i.GuildID != "" && d.channelName != "" {
@@ -572,124 +503,6 @@ func (d *DiscordDaemon) cmdLang(s *dg.Session, i *dg.InteractionCreate, lang str
 	}
 }
 
-func (d *DiscordDaemon) cmdInvite(s *dg.Session, i *dg.InteractionCreate, lang string) {
-	channel, err := s.UserChannelCreate(i.Interaction.Member.User.ID)
-	if err != nil {
-		d.app.err.Printf("Discord: Failed to create private channel with \"%s\": %v", i.Interaction.Member.User.Username, err)
-		return
-	}
-	requester := d.MustGetUser(channel.ID, i.Interaction.Member.User.ID, i.Interaction.Member.User.Discriminator, i.Interaction.Member.User.Username)
-	d.users[i.Interaction.Member.User.ID] = requester
-	recipient := i.ApplicationCommandData().Options[0].UserValue(s)
-	// d.app.debug.Println(invuser)
-	//label := i.ApplicationCommandData().Options[2].StringValue()
-	//profile := i.ApplicationCommandData().Options[3].StringValue()
-	//mins, err := strconv.Atoi(i.ApplicationCommandData().Options[1].StringValue())
-	//if mins > 0 {
-	//	expmin = mins
-	//}
-	//	Check whether requestor is linked to the admin account
-	requesterEmail, ok := d.app.storage.GetEmailsKey(requester.JellyfinID)
-	if !ok {
-		d.app.err.Printf("Failed to verify admin")
-	}
-	if !requesterEmail.Admin {
-		d.app.err.Printf("User is not admin")
-		//add response message
-		return
-	}
-
-	var expiryMinutes int64 = 30
-	userLabel := ""
-	profileName := ""
-
-	for i, opt := range i.ApplicationCommandData().Options {
-		if i == 0 {
-			continue
-		}
-		switch opt.Name {
-		case "expiry":
-			expiryMinutes = opt.IntValue()
-		case "user_label":
-			userLabel = opt.StringValue()
-		case "profile":
-			profileName = opt.StringValue()
-		}
-	}
-
-	currentTime := time.Now()
-
-	validTill := currentTime.Add(time.Minute * time.Duration(expiryMinutes))
-
-	invite := Invite{
-		Code:          GenerateInviteCode(),
-		Created:       currentTime,
-		RemainingUses: 1,
-		UserExpiry:    false,
-		ValidTill:     validTill,
-		UserLabel:     userLabel,
-		Profile:       "Default",
-		Label:         fmt.Sprintf("Discord: %s", RenderDiscordUsername(recipient)),
-	}
-	if profileName != "" {
-		if _, ok := d.app.storage.GetProfileKey(profileName); ok {
-			invite.Profile = profileName
-		}
-	}
-
-	if recipient != nil && d.app.config.Section("invite_emails").Key("enabled").MustBool(false) {
-		d.app.debug.Printf("%s: Sending invite message", invite.Code)
-		invname, err := d.bot.GuildMember(d.guildID, recipient.ID)
-		invite.SendTo = invname.User.Username
-		msg, err := d.app.email.constructInvite(invite.Code, invite, d.app, false)
-		if err != nil {
-			invite.SendTo = fmt.Sprintf("Failed to send to %s", RenderDiscordUsername(recipient))
-			d.app.err.Printf("%s: Failed to construct invite message: %v", invite.Code, err)
-			err := s.InteractionRespond(i.Interaction, &dg.InteractionResponse{
-				Type: dg.InteractionResponseChannelMessageWithSource,
-				Data: &dg.InteractionResponseData{
-					Content: d.app.storage.lang.Telegram[lang].Strings.get("sentInviteFailure"),
-					Flags:   64, // Ephemeral
-				},
-			})
-			if err != nil {
-				d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", RenderDiscordUsername(requester), err)
-			}
-		} else {
-			var err error
-			err = d.app.discord.SendDM(msg, recipient.ID)
-			if err != nil {
-				invite.SendTo = fmt.Sprintf("Failed to send to %s", RenderDiscordUsername(recipient))
-				d.app.err.Printf("%s: %s: %v", invite.Code, invite.SendTo, err)
-				err := s.InteractionRespond(i.Interaction, &dg.InteractionResponse{
-					Type: dg.InteractionResponseChannelMessageWithSource,
-					Data: &dg.InteractionResponseData{
-						Content: d.app.storage.lang.Telegram[lang].Strings.get("sentInviteFailure"),
-						Flags:   64, // Ephemeral
-					},
-				})
-				if err != nil {
-					d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", RenderDiscordUsername(requester), err)
-				}
-			} else {
-				d.app.info.Printf("%s: Sent invite email to \"%s\"", invite.Code, RenderDiscordUsername(recipient))
-				err := s.InteractionRespond(i.Interaction, &dg.InteractionResponse{
-					Type: dg.InteractionResponseChannelMessageWithSource,
-					Data: &dg.InteractionResponseData{
-						Content: d.app.storage.lang.Telegram[lang].Strings.get("sentInvite"),
-						Flags:   64, // Ephemeral
-					},
-				})
-				if err != nil {
-					d.app.err.Printf("Discord: Failed to send message to \"%s\": %v", RenderDiscordUsername(requester), err)
-				}
-			}
-		}
-	}
-	//if profile != "" {
-	d.app.storage.SetInvitesKey(invite.Code, invite)
-}
-
 func (d *DiscordDaemon) messageHandler(s *dg.Session, m *dg.MessageCreate) {
 	if m.GuildID != "" && d.channelName != "" {
 		if d.channelID == "" {

lang/admin/fr-fr.json

@@ -118,14 +118,7 @@
         "userPagePage": "Page utilisateur : Page",
         "after": "Après",
         "before": "Avant",
-        "unlink": "Délier le compte",
+        "unlink": "Délier le compte"
-        "enableReferrals": "Activer Parrainage",
-        "enableReferralsDescription": "Offrez aux utilisateurs un lien de parrainage personnel semblable à une invitation, à envoyer à vos amis/famille. Peut provenir modèle de profil ou d’une invitation existante.",
-        "invite": "Inviter",
-        "userLabel": "Étiquette",
-        "userLabelDescription": "Étiquette à appliquer aux utilisateurs créés avec cette invitation.",
-        "disableReferrals": "Désactiver Parrainage",
-        "enableReferralsProfileDescription": "Donnez aux utilisateurs créés avec ce profil un lien de parrainage personnel semblable à une invitation, à envoyer à vos amis/famille. Créez une invitation avec les paramètres souhaités, puis sélectionnez-la ici. Chaque référence sera alors basée sur cette invitation. Vous pouvez supprimer l'invitation une fois terminée."
     },
     "notifications": {
         "changedEmailAddress": "Adresse e-mail modifiée de {n}.",
@@ -163,9 +156,7 @@
         "accountConnected": "Compte connecté.",
         "savedAnnouncement": "Annonce enregistrée.",
         "setOmbiProfile": "Profil ombi enregistré.",
-        "errorSetOmbiProfile": "Echec de la sauvegarde du profil ombi.",
+        "errorSetOmbiProfile": "Echec de la sauvegarde du profil ombi."
-        "errorNoReferralTemplate": "Le profil ne contient pas de modèle de référence, ajoutez-en un dans les paramètres.",
-        "referralsEnabled": "Parrainage activer."
     },
     "quantityStrings": {
         "modifySettingsFor": {
@@ -223,10 +214,6 @@
         "setExpiry": {
             "singular": "Définir l'expiration pour {n} utilisateur",
             "plural": "Définir l'expiration pour {n} utilisateurs"
-        },
-        "enableReferralsFor": {
-            "singular": "Activer les parrainages pour {n} utilisateur",
-            "plural": "Activer les parrainages pour {n} utilisateur"
         }
     }
 }

lang/admin/hu-hu.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Magyar (HU)"
+        "name": "Angol (US)"
     },
     "strings": {
         "invites": "Meghívások",

lang/common/fr-fr.json

@@ -5,7 +5,7 @@
     "strings": {
         "username": "Nom d'utilisateur",
         "password": "Mot de passe",
-        "emailAddress": "Adresse Email",
+        "emailAddress": "Adresse courriel",
         "name": "Nom",
         "submit": "Soumettre",
         "send": "Envoyer",
@@ -29,7 +29,7 @@
         "logout": "Se déconnecter",
         "admin": "Administrateur",
         "enabled": "Activé",
-        "disabled": "Désactiver",
+        "disabled": "Désactivé",
         "reEnable": "Ré-activé",
         "disable": "Désactivé",
         "expiry": "Expiration",
@@ -40,8 +40,7 @@
         "accountStatus": "Statut du compte",
         "notSet": "Non défini",
         "myAccount": "Mon compte",
-        "contactMethods": "Moyens de contact",
+        "contactMethods": "Moyens de contact"
-        "referrals": "Programme de parrainage"
     },
     "notifications": {
         "errorLoginBlank": "Le nom d'utilisateur et/ou le mot de passe sont vides.",
@@ -52,16 +51,16 @@
     },
     "quantityStrings": {
         "year": {
-            "plural": "{n} années",
+            "plural": "{n] années",
-            "singular": "{n} année"
+            "singular": "{n] année"
         },
         "day": {
-            "singular": "{n} jour",
+            "singular": "{n] jour",
-            "plural": "{n} jours"
+            "plural": "{n] jours"
         },
         "month": {
-            "singular": "{n} mois",
+            "singular": "{n] mois",
-            "plural": "{n} mois"
+            "plural": "{n] mois"
         }
     }
 }

lang/common/hu-hu.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Magyar (HU)"
+        "name": "Angol (US)"
     },
     "strings": {
         "login": "Belépés",

lang/common/sv-se.json

@@ -23,22 +23,7 @@
         "expiry": "Löper ut",
         "edit": "Redigera",
         "delete": "Radera",
-        "inviteRemainingUses": "Återstående användningar",
+        "inviteRemainingUses": "Återstående användningar"
-        "send": "Skicka",
-        "linkDiscord": "Länka Discord",
-        "copied": "Kopierat",
-        "linkTelegram": "Länka Telegram",
-        "contactEmail": "Kontakta via e-post",
-        "contactTelegram": "Kontakta via Telegram",
-        "refresh": "Uppdatera",
-        "required": "Obligatoriskt",
-        "contactDiscord": "Kontakt via Discord",
-        "linkMatrix": "Länka Matrix",
-        "reEnable": "Återaktivera",
-        "disable": "Inaktivera",
-        "contactMethods": "Kontaktmetoder",
-        "accountStatus": "Kontostatus",
-        "notSet": "Inte inställt"
     },
     "notifications": {
         "errorLoginBlank": "Användarnamnet och/eller lösenordet lämnades tomt.",
@@ -46,5 +31,6 @@
         "errorUnknown": "Okänt fel.",
         "error401Unauthorized": "Obehörig. Prova att uppdatera sidan.",
         "errorSaveSettings": "Det gick inte att spara inställningarna."
-    }
+    },
+    "quantityStrings": {}
 }

lang/email/hu-HU.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Magyar (HU)"
+        "name": "Angol (US)"
     },
     "strings": {
         "ifItWasNotYou": "",

lang/form/fr-fr.json

@@ -7,11 +7,11 @@
         "pageTitle": "Créer un compte Jellyfin",
         "createAccountHeader": "Création du compte",
         "accountDetails": "Détails",
-        "emailAddress": "Email",
+        "emailAddress": "Courriel",
         "username": "Nom d'utilisateur",
         "password": "Mot de passe",
         "reEnterPassword": "Confirmez mot de passe",
-        "reEnterPasswordInvalid": "Les mots de passe ne sont pas pareils.",
+        "reEnterPasswordInvalid": "Les mots de passe ne correspondent pas.",
         "createAccountButton": "Créer le compte",
         "passwordRequirementsHeader": "Mot de passe requis",
         "successHeader": "Succès !",
@@ -35,10 +35,7 @@
         "editContactMethod": "Modifier le moyen de contact",
         "joinTheServer": "Rejoindre le serveur :",
         "customMessagePlaceholderHeader": "Personnaliser cette carte",
-        "resetPassword": "Réinitialisation mot de passe",
+        "resetPassword": "Réinitialisation de mot de passe"
-        "referralsDescription": "Invitez vos amis et votre famille à Jellyfin avec ce lien. Revenez ici pour en obtenir un nouveau s'il expire.",
-        "copyReferral": "Copier le lien",
-        "invitedBy": "Vous avez été invité par l'utilisateur {user}."
     },
     "validationStrings": {
         "length": {

lang/form/hu-hu.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Magyar (HU)"
+        "name": "Angol (US)"
     },
     "strings": {
         "pageTitle": "Jellyfin fiók létrehozása",

lang/pwreset/hu-HU.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Magyar (HU)"
+        "name": "Angol (US)"
     },
     "strings": {
         "passwordReset": "Jelszó visszaállítás",

lang/setup/fr-fr.json

@@ -8,7 +8,7 @@
         "back": "Retour",
         "optional": "Optionnel",
         "serverType": "Type de serveur",
-        "disabled": "Désactiver",
+        "disabled": "Désactivé",
         "enabled": "Activé",
         "port": "Port",
         "message": "Message",

lang/setup/hu-hu.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Magyar (HU)"
+        "name": "Angol (US)"
     },
     "strings": {
         "pageTitle": "Telepítés - jfa-go",

lang/telegram/en-us.json

@@ -11,8 +11,6 @@
         "languageMessage": "Note: See available languages with {command}, and set language with {command} <language code>.",
         "languageMessageDiscord": "Note: set your language with /lang <language name>.",
         "languageSet": "Language set to {language}.",
-        "discordDMs": "Please check your DMs for a response.",
+        "discordDMs": "Please check your DMs for a response."
-        "sentInvite": "Sent invite.",
-        "sentInviteFailure": "Failed to send invite, check logs."
     }
 }

lang/telegram/hu-HU.json

@@ -1,6 +1,6 @@
 {
     "meta": {
-        "name": "Magyar (HU)"
+        "name": "Angol (US)"
     },
     "strings": {
         "startMessage": "Helló!\nAdd meg a Jellyfin PIN kódodat itt, hogy megerősítsd a fiókodat.",

logger/logger.go

@@ -28,10 +28,9 @@ type Logger struct {
 	fatalFunc func(err interface{})
 }
 
-// Lshortfile is a re-implemented log.Lshortfile with a modifiable call level.
+func Lshortfile() string {
-func Lshortfile(level int) string {
 	// 0 = This function, 1 = Print/Printf/Println, 2 = Caller of Print/Printf/Println
-	_, file, line, ok := runtime.Caller(level)
+	_, file, line, ok := runtime.Caller(2)
 	lineString := strconv.Itoa(line)
 	if !ok {
 		return ""
@@ -48,10 +47,6 @@ func Lshortfile(level int) string {
 	return file + ":" + lineString + ":"
 }
 
-func lshortfile() string {
-	return Lshortfile(2)
-}
-
 func NewLogger(out io.Writer, prefix string, flag int, color c.Attribute) (l *Logger) {
 	l = &Logger{}
 	// Use reimplemented Lshortfile since wrapping the log functions messes them up
@@ -78,7 +73,7 @@ func (l *Logger) Printf(format string, v ...interface{}) {
 	}
 	var out string
 	if l.shortfile {
-		out = lshortfile()
+		out = Lshortfile()
 	}
 	out += " " + l.printer.Sprintf(format, v...)
 	l.logger.Print(out)
@@ -90,7 +85,7 @@ func (l *Logger) Print(v ...interface{}) {
 	}
 	var out string
 	if l.shortfile {
-		out = lshortfile()
+		out = Lshortfile()
 	}
 	out += " " + l.printer.Sprint(v...)
 	l.logger.Print(out)
@@ -102,7 +97,7 @@ func (l *Logger) Println(v ...interface{}) {
 	}
 	var out string
 	if l.shortfile {
-		out = lshortfile()
+		out = Lshortfile()
 	}
 	out += " " + l.printer.Sprintln(v...)
 	l.logger.Print(out)
@@ -114,7 +109,7 @@ func (l *Logger) Fatal(v ...interface{}) {
 	}
 	var out string
 	if l.shortfile {
-		out = lshortfile()
+		out = Lshortfile()
 	}
 	out += " " + l.printer.Sprint(v...)
 	l.logger.Fatal(out)
@@ -126,7 +121,7 @@ func (l *Logger) Fatalf(format string, v ...interface{}) {
 	}
 	var out string
 	if l.shortfile {
-		out = lshortfile()
+		out = Lshortfile()
 	}
 	out += " " + l.printer.Sprintf(format, v...)
 	if l.fatalFunc != nil {

main.go

@@ -246,12 +246,8 @@ func start(asDaemon, firstCall bool) {
 	}
 	if debugMode {
 		app.debug = logger.NewLogger(os.Stdout, "[DEBUG] ", log.Ltime|log.Lshortfile, color.FgYellow)
-		// Bind debug log
-		app.storage.debug = app.debug
-		app.storage.logActions = generateLogActions(app.config)
 	} else {
 		app.debug = logger.NewEmptyLogger()
-		app.storage.debug = nil
 	}
 	if *PPROF {
 		app.info.Print(warning("\n\nWARNING: Don't use pprof in production.\n\n"))

storage.go

@@ -10,10 +10,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hrfee/jfa-go/logger"
 	"github.com/hrfee/mediabrowser"
 	"github.com/timshannon/badgerhold/v4"
-	"gopkg.in/ini.v1"
 )
 
 type discordStore map[string]DiscordUser
@@ -26,18 +24,7 @@ type UserExpiry struct {
 	Expiry     time.Time
 }
 
-type DebugLogAction int
-
-const (
-	NoLog DebugLogAction = iota
-	LogAll
-	LogDeletion // Logs deletion, and wiping of main field in new data, e.g. setting email.addr to "".
-)
-
 type Storage struct {
-	debug      *logger.Logger
-	logActions map[string]DebugLogAction
-
 	timePattern string
 
 	db_path string
@@ -60,76 +47,6 @@ type Storage struct {
 	lang                                                                                                                                                                                                                                Lang
 }
 
-type StoreType int
-
-// Used for debug logging of storage.
-const (
-	StoredEmails StoreType = iota
-	StoredDiscord
-	StoredTelegram
-	StoredMatrix
-	StoredInvites
-	StoredAnnouncements
-	StoredExpiries
-	StoredProfiles
-	StoredCustomContent
-)
-
-// DebugWatch logs database writes according on the advanced debugging settings in the Advanced section
-func (st *Storage) DebugWatch(storeType StoreType, key, mainData string) {
-	if st.debug == nil {
-		return
-	}
-	actionKey := ""
-	switch storeType {
-	case StoredEmails:
-		actionKey = "emails"
-	case StoredDiscord:
-		actionKey = "discord"
-	case StoredTelegram:
-		actionKey = "telegram"
-	case StoredMatrix:
-		actionKey = "matrix"
-	case StoredInvites:
-		actionKey = "invites"
-	case StoredAnnouncements:
-		actionKey = "announcements"
-	case StoredExpiries:
-		actionKey = "expiries"
-	case StoredProfiles:
-		actionKey = "profiles"
-	case StoredCustomContent:
-		actionKey = "custom_content"
-	}
-
-	logAction := st.logActions[actionKey]
-	if logAction == NoLog {
-		return
-	}
-	actionString := "WRITE"
-	if mainData == "" {
-		actionString = "DELETE"
-	}
-	if logAction == LogAll || mainData == "" {
-		st.debug.Printf("%s @ %s %s[%s] = \"%s\"\n", actionString, logger.Lshortfile(3), actionKey, key, mainData)
-	}
-}
-
-func generateLogActions(c *ini.File) map[string]DebugLogAction {
-	m := map[string]DebugLogAction{}
-	for _, v := range []string{"emails", "discord", "telegram", "matrix", "invites", "announcements", "expirires", "profiles", "custom_content"} {
-		switch c.Section("advanced").Key("debug_log_" + v).MustString("none") {
-		case "none":
-			m[v] = NoLog
-		case "all":
-			m[v] = LogAll
-		case "deletion":
-			m[v] = LogDeletion
-		}
-	}
-	return m
-}
-
 func (app *appContext) ConnectDB() {
 	opts := badgerhold.DefaultOptions
 	opts.Dir = app.storage.db_path
@@ -166,7 +83,6 @@ func (st *Storage) GetEmailsKey(k string) (EmailAddress, bool) {
 
 // SetEmailsKey stores value v in key k.
 func (st *Storage) SetEmailsKey(k string, v EmailAddress) {
-	st.DebugWatch(StoredEmails, k, v.Addr)
 	v.JellyfinID = k
 	err := st.db.Upsert(k, v)
 	if err != nil {
@@ -176,7 +92,6 @@ func (st *Storage) SetEmailsKey(k string, v EmailAddress) {
 
 // DeleteEmailKey deletes value at key k.
 func (st *Storage) DeleteEmailsKey(k string) {
-	st.DebugWatch(StoredEmails, k, "")
 	st.db.Delete(k, EmailAddress{})
 }
 
@@ -204,7 +119,6 @@ func (st *Storage) GetDiscordKey(k string) (DiscordUser, bool) {
 
 // SetDiscordKey stores value v in key k.
 func (st *Storage) SetDiscordKey(k string, v DiscordUser) {
-	st.DebugWatch(StoredDiscord, k, v.Username)
 	v.JellyfinID = k
 	err := st.db.Upsert(k, v)
 	if err != nil {
@@ -214,7 +128,6 @@ func (st *Storage) SetDiscordKey(k string, v DiscordUser) {
 
 // DeleteDiscordKey deletes value at key k.
 func (st *Storage) DeleteDiscordKey(k string) {
-	st.DebugWatch(StoredDiscord, k, "")
 	st.db.Delete(k, DiscordUser{})
 }
 
@@ -242,7 +155,6 @@ func (st *Storage) GetTelegramKey(k string) (TelegramUser, bool) {
 
 // SetTelegramKey stores value v in key k.
 func (st *Storage) SetTelegramKey(k string, v TelegramUser) {
-	st.DebugWatch(StoredTelegram, k, v.Username)
 	v.JellyfinID = k
 	err := st.db.Upsert(k, v)
 	if err != nil {
@@ -252,7 +164,6 @@ func (st *Storage) SetTelegramKey(k string, v TelegramUser) {
 
 // DeleteTelegramKey deletes value at key k.
 func (st *Storage) DeleteTelegramKey(k string) {
-	st.DebugWatch(StoredTelegram, k, "")
 	st.db.Delete(k, TelegramUser{})
 }
 
@@ -280,7 +191,6 @@ func (st *Storage) GetMatrixKey(k string) (MatrixUser, bool) {
 
 // SetMatrixKey stores value v in key k.
 func (st *Storage) SetMatrixKey(k string, v MatrixUser) {
-	st.DebugWatch(StoredMatrix, k, v.UserID)
 	v.JellyfinID = k
 	err := st.db.Upsert(k, v)
 	if err != nil {
@@ -290,7 +200,6 @@ func (st *Storage) SetMatrixKey(k string, v MatrixUser) {
 
 // DeleteMatrixKey deletes value at key k.
 func (st *Storage) DeleteMatrixKey(k string) {
-	st.DebugWatch(StoredMatrix, k, "")
 	st.db.Delete(k, MatrixUser{})
 }
 
@@ -318,7 +227,6 @@ func (st *Storage) GetInvitesKey(k string) (Invite, bool) {
 
 // SetInvitesKey stores value v in key k.
 func (st *Storage) SetInvitesKey(k string, v Invite) {
-	st.DebugWatch(StoredInvites, k, "changed") // Not sure what the main data from this would be
 	v.Code = k
 	err := st.db.Upsert(k, v)
 	if err != nil {
@@ -328,7 +236,6 @@ func (st *Storage) SetInvitesKey(k string, v Invite) {
 
 // DeleteInvitesKey deletes value at key k.
 func (st *Storage) DeleteInvitesKey(k string) {
-	st.DebugWatch(StoredInvites, k, "")
 	st.db.Delete(k, Invite{})
 }
 
@@ -356,7 +263,6 @@ func (st *Storage) GetAnnouncementsKey(k string) (announcementTemplate, bool) {
 
 // SetAnnouncementsKey stores value v in key k.
 func (st *Storage) SetAnnouncementsKey(k string, v announcementTemplate) {
-	st.DebugWatch(StoredAnnouncements, k, v.Subject)
 	err := st.db.Upsert(k, v)
 	if err != nil {
 		// fmt.Printf("Failed to set announcement: %v\n", err)
@@ -365,7 +271,6 @@ func (st *Storage) SetAnnouncementsKey(k string, v announcementTemplate) {
 
 // DeleteAnnouncementsKey deletes value at key k.
 func (st *Storage) DeleteAnnouncementsKey(k string) {
-	st.DebugWatch(StoredAnnouncements, k, "")
 	st.db.Delete(k, announcementTemplate{})
 }
 
@@ -393,7 +298,6 @@ func (st *Storage) GetUserExpiryKey(k string) (UserExpiry, bool) {
 
 // SetUserExpiryKey stores value v in key k.
 func (st *Storage) SetUserExpiryKey(k string, v UserExpiry) {
-	st.DebugWatch(StoredExpiries, k, v.Expiry.String())
 	v.JellyfinID = k
 	err := st.db.Upsert(k, v)
 	if err != nil {
@@ -403,7 +307,6 @@ func (st *Storage) SetUserExpiryKey(k string, v UserExpiry) {
 
 // DeleteUserExpiryKey deletes value at key k.
 func (st *Storage) DeleteUserExpiryKey(k string) {
-	st.DebugWatch(StoredExpiries, k, "")
 	st.db.Delete(k, UserExpiry{})
 }
 
@@ -434,7 +337,6 @@ func (st *Storage) GetProfileKey(k string) (Profile, bool) {
 
 // SetProfileKey stores value v in key k.
 func (st *Storage) SetProfileKey(k string, v Profile) {
-	st.DebugWatch(StoredProfiles, k, "changed")
 	v.Name = k
 	v.Admin = v.Policy.IsAdministrator
 	if v.Policy.EnabledFolders != nil {
@@ -455,7 +357,6 @@ func (st *Storage) SetProfileKey(k string, v Profile) {
 
 // DeleteProfileKey deletes value at key k.
 func (st *Storage) DeleteProfileKey(k string) {
-	st.DebugWatch(StoredProfiles, k, "")
 	st.db.Delete(k, Profile{})
 }
 
@@ -500,7 +401,6 @@ func (st *Storage) MustGetCustomContentKey(k string) CustomContent {
 
 // SetCustomContentKey stores value v in key k.
 func (st *Storage) SetCustomContentKey(k string, v CustomContent) {
-	st.DebugWatch(StoredCustomContent, k, "changed")
 	v.Name = k
 	err := st.db.Upsert(k, v)
 	if err != nil {
@@ -510,7 +410,6 @@ func (st *Storage) SetCustomContentKey(k string, v CustomContent) {
 
 // DeleteCustomContentKey deletes value at key k.
 func (st *Storage) DeleteCustomContentKey(k string) {
-	st.DebugWatch(StoredCustomContent, k, "")
 	st.db.Delete(k, CustomContent{})
 }