fix

Author: NorthRealm

models/user/user_notification_test.go

@@ -17,6 +17,8 @@ func TestUserNotificationSettings(t *testing.T) {
 
 	settings, err := GetUserNotificationSettings(db.DefaultContext, 1)
 	assert.NoError(t, err)
+	assert.NotNil(t, settings.User)
+	assert.Equal(t, settings.User.ID, settings.UserID)
 	assert.Equal(t, NotificationGiteaActionsFailureOnly, settings.Actions)
 
 	assert.NoError(t, UpdateUserNotificationSettings(db.DefaultContext, &NotificationSettings{
@@ -25,6 +27,8 @@ func TestUserNotificationSettings(t *testing.T) {
 	}))
 	settings, err = GetUserNotificationSettings(db.DefaultContext, 1)
 	assert.NoError(t, err)
+	assert.NotNil(t, settings.User)
+	assert.Equal(t, settings.User.ID, settings.UserID)
 	assert.Equal(t, NotificationGiteaActionsAll, settings.Actions)
 
 	assert.NoError(t, UpdateUserNotificationSettings(db.DefaultContext, &NotificationSettings{
@@ -33,5 +37,7 @@ func TestUserNotificationSettings(t *testing.T) {
 	}))
 	settings, err = GetUserNotificationSettings(db.DefaultContext, 1)
 	assert.NoError(t, err)
+	assert.NotNil(t, settings.User)
+	assert.Equal(t, settings.User.ID, settings.UserID)
 	assert.Equal(t, NotificationGiteaActionsDisabled, settings.Actions)
 }

routers/web/user/setting/notifications.go

@@ -87,7 +87,7 @@ func NotificationsActionsEmailPost(ctx *context.Context) {
 	opts := &user.UpdateNotificationSettingsOptions{
 		Actions: optional.Some(preference),
 	}
-	if err := user.UpdateNotificationSettings(ctx, new(user_model.NotificationSettings), opts); err != nil {
+	if err := user.UpdateNotificationSettings(ctx, ctx.Doer.ID, opts); err != nil {
 		log.Error("Cannot set actions email notifications preference: %v", err)
 		ctx.ServerError("UpdateNotificationSettings", err)
 		return

services/user/update.go

@@ -249,7 +249,10 @@ type UpdateNotificationSettingsOptions struct {
 	Actions optional.Option[string]
 }
 
-func UpdateNotificationSettings(ctx context.Context, settings *user_model.NotificationSettings, opts *UpdateNotificationSettingsOptions) error {
+func UpdateNotificationSettings(ctx context.Context, userID int64, opts *UpdateNotificationSettingsOptions) error {
+	settings := &user_model.NotificationSettings{
+		UserID: userID,
+	}
 	if opts.Actions.Has() {
 		settings.Actions = opts.Actions.Value()
 	}