Added auto-save whitespace behavior if it changed manually when watching diff

Author: POPSuL

models/migrations/migrations.go

@@ -309,6 +309,8 @@ var migrations = []Migration{
 	NewMigration("Add LFS columns to Mirror", addLFSMirrorColumns),
 	// v179 -> v180
 	NewMigration("Convert avatar url to text", convertAvatarURLToText),
+	// v180 -> v181
+	NewMigration("Add WhitespaceBehavior to User table", addWhitespaceBehaviorUserColumn),
 }
 
 // GetCurrentDBVersion returns the current db version

models/migrations/v180.go

@@ -0,0 +1,17 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package migrations
+
+import (
+	"xorm.io/xorm"
+)
+
+func addWhitespaceBehaviorUserColumn(x *xorm.Engine) error {
+	type User struct {
+		WhitespaceBehavior bool `xorm:"NOT NULL DEFAULT false"`
+	}
+
+	return x.Sync2(new(User))
+}

models/user.go

@@ -166,6 +166,7 @@ type User struct {
 
 	// Preferences
 	DiffViewStyle       string `xorm:"NOT NULL DEFAULT ''"`
+	WhitespaceBehavior  string `xorm:"NOT NULL DEFAULT ''"`
 	Theme               string `xorm:"NOT NULL DEFAULT ''"`
 	KeepActivityPrivate bool   `xorm:"NOT NULL DEFAULT false"`
 }
@@ -221,6 +222,12 @@ func (u *User) UpdateDiffViewStyle(style string) error {
 	return UpdateUserCols(u, "diff_view_style")
 }
 
+// UpdateWhitespaceBehavior updates the users diff whitespace behavior
+func (u *User) UpdateWhitespaceBehavior(behavior string) error {
+	u.WhitespaceBehavior = behavior
+	return UpdateUserCols(u, "whitespace_behavior")
+}
+
 // UpdateTheme updates a users' theme irrespective of the site wide theme
 func (u *User) UpdateTheme(themeName string) error {
 	u.Theme = themeName

routers/repo/middlewares.go

@@ -62,11 +62,32 @@ func SetDiffViewStyle(ctx *context.Context) {
 
 // SetWhitespaceBehavior set whitespace behavior as render variable
 func SetWhitespaceBehavior(ctx *context.Context) {
-	whitespaceBehavior := ctx.Query("whitespace")
-	switch whitespaceBehavior {
-	case "ignore-all", "ignore-eol", "ignore-change":
-		ctx.Data["WhitespaceBehavior"] = whitespaceBehavior
-	default:
-		ctx.Data["WhitespaceBehavior"] = ""
+	queryWhitespaceBehavior := ctx.Query("whitespace")
+	if !ctx.IsSigned {
+		switch queryWhitespaceBehavior {
+		case "ignore-all", "ignore-eol", "ignore-change":
+			ctx.Data["WhitespaceBehavior"] = queryWhitespaceBehavior
+		default:
+			ctx.Data["WhitespaceBehavior"] = ""
+		}
+		return
+	}
+
+	var (
+		userWhitespaceBehaviour = ctx.User.WhitespaceBehavior
+		whitespaceBehavior      string
+	)
+
+	if queryWhitespaceBehavior == "ignore-all" || queryWhitespaceBehavior == "ignore-eol" || queryWhitespaceBehavior == "ignore-change" || queryWhitespaceBehavior == "" {
+		whitespaceBehavior = queryWhitespaceBehavior
+	} else if userWhitespaceBehaviour == "ignore-all" || userWhitespaceBehaviour == "ignore-eol" || userWhitespaceBehaviour == "ignore-change" || userWhitespaceBehaviour == "" {
+		whitespaceBehavior = userWhitespaceBehaviour
+	} else {
+		whitespaceBehavior = ""
+	}
+
+	ctx.Data["WhitespaceBehavior"] = whitespaceBehavior
+	if err := ctx.User.UpdateWhitespaceBehavior(whitespaceBehavior); err != nil {
+		ctx.ServerError("ErrUpdateWhitespaceBehavior", err)
 	}
 }