Go 1.22 upgrade

go.mod

@@ -1,63 +1,63 @@
 module code.nonshy.com/nonshy/website
 
-go 1.18
+go 1.22
+
+toolchain go1.22.0
 
 require (
 	git.kirsle.net/go/log v0.0.0-20200902035305-70ac2848949b
+	github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f
 	github.com/go-redis/redis/v8 v8.11.5
-	github.com/google/uuid v1.3.0
+	github.com/golang-jwt/jwt/v4 v4.5.0
-	github.com/urfave/cli/v2 v2.11.1
+	github.com/google/uuid v1.6.0
-	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
+	github.com/microcosm-cc/bluemonday v1.0.26
-	gorm.io/driver/postgres v1.3.8
+	github.com/oschwald/geoip2-golang v1.9.0
-	gorm.io/driver/sqlite v1.3.6
+	github.com/pquerna/otp v1.4.0
-	gorm.io/gorm v1.23.8
+	github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629
+	github.com/urfave/cli/v2 v2.27.1
+	golang.org/x/crypto v0.19.0
+	golang.org/x/image v0.15.0
+	golang.org/x/text v0.14.0
+	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
+	gorm.io/driver/postgres v1.5.6
+	gorm.io/driver/sqlite v1.5.5
+	gorm.io/gorm v1.25.7
 )
 
 require (
 	github.com/aymerick/douceur v0.2.0 // indirect
-	github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
+	github.com/boombuler/barcode v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
-	github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f // indirect
+	github.com/gorilla/css v1.0.1 // indirect
-	github.com/go-redis/redis v6.15.9+incompatible // indirect
-	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
-	github.com/gorilla/css v1.0.0 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.12.1 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jackc/pgx/v5 v5.5.3 // indirect
-	github.com/jackc/pgtype v1.11.0 // indirect
+	github.com/jackc/puddle/v2 v2.2.1 // indirect
-	github.com/jackc/pgx/v4 v4.16.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/mattn/go-sqlite3 v1.14.14 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.19 // indirect
+	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
-	github.com/oschwald/geoip2-golang v1.9.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
-	github.com/oschwald/maxminddb-golang v1.11.0 // indirect
+	github.com/russross/blackfriday v1.6.0 // indirect
-	github.com/pquerna/otp v1.4.0 // indirect
-	github.com/russross/blackfriday v1.5.2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd // indirect
-	github.com/sergi/go-diff v1.2.0 // indirect
+	github.com/sergi/go-diff v1.3.1 // indirect
-	github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629 // indirect
+	github.com/shurcooL/go v0.0.0-20230706063926-5fe729b41b3a // indirect
-	github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 // indirect
+	github.com/shurcooL/go-goon v1.0.0 // indirect
-	github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b // indirect
+	github.com/shurcooL/highlight_diff v0.0.0-20230708024848-22f825814995 // indirect
-	github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c // indirect
+	github.com/shurcooL/highlight_go v0.0.0-20230708025100-33e05792540a // indirect
+	github.com/shurcooL/octicon v0.0.0-20230705024016-66bff059edb8 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
 	github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d // indirect
 	github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect
 	github.com/tomnomnom/xtermcolor v0.0.0-20160428124646-b78803f00a7e // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
-	golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 // indirect
+	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/term v0.17.0 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.12 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
-	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
 )

go.sum

@@ -1,20 +1,16 @@
 git.kirsle.net/go/log v0.0.0-20200902035305-70ac2848949b h1:TDxEEWOJqMzsu9JW8/QgmT1lgQ9WD2KWlb2lKN/Ql2o=
 git.kirsle.net/go/log v0.0.0-20200902035305-70ac2848949b/go.mod h1:jl+Qr58W3Op7OCxIYIT+b42jq8xFncJXzPufhrvza7Y=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
-github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
-github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+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/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
@@ -22,253 +18,126 @@ github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
 github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f h1:RMnUwTnNR070mFAEIoqMYjNirHj8i0h79VXTYyBCyVA=
 github.com/edwvee/exiffix v0.0.0-20210922235313-0f6cbda5e58f/go.mod h1:KoE3Ti1qbQXCb3s/XGj0yApHnbnNnn1bXTtB5Auq/Vc=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg=
-github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
-github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
-github.com/golang-jwt/jwt/v4 v4.4.3 h1:Hxl6lhQFj4AnOX6MLrsCb/+7tCj7DxP7VA+2rDIq5AU=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
-github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
-github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
-github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
-github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
-github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
-github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
-github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
-github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
-github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
-github.com/jackc/pgconn v1.12.1 h1:rsDFzIpRk7xT4B8FufgpCCeyjdNpKyghZeSefViE5W8=
-github.com/jackc/pgconn v1.12.1/go.mod h1:ZkhRC59Llhrq3oSfrikvwQ5NaxYExr6twkdkMLaKono=
-github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
-github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
-github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
-github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
-github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
+github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 h1:L0QtFUgDarD7Fpv9jeVMgy/+Ec0mtnmYuImjTz6dtDA=
-github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
+github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
+github.com/jackc/pgx/v5 v5.5.3 h1:Ces6/M3wbDXYpM8JyyPD57ivTtJACFZJd885pdIaV2s=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
+github.com/jackc/pgx/v5 v5.5.3/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
-github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.3.0 h1:brH0pCGBDkBW07HWlN/oSBXrmo3WB0UvZd1pIuDcL8Y=
-github.com/jackc/pgproto3/v2 v2.3.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
-github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
-github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
-github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
-github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
-github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
-github.com/jackc/pgtype v1.11.0 h1:u4uiGPz/1hryuXzyaBhSk6dnIyyG2683olG2OV+UUgs=
-github.com/jackc/pgtype v1.11.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
-github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
-github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
-github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
-github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
-github.com/jackc/pgx/v4 v4.16.1 h1:JzTglcal01DrghUqt+PmzWsZx/Yh7SC/CTQmSBMTd0Y=
-github.com/jackc/pgx/v4 v4.16.1/go.mod h1:SIhx0D5hoADaiXZVyv+3gSm3LCIIINTVO0PficsvWGQ=
-github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/microcosm-cc/bluemonday v1.0.26 h1:xbqSvqzQMeEHCqMi64VAs4d8uy6Mequs3rQ0k/Khz58=
-github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/microcosm-cc/bluemonday v1.0.26/go.mod h1:JyzOCs9gkyQyjs+6h10UEVSe02CGwkhd72Xdqh78TWs=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
+github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
-github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
-github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
-github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/microcosm-cc/bluemonday v1.0.19 h1:OI7hoF5FY4pFz2VA//RN8TfM0YJ2dJcl4P4APrCWy6c=
-github.com/microcosm-cc/bluemonday v1.0.19/go.mod h1:QNzV2UbLK2/53oIIwTOyLUSABMkjZ4tqiyC1g/DyqxE=
 github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=
 github.com/oschwald/geoip2-golang v1.9.0/go.mod h1:BHK6TvDyATVQhKNbQBdrj9eAvuwOMi2zSFXizL3K81Y=
