Fix bug with videos getting tripped by the image fingerprint matcher

pkg/gcsql/initsql/init.go

@@ -1,6 +1,7 @@
 package initsql
 
 import (
+	"errors"
 	"net/http"
 	"path"
 	"strconv"
@@ -150,6 +151,10 @@ func init() {
 		fingerprint, err := uploads.GetFileFingerprint(path.Join(
 			config.GetSystemCriticalConfig().DocumentRoot,
 			dir, "src", u.Filename))
+		if errors.Is(err, uploads.ErrVideoThumbFingerprint) {
+			// admin hasn't enabled video thumbnail fingerprinting in the config, let it through
+			return false, nil
+		}
 		return fingerprint == fc.Search, err
 	})
 }

pkg/posting/uploads/fingerprinting.go

@@ -40,23 +40,22 @@ func GetPostImageFingerprint(postID int) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	subDir := "src"
-	if !IsImage(filename) && !IsVideo(filename) {
-		return "", ErrUnsupportedFileExt
-	} else if IsVideo(filename) {
-		if !config.GetSiteConfig().FingerprintVideoThumbnails {
-			return "", ErrVideoThumbFingerprint
-		}
-		filename, _ = GetThumbnailFilenames(filename)
-		subDir = "thumb"
-	}
-	filePath := path.Join(config.GetSystemCriticalConfig().DocumentRoot,
-		board, subDir, filename)
-
+	filePath := path.Join(config.GetSystemCriticalConfig().DocumentRoot, board, "src", filename)
 	return GetFileFingerprint(filePath)
 }
 
 func GetFileFingerprint(filePath string) (string, error) {
+	if !IsImage(filePath) && !IsVideo(filePath) {
+		return "", ErrUnsupportedFileExt
+	} else if IsVideo(filePath) {
+		if !config.GetSiteConfig().FingerprintVideoThumbnails {
+			return "", ErrVideoThumbFingerprint
+		}
+		filePath, _ = GetThumbnailFilenames(filePath)
+		filename := path.Base(filePath)
+		fileBoardPath := path.Dir(path.Dir(filePath))
+		filePath = path.Join(fileBoardPath, "thumb", filename)
+	}
 	img, err := imaging.Open(filePath)
 	if err != nil {
 		return "", err