fix nil stmt panic

LiterMC · Apr 3, 2024 · f95d938 · f95d938
1 parent 4f764fc
commit f95d938
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/database/sql.go b/database/sql.go
@@ -526,6 +526,9 @@ func (db *SqlDB) setupSubscribeQuestionMark(ctx context.Context) (err error) {
 	if db.subscribeStmts.setUpdateScopesOnly, err = db.db.PrepareContext(ctx, setUpdateScopesOnlyCmd); err != nil {
 		return
 	}
+	if db.subscribeStmts.setUpdateLastReportOnly, err = db.db.PrepareContext(ctx, setUpdateLastReportOnlyCmd); err != nil {
+		return
+	}
 
 	const removeDeleteCmd = "DELETE FROM " + tableName +
 		" WHERE `user`=? AND `client`=?"

diff --git a/notify/email/email.go b/notify/email/email.go
@@ -52,7 +52,13 @@ var tmpl = func() *template.Template {
 				return "", fmt.Errorf("Except string or bytes, got %T", v)
 			}
 		},
-		"tojson": json.Marshal,
+		"tojson": func(v any) (string, error) {
+			buf, err := json.Marshal(v)
+			if err != nil {
+				return "", err
+			}
+			return (string)(buf), nil
+		},
 	})
 	template.Must(t.ParseFS(tmplFS, "**/*.gohtml"))
 	return t

diff --git a/notify/manager.go b/notify/manager.go
@@ -99,6 +99,7 @@ func (m *Manager) OnEnabled() {
 	res := make(chan error, 0)
 	for _, p := range m.plugins {
 		go func(p Plugin) {
+			defer log.RecoverPanic()
 			res <- p.OnEnabled(e)
 		}(p)
 	}
@@ -116,6 +117,7 @@ func (m *Manager) OnDisabled() {
 	res := make(chan error, 0)
 	for _, p := range m.plugins {
 		go func(p Plugin) {
+			defer log.RecoverPanic()
 			res <- p.OnDisabled(e)
 		}(p)
 	}
@@ -137,6 +139,7 @@ func (m *Manager) OnSyncBegin(count int, size int64) {
 	res := make(chan error, 0)
 	for _, p := range m.plugins {
 		go func(p Plugin) {
+			defer log.RecoverPanic()
 			res <- p.OnSyncBegin(e)
 		}(p)
 	}
@@ -154,6 +157,7 @@ func (m *Manager) OnSyncDone() {
 	res := make(chan error, 0)
 	for _, p := range m.plugins {
 		go func(p Plugin) {
+			defer log.RecoverPanic()
 			res <- p.OnSyncDone(e)
 		}(p)
 	}
@@ -176,6 +180,7 @@ func (m *Manager) OnUpdateAvaliable(release *update.GithubRelease) {
 	res := make(chan error, 0)
 	for _, p := range m.plugins {
 		go func(p Plugin) {
+			defer log.RecoverPanic()
 			res <- p.OnUpdateAvaliable(e)
 		}(p)
 	}
@@ -208,6 +213,7 @@ func (m *Manager) OnReportStatus(stats *Stats) {
 	res := make(chan error, 0)
 	for _, p := range m.plugins {
 		go func(p Plugin) {
+			defer log.RecoverPanic()
 			res <- p.OnReportStatus(e)
 		}(p)
 	}