-github.com/oschwald/maxminddb-golang v1.11.0 h1:aSXMqYR/EPNjGE8epgqwDay+P30hCBZIveY0WZbAWh0=
+github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
-github.com/oschwald/maxminddb-golang v1.11.0/go.mod h1:YmVI+H0zh3ySFR3w+oz8PCfglAFj3PuCmui13+P9zDg=
+github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg=
 github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
-github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
-github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
+github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd h1:CmH9+J6ZSsIjUK3dcGsnCnO41eRBOnY12zwkn5qVwgc=
 github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
-github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
-github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
-github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629 h1:86e54L0i3pH3dAIA8OxBbfLrVyhoGpnNk1iJCigAWYs=
 github.com/shurcooL/github_flavored_markdown v0.0.0-20210228213109-c3a9aa474629/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
-github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480 h1:KaKXZldeYH73dpQL+Nr38j1r5BgpAYQjYvENOUpIZDQ=
+github.com/shurcooL/go v0.0.0-20230706063926-5fe729b41b3a h1:ZHfoO7ZJhws9NU1kzZhStUnnVQiPtDe1PzpUnc6HirU=
-github.com/shurcooL/highlight_diff v0.0.0-20181222201841-111da2e7d480/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
+github.com/shurcooL/go v0.0.0-20230706063926-5fe729b41b3a/go.mod h1:DNrlr0AR9NsHD/aoc2pPeu4uSBZ/71yCHkR42yrzW3M=
-github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b h1:rBIwpb5ggtqf0uZZY5BPs1sL7njUMM7I8qD2jiou70E=
+github.com/shurcooL/go-goon v1.0.0 h1:BCQPvxGkHHJ4WpBO4m/9FXbITVIsvAm/T66cCcCGI7E=
-github.com/shurcooL/highlight_go v0.0.0-20191220051317-782971ddf21b/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
+github.com/shurcooL/go-goon v1.0.0/go.mod h1:2wTHMsGo7qnpmqA8ADYZtP4I1DD94JpXGQ3Dxq2YQ5w=
-github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c h1:p3w+lTqXulfa3aDeycxmcLJDNxyUB89gf2/XqqK3eO0=
+github.com/shurcooL/highlight_diff v0.0.0-20230708024848-22f825814995 h1:/6Fa0HAouqks/nlr3C3sv7KNDqutP3CM/MYz225uO28=
-github.com/shurcooL/octicon v0.0.0-20191102190552-cbb32d6a785c/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
+github.com/shurcooL/highlight_diff v0.0.0-20230708024848-22f825814995/go.mod h1:eqklBUMsamqZbxXhhr6GafgswFTa5Aq12VQ0I2lnCR8=
+github.com/shurcooL/highlight_go v0.0.0-20230708025100-33e05792540a h1:aMmA4ghJXuzwIS/mEK+bf7U2WZECRxa3sPgR4QHj8Hw=
+github.com/shurcooL/highlight_go v0.0.0-20230708025100-33e05792540a/go.mod h1:kLtotffsKtKsCupV8wNnNwQQHBccB1Oy5VSg8P409Go=
+github.com/shurcooL/octicon v0.0.0-20230705024016-66bff059edb8 h1:W5meM/5DP0Igf+pS3Se363Y2DoDv9LUuZgQ24uG9LNY=
+github.com/shurcooL/octicon v0.0.0-20230705024016-66bff059edb8/go.mod h1:hWBWTvIJ918VxbNOk2hxQg1/5j1M9yQI1Kp8d9qrOq8=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d h1:yKm7XZV6j9Ev6lojP2XaIshpT4ymkqhMeSghO5Ps00E=
 github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG93cPwA5f7s/ZPBJnGOYQNK/vKsaDaseuKT5Asee8=
 github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tomnomnom/xtermcolor v0.0.0-20160428124646-b78803f00a7e h1:Ee+VZw13r9NTOMnwTPs6O5KZ0MJU54hsxu9FpZ4pQ10=
 github.com/tomnomnom/xtermcolor v0.0.0-20160428124646-b78803f00a7e/go.mod h1:fSIW/szJHsRts/4U8wlMPhs+YqJC+7NYR+Qqb1uJVpA=
