From ae83a1c701f7bd659c029dbad0d3d290ee53a61b Mon Sep 17 00:00:00 2001 From: Azareal Date: Tue, 23 Jun 2020 06:26:10 +1000 Subject: [PATCH] update brotli and mssql deps add a couple more canonemail test cases --- go.mod | 4 ++-- go.sum | 9 +++++++++ misc_test.go | 12 +++++++++++- public/member.js | 2 +- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 0c276465..94b5a4a3 100644 --- a/go.mod +++ b/go.mod @@ -4,8 +4,8 @@ require ( cloud.google.com/go v0.31.0 // indirect github.com/Azareal/gopsutil v0.0.0-20170716174751-0763ca4e911d github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect - github.com/andybalholm/brotli v1.0.1-0.20200508234816-e2c5f2109f20 - github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f + github.com/andybalholm/brotli v1.0.1-0.20200619015827-c3da72aa01ed + github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc github.com/fortytw2/leaktest v1.3.0 // indirect github.com/fsnotify/fsnotify v1.4.9 github.com/go-ole/go-ole v1.2.1 // indirect diff --git a/go.sum b/go.sum index eb30f12d..d61c3f42 100644 --- a/go.sum +++ b/go.sum @@ -10,12 +10,18 @@ github.com/andybalholm/brotli v1.0.0 h1:7UCwP93aiSfvWpapti8g88vVVGp2qqtGyePsSuDa github.com/andybalholm/brotli v1.0.0/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/andybalholm/brotli v1.0.1-0.20200508234816-e2c5f2109f20 h1:pa+MyizoSKiho/6GZGXpAos2Ys/DhQND/SAiumgjgoQ= github.com/andybalholm/brotli v1.0.1-0.20200508234816-e2c5f2109f20/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.1-0.20200510083619-a01a7b12c94e h1:cDaBGqWGgjs/qw5xkI9lZonVLwFcFZ4lio9Bxd63F7c= +github.com/andybalholm/brotli v1.0.1-0.20200510083619-a01a7b12c94e/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= +github.com/andybalholm/brotli v1.0.1-0.20200619015827-c3da72aa01ed h1:G/gj6aolvcaqMTCmlHRDsLLQlJ/fXTC4vE9o18KRZtw= +github.com/andybalholm/brotli v1.0.1-0.20200619015827-c3da72aa01ed/go.mod h1:loMXtMfwqflxFJPmdbJO0a3KNoPuLBgiu3qAvBg8x/Y= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f h1:WH0w/R4Yoey+04HhFxqZ6VX6I0d7RMyw5aXQ9UTvQPs= github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc= +github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzqk8QCaRC4os14xoKDdbHqqlJtJA0oc1ZAjg= +github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo= github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= @@ -34,6 +40,8 @@ github.com/go-sql-driver/mysql v1.4.0 h1:7LxgVwFb2hIQtMm87NdgAVfXjnt4OePseqT1tKx github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -85,6 +93,7 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20181025213731-e84da0312774 h1:a4tQYYYuK9QdeO/+kEvNYyuR21S+7ve5EANok6hABhI= golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88= golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U= diff --git a/misc_test.go b/misc_test.go index 14a9f19b..3e023401 100644 --- a/misc_test.go +++ b/misc_test.go @@ -2008,8 +2008,18 @@ func TestUtils(t *testing.T) { cemail = c.CanonEmail(email) expect(t, cemail == email, fmt.Sprintf("%s should be %s", cemail, email)) + email = "" + eemail := "" + cemail = c.CanonEmail(email) + expect(t, cemail == eemail, fmt.Sprintf("%s should be %s", cemail, eemail)) + + email = "ddd" + eemail = "ddd" + cemail = c.CanonEmail(email) + expect(t, cemail == eemail, fmt.Sprintf("%s should be %s", cemail, eemail)) + email = "test.test@gmail.com" - eemail := "testtest@gmail.com" + eemail = "testtest@gmail.com" cemail = c.CanonEmail(email) expect(t, cemail == eemail, fmt.Sprintf("%s should be %s", cemail, eemail)) diff --git a/public/member.js b/public/member.js index a8f933ce..94e93d13 100644 --- a/public/member.js +++ b/public/member.js @@ -100,7 +100,7 @@ var imageExts = ["png","jpg","jpe","jpeg","jif","jfi","jfif","svg","bmp","gif"," // Quick Topic / Quick Reply function uploadAttachHandler() { try { - uploadFileHandler(this.files, 5, (e,fname) => { + uploadFileHandler(this.files,5,(e,fname) => { // TODO: Use client templates here let fileDock = document.getElementById("upload_file_dock"); let fileItem = document.createElement("label");