From 84bf4700eca645e88fbaef3a726a1158e124087d Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@liquidbytes.net>
Date: Sun, 8 Dec 2019 22:45:45 +0100
Subject: [PATCH] Fix search query parser (unicode)

Signed-off-by: Michael Mayer <michael@liquidbytes.net>
---
 frontend/src/component/p-album-search.vue |  4 +++-
 frontend/src/component/p-photo-search.vue |  4 +++-
 frontend/src/pages/album/photos.vue       |  6 +++++-
 frontend/src/pages/photos.vue             |  6 +++++-
 frontend/src/pages/settings/general.vue   |  4 +++-
 internal/api/photos.go                    |  1 +
 internal/form/photo_search.go             | 13 ++++++-------
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/frontend/src/component/p-album-search.vue b/frontend/src/component/p-album-search.vue
index 4ea5b4fb4..8e390f891 100644
--- a/frontend/src/component/p-album-search.vue
+++ b/frontend/src/component/p-album-search.vue
@@ -1,5 +1,7 @@
 <template>
-    <v-form ref="form" autocomplete="off" class="p-photo-search p-album-photo-search" lazy-validation @submit.prevent="filterChange" dense>
+    <v-form lazy-validation dense
+            ref="form" autocomplete="off" class="p-photo-search p-album-photo-search" accept-charset="UTF-8"
+            @submit.prevent="filterChange">
         <v-toolbar flat color="secondary">
             <v-text-field class="pt-3 pr-3 p-search-field"
                           browser-autocomplete="off"
diff --git a/frontend/src/component/p-photo-search.vue b/frontend/src/component/p-photo-search.vue
index 7240b464b..c24ce322e 100644
--- a/frontend/src/component/p-photo-search.vue
+++ b/frontend/src/component/p-photo-search.vue
@@ -1,5 +1,7 @@
 <template>
-    <v-form ref="form" autocomplete="off" class="p-photo-search" lazy-validation @submit.prevent="filterChange" dense>
+    <v-form lazy-validation dense
+            ref="form" autocomplete="off" class="p-photo-search" accept-charset="UTF-8"
+            @submit.prevent="filterChange">
         <v-toolbar flat color="secondary">
             <v-text-field class="pt-3 pr-3 p-search-field"
                           browser-autocomplete="off"
diff --git a/frontend/src/pages/album/photos.vue b/frontend/src/pages/album/photos.vue
index 1e1540ae6..c23699561 100644
--- a/frontend/src/pages/album/photos.vue
+++ b/frontend/src/pages/album/photos.vue
@@ -113,7 +113,7 @@
                 const photo = this.results[index];
 
                 if (photo.PhotoLat && photo.PhotoLong) {
-                    this.$router.push({name: "places", query: {lat: photo.PhotoLat, long: photo.PhotoLong}});
+                    this.$router.push({name: "places", query: {lat: String(photo.PhotoLat), long: String(photo.PhotoLong)}});
                 } else if (photo.LocName) {
                     this.$router.push({name: "places", query: {q: photo.LocName}});
                 } else if (photo.LocCity) {
@@ -165,6 +165,10 @@
                     }
                 }
 
+                if (JSON.stringify(this.$route.query) === JSON.stringify(query)) {
+                    return
+                }
+
                 this.$router.replace({query: query});
             },
             searchParams() {
diff --git a/frontend/src/pages/photos.vue b/frontend/src/pages/photos.vue
index 54783b04f..45726fcd1 100644
--- a/frontend/src/pages/photos.vue
+++ b/frontend/src/pages/photos.vue
@@ -106,7 +106,7 @@
                 const photo = this.results[index];
 
                 if (photo.PhotoLat && photo.PhotoLong) {
-                    this.$router.push({name: "places", query: {lat: photo.PhotoLat, long: photo.PhotoLong}});
+                    this.$router.push({name: "places", query: {lat: String(photo.PhotoLat), long: String(photo.PhotoLong)}});
                 } else if (photo.LocName) {
                     this.$router.push({name: "places", query: {q: photo.LocName}});
                 } else if (photo.LocCity) {
@@ -157,6 +157,10 @@
                     }
                 }
 
+                if (JSON.stringify(this.$route.query) === JSON.stringify(query)) {
+                    return
+                }
+
                 this.$router.replace({query: query});
             },
             searchParams() {
diff --git a/frontend/src/pages/settings/general.vue b/frontend/src/pages/settings/general.vue
index 10a13d72f..bf7c837b5 100644
--- a/frontend/src/pages/settings/general.vue
+++ b/frontend/src/pages/settings/general.vue
@@ -1,7 +1,9 @@
 <template>
     <div class="p-tab p-tab-general">
         <v-container fluid>
-            <v-form ref="form" class="p-form-settings" lazy-validation @submit.prevent="save" dense>
+            <v-form lazy-validation dense
+                    ref="form" class="p-form-settings" accept-charset="UTF-8"
+                    @submit.prevent="save">
                 <v-layout wrap align-center>
                     <v-flex xs12 sm6 class="pr-3">
                         <v-select
diff --git a/internal/api/photos.go b/internal/api/photos.go
index 80a4cfe70..20d6c324e 100644
--- a/internal/api/photos.go
+++ b/internal/api/photos.go
@@ -41,6 +41,7 @@ func GetPhotos(router *gin.RouterGroup, conf *config.Config) {
 		}
 
 		result, err := search.Photos(f)
+
 		if err != nil {
 			c.AbortWithStatusJSON(400, gin.H{"error": util.UcFirst(err.Error())})
 			return
diff --git a/internal/form/photo_search.go b/internal/form/photo_search.go
index a9df03964..a87d277bb 100644
--- a/internal/form/photo_search.go
+++ b/internal/form/photo_search.go
@@ -1,7 +1,6 @@
 package form
 
 import (
-	"bytes"
 	"fmt"
 	"reflect"
 	"strconv"
@@ -48,7 +47,7 @@ type PhotoSearch struct {
 }
 
 func (f *PhotoSearch) ParseQueryString() (result error) {
-	var key, value []byte
+	var key, value []rune
 	var escaped, isKeyValue bool
 
 	query := f.Query
@@ -62,9 +61,9 @@ func (f *PhotoSearch) ParseQueryString() (result error) {
 	for _, char := range query {
 		if unicode.IsSpace(char) && !escaped {
 			if isKeyValue {
-				fieldName := string(bytes.Title(bytes.ToLower(key)))
+				fieldName := strings.Title(string(key))
 				field := formValues.FieldByName(fieldName)
-				stringValue := string(bytes.ToLower(value))
+				stringValue := string(value)
 
 				if field.CanSet() {
 					switch field.Interface().(type) {
@@ -109,7 +108,7 @@ func (f *PhotoSearch) ParseQueryString() (result error) {
 					result = fmt.Errorf("unknown filter: %s", fieldName)
 				}
 			} else {
-				f.Query = string(bytes.ToLower(key))
+				f.Query = string(key)
 			}
 
 			escaped = false
@@ -121,9 +120,9 @@ func (f *PhotoSearch) ParseQueryString() (result error) {
 		} else if char == '"' {
 			escaped = !escaped
 		} else if isKeyValue {
-			value = append(value, byte(char))
+			value = append(value, unicode.ToLower(char))
 		} else {
-			key = append(key, byte(char))
+			key = append(key, unicode.ToLower(char))
 		}
 	}