-github.com/urfave/cli/v2 v2.11.1 h1:UKK6SP7fV3eKOefbS87iT9YHefv7iB/53ih6e+GNAsE=
+github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
-github.com/urfave/cli/v2 v2.11.1/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
+github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e h1:+SOyEddqYF09QP7vr7CgJ1eti3pY9Fn3LHO1M1r/0sI=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
+golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20220722155232-062f8c9fd539 h1:/eM0PCrQI2xd471rI+snWuu251/+/jpBpZqir2mPdnU=
+golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
-golang.org/x/image v0.0.0-20220722155232-062f8c9fd539/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
+golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
-gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/postgres v1.3.8 h1:8bEphSAB69t3odsCR4NDzt581iZEWQuRM27Cg6KgfPY=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gorm.io/driver/postgres v1.3.8/go.mod h1:qB98Aj6AhRO/oyu/jmZsi/YM9g6UzVCjMxO/6frFvcA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/sqlite v1.3.6 h1:Fi8xNYCUplOqWiPa3/GuCeowRNBRGTf62DEmhMDHeQQ=
+gorm.io/driver/postgres v1.5.6 h1:ydr9xEd5YAM0vxVDY0X139dyzNz10spDiDlC7+ibLeU=
-gorm.io/driver/sqlite v1.3.6/go.mod h1:Sg1/pvnKtbQ7jLXxfZa+jSHvoX8hoZA8cn4xllOMTgE=
+gorm.io/driver/postgres v1.5.6/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA=
-gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
-gorm.io/gorm v1.23.6/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
-gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE=
+gorm.io/gorm v1.25.7 h1:VsD6acwRjz2zFxGO50gPO6AkNs7KKnvfzUjHQhZDz/A=
-gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=

pkg/config/config.go

@@ -74,7 +74,7 @@ const (
 )
 
 var (
-	UsernameRegexp    = regexp.MustCompile(`^[a-z0-9_-]{3,32}$`)
+	UsernameRegexp    = regexp.MustCompile(`^[a-z0-9_.-]{3,32}$`)
 	ReservedUsernames = []string{
 		"admin",
 		"admins",

pkg/controller/account/friends.go

@@ -2,7 +2,6 @@ package account
 
 import (
 	"net/http"
-	"regexp"
 
 	"code.nonshy.com/nonshy/website/pkg/config"
 	"code.nonshy.com/nonshy/website/pkg/models"
@@ -10,18 +9,12 @@ import (
 	"code.nonshy.com/nonshy/website/pkg/templates"
 )
 
-var UserFriendsRegexp = regexp.MustCompile(`^/friends/u/([^@]+?)$`)
-
 // User friends page (/friends/u/username)
 func UserFriends() http.HandlerFunc {
 	tmpl := templates.Must("account/friends.html")
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Parse the username out of the URL parameters.
-		var username string
+		var username = r.PathValue("username")
-		m := UserFriendsRegexp.FindStringSubmatch(r.URL.Path)
-		if m != nil {
-			username = m[1]
-		}
 
 		// Find this user.
 		user, err := models.FindUser(username)

pkg/controller/account/inner_circle.go

@@ -83,7 +83,7 @@ func InviteCircle() http.HandlerFunc {
 
 			log.Info("InnerCircle: %s adds %s to the inner circle", currentUser.Username, user.Username)
 
-			templates.Redirect(w, "/photo/u/"+user.Username)
+			templates.Redirect(w, "/u/"+user.Username+"/photos")
 			return
 		}
 

pkg/controller/account/profile.go

@@ -3,7 +3,6 @@ package account
 import (
 	"net/http"
 	"net/url"
-	"regexp"
 
 	"code.nonshy.com/nonshy/website/pkg/log"
 	"code.nonshy.com/nonshy/website/pkg/middleware"
@@ -13,18 +12,12 @@ import (
 	"code.nonshy.com/nonshy/website/pkg/worker"
 )
 
-var ProfileRegexp = regexp.MustCompile(`^/u/([^@]+?)$`)
-
 // User profile page (/u/username)
 func Profile() http.HandlerFunc {
 	tmpl := templates.Must("account/profile.html")
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Parse the username out of the URL parameters.
-		var username string
+		var username = r.PathValue("username")
-		m := ProfileRegexp.FindStringSubmatch(r.URL.Path)
-		if m != nil {
-			username = m[1]
-		}
 
 		// Find this user.
 		user, err := models.FindUser(username)

pkg/controller/account/user_note.go

@@ -3,7 +3,6 @@ package account
 import (
 	"net/http"
 	"net/url"
-	"regexp"
 	"strconv"
 
 	"code.nonshy.com/nonshy/website/pkg/config"
@@ -14,18 +13,12 @@ import (
 	"code.nonshy.com/nonshy/website/pkg/templates"
 )
 
-var NotesURLRegexp = regexp.MustCompile(`^/notes/u/([^@]+?)$`)
-
 // User notes page (/notes/u/username)
 func UserNotes() http.HandlerFunc {
 	tmpl := templates.Must("account/user_notes.html")
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Parse the username out of the URL parameters.
-		var username string
+		var username = r.PathValue("username")
-		m := NotesURLRegexp.FindStringSubmatch(r.URL.Path)
-		if m != nil {
-			username = m[1]
-		}
 
 		// Find this user.
 		user, err := models.FindUser(username)

pkg/controller/admin/feedback.go

@@ -52,7 +52,7 @@ func Feedback() http.HandlerFunc {
 				} else {
 					// If this is an "inner circle removal" report, go to their gallery and filter pics by Public.
 					if fb.Intent == "report.circle" {
-						templates.Redirect(w, "/photo/u/"+user.Username+"?visibility=public")
+						templates.Redirect(w, "/u/"+user.Username+"/photos?visibility=public")
 					} else {
 						templates.Redirect(w, "/u/"+user.Username)
 					}

pkg/controller/forum/forum.go

@@ -4,7 +4,6 @@ import (
 	"net/http"
 
 	"code.nonshy.com/nonshy/website/pkg/config"
-	"code.nonshy.com/nonshy/website/pkg/log"
 	"code.nonshy.com/nonshy/website/pkg/models"
 	"code.nonshy.com/nonshy/website/pkg/session"
 	"code.nonshy.com/nonshy/website/pkg/templates"
@@ -16,22 +15,17 @@ func Forum() http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Parse the path parameters
 		var (
+			fragment = r.PathValue("fragment")
 			forum    *models.Forum
 		)
 
-		if m := ForumPathRegexp.FindStringSubmatch(r.URL.Path); m == nil {
+		// Look up the forum by its fragment.
-			log.Error("Regexp failed to parse: %s", r.URL.Path)
+		if found, err := models.ForumByFragment(fragment); err != nil {
-			templates.NotFoundPage(w, r)
-			return
-		} else {
-			// Look up the forum itself.
-			if found, err := models.ForumByFragment(m[1]); err != nil {
 			templates.NotFoundPage(w, r)
 			return
 		} else {
 			forum = found
 		}
-		}
 
 		// Get the current user.
 		currentUser, err := session.CurrentUser(r)

pkg/controller/forum/forums.go

@@ -17,17 +17,6 @@ var (
 	FragmentRegexp  = regexp.MustCompile(
 		fmt.Sprintf(`^(%s)$`, FragmentPattern),
 	)
-
-	// Forum path parameters.
-	ForumPathRegexp = regexp.MustCompile(
-		fmt.Sprintf(`^/f/(%s)`, FragmentPattern),
-	)
-	ForumPostRegexp = regexp.MustCompile(
-		fmt.Sprintf(`^/f/(%s)/(post)`, FragmentPattern),
-	)
-	ForumThreadRegexp = regexp.MustCompile(
-		fmt.Sprintf(`^/f/(%s)/(thread)/(\d+)`, FragmentPattern),
-	)
 )
 
 // Landing page for forums.

pkg/controller/forum/thread.go

@@ -2,7 +2,6 @@ package forum
 
 import (
 	"net/http"
-	"regexp"
 	"strconv"
 
 	"code.nonshy.com/nonshy/website/pkg/config"
@@ -12,24 +11,22 @@ import (
 	"code.nonshy.com/nonshy/website/pkg/templates"
 )
 
-var ThreadPathRegexp = regexp.MustCompile(`^/forum/thread/(\d+)$`)
-
 // Thread view for the comment thread body of a forum post.
 func Thread() http.HandlerFunc {
 	tmpl := templates.Must("forum/thread.html")
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Parse the path parameters
 		var (
+			idStr  = r.PathValue("id")
 			forum  *models.Forum
 			thread *models.Thread
 		)
 
-		if m := ThreadPathRegexp.FindStringSubmatch(r.URL.Path); m == nil {
+		if idStr == "" {
-			log.Error("Regexp failed to parse: %s", r.URL.Path)
 			templates.NotFoundPage(w, r)
 			return
 		} else {
-			if threadID, err := strconv.Atoi(m[1]); err != nil {
+			if threadID, err := strconv.Atoi(idStr); err != nil {
 				session.FlashError(w, r, "Invalid thread ID in the address bar.")
 				templates.Redirect(w, "/forum")
 				return

pkg/controller/inbox/inbox.go

@@ -2,7 +2,6 @@ package inbox
 
 import (
 	"net/http"
-	"regexp"
 	"strconv"
 
 	"code.nonshy.com/nonshy/website/pkg/config"
@@ -11,12 +10,16 @@ import (
 	"code.nonshy.com/nonshy/website/pkg/templates"
 )
 
-var ReadURLRegexp = regexp.MustCompile(`^/messages/read/(\d+)$`)
-
 // Inbox is where users receive direct messages.
 func Inbox() http.HandlerFunc {
 	tmpl := templates.Must("inbox/inbox.html")
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Message ID in path? (/messages/read/{id} endpoint)
+		var msgId int
+		if idStr := r.PathValue("id"); idStr != "" {
+			msgId, _ = strconv.Atoi(idStr)
+		}
+
 		currentUser, err := session.CurrentUser(r)
 		if err != nil {
 			session.FlashError(w, r, "Unexpected error: could not get currentUser.")
@@ -35,10 +38,8 @@ func Inbox() http.HandlerFunc {
 			viewThread    []*models.Message
 			threadPager   *models.Pagination
 			composeToUser *models.User
-			msgId         int
 		)
-		if uri := ReadURLRegexp.FindStringSubmatch(r.URL.Path); uri != nil {
+		if msgId > 0 {
-			msgId, _ = strconv.Atoi(uri[1])
 			if msg, err := models.GetMessage(uint64(msgId)); err != nil {
 				session.FlashError(w, r, "Message not found.")
 				templates.Redirect(w, "/messages")

pkg/controller/photo/edit_delete.go

@@ -141,7 +141,7 @@ func Edit() http.HandlerFunc {
 			}
 
 			// Return the user to their gallery.
-			templates.Redirect(w, "/photo/u/"+currentUser.Username)
+			templates.Redirect(w, "/u/"+currentUser.Username+"/photos")
 			return
 		}
 
@@ -251,7 +251,7 @@ func Delete() http.HandlerFunc {
 			session.Flash(w, r, "Photo deleted!")
 
 			// Return the user to their gallery.
-			templates.Redirect(w, "/photo/u/"+currentUser.Username)
+			templates.Redirect(w, "/u/"+currentUser.Username+"/photos")
 			return
 		}
 

pkg/controller/photo/private.go

@@ -42,8 +42,6 @@ func Private() http.HandlerFunc {
 			return
 		}
 
-		log.Error("pager: %+v, len: %d", pager, len(users))
-
 		// Map reverse grantee statuses.
 		var GranteeMap interface{}
 		if isGrantee {
@@ -145,7 +143,7 @@ func Share() http.HandlerFunc {
 						Type:      models.NotificationPrivatePhoto,
 						TableName: "__private_photos",
 						TableID:   currentUser.ID,
-						Link:      fmt.Sprintf("/photo/u/%s?visibility=private", currentUser.Username),
+						Link:      fmt.Sprintf("/u/%s/photos?visibility=private", currentUser.Username),
 					}
 					if err := models.CreateNotification(notif); err != nil {
 						log.Error("Couldn't create PrivatePhoto notification: %s", err)

pkg/controller/photo/upload.go

@@ -76,7 +76,7 @@ func Upload() http.HandlerFunc {
 			// Are they at quota already?
 			if photoCount >= photoQuota {
 				session.FlashError(w, r, "You have too many photos to upload a new one. Please delete a photo to make room for a new one.")
-				templates.Redirect(w, "/photo/u/"+user.Username)
+				templates.Redirect(w, "/u/"+user.Username+"/photos")
 				return
 			}
 
@@ -163,7 +163,7 @@ func Upload() http.HandlerFunc {
 			go notifyFriendsNewPhoto(p, user)
 
 			session.Flash(w, r, "Your photo has been uploaded successfully.")
-			templates.Redirect(w, "/photo/u/"+user.Username)
+			templates.Redirect(w, "/u/"+user.Username+"/photos")
 			return
 		}
 

pkg/controller/photo/user_gallery.go

@@ -2,7 +2,6 @@ package photo
 
 import (
 	"net/http"
-	"regexp"
 
 	"code.nonshy.com/nonshy/website/pkg/config"
 	"code.nonshy.com/nonshy/website/pkg/log"
@@ -11,8 +10,6 @@ import (
 	"code.nonshy.com/nonshy/website/pkg/templates"
 )
 
-var UserPhotosRegexp = regexp.MustCompile(`^/photo/u/([^@]+?)$`)
-
 // UserPhotos controller (/photo/u/:username) to view a user's gallery or manage if it's yourself.
 func UserPhotos() http.HandlerFunc {
 	tmpl := templates.Must("photo/gallery.html")
@@ -26,6 +23,7 @@ func UserPhotos() http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		// Query params.
 		var (
+			username  = r.PathValue("username")
 			viewStyle = r.FormValue("view") // cards (default), full
 
 			// Search filters.
@@ -54,13 +52,6 @@ func UserPhotos() http.HandlerFunc {
 			viewStyle = "cards"
 		}
 
-		// Parse the username out of the URL parameters.
-		var username string
-		m := UserPhotosRegexp.FindStringSubmatch(r.URL.Path)
-		if m != nil {
-			username = m[1]
-		}
-
 		// Find this user.
 		user, err := models.FindUser(username)
 		if err != nil {

pkg/middleware/age_gate.go

@@ -22,7 +22,6 @@ func AgeGate(user *models.User, w http.ResponseWriter, r *http.Request) (handled
 		"/photo/certification",
 		"/photo/private",
 		"/photo/view",
-		"/photo/u/",
 		"/comments",
 		"/users/blocked",
 		"/users/block",

pkg/router/router.go

@@ -19,6 +19,7 @@ import (
 	"code.nonshy.com/nonshy/website/pkg/controller/photo"
 	"code.nonshy.com/nonshy/website/pkg/controller/poll"
 	"code.nonshy.com/nonshy/website/pkg/middleware"
+	nst "code.nonshy.com/nonshy/website/pkg/templates"
 )
 
 func New() http.Handler {
@@ -26,21 +27,21 @@ func New() http.Handler {
 
 	// Register controller endpoints.
 	mux.HandleFunc("/", index.Create())
-	mux.HandleFunc("/favicon.ico", index.Favicon())
+	mux.HandleFunc("GET /favicon.ico", index.Favicon())
-	mux.HandleFunc("/manifest.json", index.Manifest())
+	mux.HandleFunc("GET /manifest.json", index.Manifest())
-	mux.HandleFunc("/about", index.StaticTemplate("about.html")())
+	mux.HandleFunc("GET /about", index.StaticTemplate("about.html")())
-	mux.HandleFunc("/features", index.StaticTemplate("features.html")())
+	mux.HandleFunc("GET /features", index.StaticTemplate("features.html")())
-	mux.HandleFunc("/faq", index.StaticTemplate("faq.html")())
+	mux.HandleFunc("GET /faq", index.StaticTemplate("faq.html")())
-	mux.HandleFunc("/tos", index.StaticTemplate("tos.html")())
+	mux.HandleFunc("GET /tos", index.StaticTemplate("tos.html")())
-	mux.HandleFunc("/privacy", index.StaticTemplate("privacy.html")())
+	mux.HandleFunc("GET /privacy", index.StaticTemplate("privacy.html")())
 	mux.HandleFunc("/contact", index.Contact())
 	mux.HandleFunc("/login", account.Login())
-	mux.HandleFunc("/logout", account.Logout())
+	mux.HandleFunc("GET /logout", account.Logout())
 	mux.Handle("/signup", middleware.GeoGate(account.Signup()))
 	mux.HandleFunc("/forgot-password", account.ForgotPassword())
-	mux.HandleFunc("/settings/confirm-email", account.ConfirmEmailChange())
+	mux.HandleFunc("GET /settings/confirm-email", account.ConfirmEmailChange())
-	mux.HandleFunc("/markdown", index.StaticTemplate("markdown.html")())
+	mux.HandleFunc("GET /markdown", index.StaticTemplate("markdown.html")())
-	mux.HandleFunc("/test/geo-gate", index.StaticTemplate("errors/geo_gate.html")())
+	mux.HandleFunc("GET /test/geo-gate", index.StaticTemplate("errors/geo_gate.html")())
 
 	// Login Required. Pages that non-certified users can access.
 	mux.Handle("/me", middleware.LoginRequired(account.Dashboard()))
@@ -49,48 +50,48 @@ func New() http.Handler {
 	mux.Handle("/account/two-factor/setup", middleware.LoginRequired(account.Setup2FA()))
 	mux.Handle("/account/delete", middleware.LoginRequired(account.Delete()))
 	mux.Handle("/account/deactivate", middleware.LoginRequired(account.Deactivate()))
-	mux.Handle("/account/reactivate", middleware.LoginRequired(account.Reactivate()))
+	mux.Handle("GET /account/reactivate", middleware.LoginRequired(account.Reactivate()))
-	mux.Handle("/u/", account.Profile()) // public access OK
+	mux.Handle("GET /u/{username}", account.Profile()) // public access OK
+	mux.Handle("GET /u/{username}/friends", middleware.CertRequired(account.UserFriends()))
+	mux.Handle("GET /u/{username}/photos", middleware.LoginRequired(photo.UserPhotos()))
+	mux.Handle("/u/{username}/notes", middleware.LoginRequired(account.UserNotes()))
 	mux.Handle("/photo/upload", middleware.LoginRequired(photo.Upload()))
-	mux.Handle("/photo/u/", middleware.LoginRequired(photo.UserPhotos()))
+	mux.Handle("GET /photo/view", middleware.LoginRequired(photo.View()))
-	mux.Handle("/photo/view", middleware.LoginRequired(photo.View()))
 	mux.Handle("/photo/edit", middleware.LoginRequired(photo.Edit()))
 	mux.Handle("/photo/delete", middleware.LoginRequired(photo.Delete()))
 	mux.Handle("/photo/certification", middleware.LoginRequired(photo.Certification()))
-	mux.Handle("/photo/private", middleware.LoginRequired(photo.Private()))
+	mux.Handle("GET /photo/private", middleware.LoginRequired(photo.Private()))
 	mux.Handle("/photo/private/share", middleware.LoginRequired(photo.Share()))
-	mux.Handle("/notes/u/", middleware.LoginRequired(account.UserNotes()))
 	mux.Handle("/notes/me", middleware.LoginRequired(account.MyNotes()))
-	mux.Handle("/messages", middleware.LoginRequired(inbox.Inbox()))
+	mux.Handle("GET /messages", middleware.LoginRequired(inbox.Inbox()))
-	mux.Handle("/messages/read/", middleware.LoginRequired(inbox.Inbox()))
+	mux.Handle("GET /messages/read/{id}", middleware.LoginRequired(inbox.Inbox()))
 	mux.Handle("/messages/compose", middleware.LoginRequired(inbox.Compose()))
 	mux.Handle("/messages/delete", middleware.LoginRequired(inbox.Delete()))
-	mux.Handle("/friends", middleware.LoginRequired(friend.Friends()))
+	mux.Handle("GET /friends", middleware.LoginRequired(friend.Friends()))
 	mux.Handle("/friends/add", middleware.LoginRequired(friend.AddFriend()))
-	mux.Handle("/friends/u/", middleware.CertRequired(account.UserFriends()))
+	mux.Handle("POST /users/block", middleware.LoginRequired(block.BlockUser()))
-	mux.Handle("/users/block", middleware.LoginRequired(block.BlockUser()))
+	mux.Handle("GET /users/blocked", middleware.LoginRequired(block.Blocked()))
-	mux.Handle("/users/blocked", middleware.LoginRequired(block.Blocked()))
+	mux.Handle("GET /users/blocklist/add", middleware.LoginRequired(block.AddUser()))
-	mux.Handle("/users/blocklist/add", middleware.LoginRequired(block.AddUser()))
 	mux.Handle("/comments", middleware.LoginRequired(comment.PostComment()))
-	mux.Handle("/comments/subscription", middleware.LoginRequired(comment.Subscription()))
+	mux.Handle("GET /comments/subscription", middleware.LoginRequired(comment.Subscription()))
-	mux.Handle("/admin/unimpersonate", middleware.LoginRequired(admin.Unimpersonate()))
+	mux.Handle("GET /admin/unimpersonate", middleware.LoginRequired(admin.Unimpersonate()))
-	mux.Handle("/inner-circle", middleware.LoginRequired(account.InnerCircle()))
+	mux.Handle("GET /inner-circle", middleware.LoginRequired(account.InnerCircle()))
 	mux.Handle("/inner-circle/invite", middleware.LoginRequired(account.InviteCircle()))
 
 	// Certification Required. Pages that only full (verified) members can access.
-	mux.Handle("/photo/gallery", middleware.CertRequired(photo.SiteGallery()))
+	mux.Handle("GET /photo/gallery", middleware.CertRequired(photo.SiteGallery()))
-	mux.Handle("/members", middleware.CertRequired(account.Search()))
+	mux.Handle("GET /members", middleware.CertRequired(account.Search()))
 	mux.Handle("/chat", middleware.CertRequired(chat.Landing()))
-	mux.Handle("/forum", middleware.CertRequired(forum.Landing()))
+	mux.Handle("GET /forum", middleware.CertRequired(forum.Landing()))
 	mux.Handle("/forum/post", middleware.CertRequired(forum.NewPost()))
-	mux.Handle("/forum/thread/", middleware.CertRequired(forum.Thread()))
+	mux.Handle("GET /forum/thread/{id}", middleware.CertRequired(forum.Thread()))
-	mux.Handle("/forum/newest", middleware.CertRequired(forum.Newest()))
+	mux.Handle("GET /forum/newest", middleware.CertRequired(forum.Newest()))
-	mux.Handle("/forum/search", middleware.CertRequired(forum.Search()))
+	mux.Handle("GET /forum/search", middleware.CertRequired(forum.Search()))
-	mux.Handle("/f/", middleware.CertRequired(forum.Forum()))
+	mux.Handle("GET /f/{fragment}", middleware.CertRequired(forum.Forum()))
-	mux.Handle("/poll/vote", middleware.CertRequired(poll.Vote()))
+	mux.Handle("POST /poll/vote", middleware.CertRequired(poll.Vote()))
 
 	// Admin endpoints.
-	mux.Handle("/admin", middleware.AdminRequired("", admin.Dashboard()))
+	mux.Handle("GET /admin", middleware.AdminRequired("", admin.Dashboard()))
 	mux.Handle("/admin/scopes", middleware.AdminRequired("", admin.Scopes()))
 	mux.Handle("/admin/photo/certification", middleware.AdminRequired("", photo.AdminCertification()))
 	mux.Handle("/admin/feedback", middleware.AdminRequired("", admin.Feedback()))
@@ -102,22 +103,27 @@ func New() http.Handler {
 	mux.Handle("/admin/photo/mark-explicit", middleware.AdminRequired(config.ScopePhotoModerator, admin.MarkPhotoExplicit()))
 
 	// JSON API endpoints.
-	mux.HandleFunc("/v1/version", api.Version())
+	mux.HandleFunc("GET /v1/version", api.Version())
-	mux.HandleFunc("/v1/users/me", api.LoginOK())
+	mux.HandleFunc("GET /v1/users/me", api.LoginOK())
-	mux.HandleFunc("/v1/users/check-username", api.UsernameCheck())
+	mux.HandleFunc("POST /v1/users/check-username", api.UsernameCheck())
-	mux.Handle("/v1/likes", middleware.LoginRequired(api.Likes()))
+	mux.Handle("POST /v1/likes", middleware.LoginRequired(api.Likes()))
-	mux.Handle("/v1/likes/users", middleware.LoginRequired(api.WhoLikes()))
+	mux.Handle("GET /v1/likes/users", middleware.LoginRequired(api.WhoLikes()))
-	mux.Handle("/v1/notifications/read", middleware.LoginRequired(api.ReadNotification()))
+	mux.Handle("POST /v1/notifications/read", middleware.LoginRequired(api.ReadNotification()))
-	mux.Handle("/v1/notifications/delete", middleware.LoginRequired(api.ClearNotification()))
+	mux.Handle("POST /v1/notifications/delete", middleware.LoginRequired(api.ClearNotification()))
-	mux.Handle("/v1/comment-photos/remove-orphaned", api.RemoveOrphanedCommentPhotos())
+	mux.Handle("GET /v1/comment-photos/remove-orphaned", api.RemoveOrphanedCommentPhotos())
-	mux.Handle("/v1/barertc/report", barertc.Report())
+	mux.Handle("POST /v1/barertc/report", barertc.Report())
-	mux.Handle("/v1/barertc/profile", barertc.Profile())
+	mux.Handle("POST /v1/barertc/profile", barertc.Profile())
 
 	// Redirect endpoints.
-	mux.Handle("/go/comment", middleware.LoginRequired(comment.GoToComment()))
+	mux.Handle("GET /go/comment", middleware.LoginRequired(comment.GoToComment()))
 
 	// Static files.
-	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir(config.StaticPath))))
+	mux.Handle("GET /static/", http.StripPrefix("/static/", http.FileServer(http.Dir(config.StaticPath))))
+
+	// Legacy route redirects (Go 1.22 path parameters update)
+	mux.Handle("GET /friends/u/{s}", nst.RedirectRoute("/u/%s/friends"))
+	mux.Handle("GET /photo/u/{s}", nst.RedirectRoute("/u/%s/photos"))
+	mux.Handle("GET /notes/u/{s}", nst.RedirectRoute("/u/%s/notes"))
 
 	// Global middlewares.
 	withCSRF := middleware.CSRF(mux)

pkg/templates/redirect.go

@@ -1,9 +1,37 @@
 package templates
 
-import "net/http"
+import (
+	"fmt"
+	"net/http"
+)
 
 // Redirect sends an HTTP header to the browser.
 func Redirect(w http.ResponseWriter, url string) {
 	w.Header().Set("Location", url)
 	w.WriteHeader(http.StatusFound)
 }
+
+/*
+RedirectRoute redirects an old URL route to a newer version.
+
+This was added for the Go 1.22 path parameter update to the standard lib
+router. Before this update, routes with path parameters were handled by
+regexp parsing inside the controller functions and I didn't want to overload
+too many endpoints sharing a common prefix but with 1.22 path parameters
+this is easier to do.
+
+Examples:
+
+* /u/{username}/friends instead of /friends/u/{username}
+* /u/{username}/notes instead of /notes/u/{username}
+*/
+func RedirectRoute(path string) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		var a = r.PathValue("s")
+		if a != "" {
+			Redirect(w, fmt.Sprintf(path, a))
+			return
+		}
+		Redirect(w, path)
+	}
+}

pkg/worker/barertc.go

@@ -32,6 +32,12 @@ func GetChatStatistics() *ChatStatistics {
 func SetChatStatistics(stats *ChatStatistics) {
 	chatStatisticsMu.Lock()
 	defer chatStatisticsMu.Unlock()
+
+	if stats == nil {
+		cachedChatStatistics = &ChatStatistics{}
+		return
+
+	}
 	cachedChatStatistics = stats
 }
 

web/templates/account/dashboard.html

@@ -114,7 +114,7 @@
                             </li>
 
                             <li>
-                                <a href="/photo/u/{{.CurrentUser.Username}}">
+                                <a href="/u/{{.CurrentUser.Username}}/photos">
                                     {{if .HasPublicPhoto}}
                                     <span class="icon"><i class="fa fa-circle-check has-text-success"></i></span>
                                     {{else}}
@@ -178,7 +178,7 @@
                                 </a>
                             </li>
                             <li>
-                                <a href="/photo/u/{{.CurrentUser.Username}}">
+                                <a href="/u/{{.CurrentUser.Username}}/photos">
                                     <span class="icon"><i class="fa fa-image"></i></span>
                                     My Photos
                                 </a>

web/templates/account/friends.html

@@ -28,7 +28,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/photo/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/photos">
                         <span class="icon is-small">
                             <i class="fa fa-image"></i>
                         </span>
@@ -39,7 +39,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/notes/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/notes">
                         <span class="icon is-small">
                             <i class="fa fa-pen-to-square"></i>
                         </span>
@@ -50,7 +50,7 @@
                     </a>
                 </li>
                 <li class="is-active">
-                    <a href="/friends/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/friends">
                         <span class="icon is-small">
                             <i class="fa fa-user-group"></i>
                         </span>

web/templates/account/invite_circle.html

@@ -78,7 +78,7 @@
                         </div>
 
                         <div class="field has-text-centered">
-                            <a href="/photo/u/{{.User.Username}}?visibility=public&intent=inner_circle"
+                            <a href="/u/{{.User.Username}}/photos?visibility=public&intent=inner_circle"
                                 class="button is-success">
                                 Continue to their Public gallery...
                             </a>

web/templates/account/profile.html

@@ -269,7 +269,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/photo/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/photos">
                         <span class="icon is-small">
                             <i class="fa fa-image"></i>
                         </span>
@@ -280,7 +280,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/notes/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/notes">
                         <span class="icon is-small">
                             <i class="fa fa-pen-to-square"></i>
                         </span>
@@ -291,7 +291,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/friends/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/friends">
                         <span class="icon is-small">
                             <i class="fa fa-user-group"></i>
                         </span>
@@ -458,7 +458,7 @@
                                     <strong class="is-size-7">Photos shared:</label>
                                 </td>
                                 <td>
-                                    <a href="/photo/u/{{.User.Username}}" class="has-text-info">
+                                    <a href="/u/{{.User.Username}}/photos" class="has-text-info">
                                         <i class="fa fa-image mr-1"></i>
                                         {{FormatNumberCommas .PhotoCount}}
                                     </a>
@@ -495,7 +495,7 @@
                                     <strong class="is-size-7">Friends:</label>
                                 </td>
                                 <td>
-                                    <a href="/friends/u/{{.User.Username}}" class="has-text-info">
+                                    <a href="/u/{{.User.Username}}/friends" class="has-text-info">
                                         <i class="fa fa-user-group mr-1"></i> {{FormatNumberCommas .FriendCount}}
                                     </a>
                                 </td>

web/templates/account/search.html

@@ -304,7 +304,7 @@
                                     {{end}}
 
                                     <!-- Photo count pulled to the right -->
-                                    <a href="/photo/u/{{.Username}}" class="tag is-info is-light is-pulled-right">
+                                    <a href="/u/{{.Username}}/photos" class="tag is-info is-light is-pulled-right">
                                         <i class="fa fa-camera mr-2"></i>
                                         {{$Root.PhotoCountMap.Get .ID}}
                                     </a>

web/templates/account/user_notes.html

@@ -37,7 +37,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/photo/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/photos">
                         <span class="icon is-small">
                             <i class="fa fa-image"></i>
                         </span>
@@ -59,7 +59,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/friends/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/friends">
                         <span class="icon is-small">
                             <i class="fa fa-user-group"></i>
                         </span>

web/templates/base.html

@@ -171,7 +171,7 @@
                                 <span class="icon"><i class="fa fa-user"></i></span>
                                 <span>My Profile</span>
                             </a>
-                            <a class="navbar-item" href="/photo/u/{{.CurrentUser.Username}}">
+                            <a class="navbar-item" href="/u/{{.CurrentUser.Username}}/photos">
                                 <span class="icon"><i class="fa fa-image"></i></span>
                                 <span>My Photos</span>
                             </a>

web/templates/errors/certification_required.html

@@ -67,7 +67,7 @@
             While waiting for your Certification Photo to be approved, you may
             <a href="/u/{{.CurrentUser.Username}}">view your profile</a>,
             <a href="/settings">edit your profile</a> and
-            <a href="/photo/u/{{.CurrentUser.Username}}">upload some additional pictures</a>
+            <a href="/u/{{.CurrentUser.Username}}/photos">upload some additional pictures</a>
             to your profile. Your additional photos will not be visible to other members
             until your profile has been certified.
         </p>

web/templates/index.html

@@ -143,7 +143,7 @@
                             </a>
                         </li>
                         <li>
-                            <a href="/photo/u/{{.CurrentUser.Username}}">
+                            <a href="/u/{{.CurrentUser.Username}}/photos">
                                 <span class="icon"><i class="fa fa-image"></i></span>
                                 My Photos
                             </a>

web/templates/photo/gallery.html

@@ -140,7 +140,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/notes/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/notes">
                         <span class="icon is-small">
                             <i class="fa fa-pen-to-square"></i>
                         </span>
@@ -151,7 +151,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/friends/u/{{.User.Username}}">
+                    <a href="/u/{{.User.Username}}/friends">
                         <span class="icon is-small">
                             <i class="fa fa-user-group"></i>
                         </span>

web/templates/photo/permalink.html

@@ -28,7 +28,7 @@
                     </a>
                 </li>
                 <li>
-                    <a href="/photo/u/{{.User.Username}}">Photos</a>
+                    <a href="/u/{{.User.Username}}/photos">Photos</a>
                 </li>
                 <li class="is-active">
                     <a href="{{.Request.URL.Path}}" aria-current="page">Comments</a>

web/templates/photo/upload.html

@@ -73,7 +73,7 @@
                 <p class="block">
                     You have currently uploaded <strong>{{.PhotoCount}}</strong> of your allowed {{.PhotoQuota}} photos.
                     {{if ge .PhotoCount .PhotoQuota}}
-                        To upload a new photo, please <a href="/photo/u/{{.CurrentUser.Username}}">delete</a>
+                        To upload a new photo, please <a href="/u/{{.CurrentUser.Username}}/photos">delete</a>
                         an existing photo first to make room.
                     {{end}}
                 </p>
@@ -94,7 +94,7 @@
                     <p class="block">
                         <strong>Notice:</strong> you currently do not have a Default Profile Picture set up on your
                         account. You can <a href="/photo/upload?intent=profile_pic">click here to upload a new one</a>
-                        or click the Edit button on <a href="/photo/u/{{.CurrentUser.Username}}">one of your existing photos</a>
+                        or click the Edit button on <a href="/u/{{.CurrentUser.Username}}/photos">one of your existing photos</a>
                         to crop a square profile picture from one of them.
                     </p>
                 </div>