diff --git a/acme/acme.go b/acme/acme.go index 81635fa0b..bedd81c8b 100644 --- a/acme/acme.go +++ b/acme/acme.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package acme diff --git a/acme/acme_test.go b/acme/acme_test.go index eb971435c..f2a224ee0 100644 --- a/acme/acme_test.go +++ b/acme/acme_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package acme_test diff --git a/api_token.go b/api_token.go index 2141909b2..12c6a1edb 100644 --- a/api_token.go +++ b/api_token.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/bgrun/bgrun.go b/bgrun/bgrun.go index d3a8383cd..8913cad5a 100644 --- a/bgrun/bgrun.go +++ b/bgrun/bgrun.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com // Package bgrun runs jobs in the background. // diff --git a/bgrun/bgrun_test.go b/bgrun/bgrun_test.go index 0d2dd0af4..f04583657 100644 --- a/bgrun/bgrun_test.go +++ b/bgrun/bgrun_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package bgrun diff --git a/bosmang.go b/bosmang.go index c764e5c3e..bf2e214bb 100644 --- a/bosmang.go +++ b/bosmang.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/cmd/check/copyright.go b/cmd/check/copyright.go index 04ec2d36d..e59b859b3 100644 --- a/cmd/check/copyright.go +++ b/cmd/check/copyright.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/check/defer.go b/cmd/check/defer.go index 535e4e023..d30deaa0b 100644 --- a/cmd/check/defer.go +++ b/cmd/check/defer.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/check/defer_test.go b/cmd/check/defer_test.go index 077875591..bcf097f9b 100644 --- a/cmd/check/defer_test.go +++ b/cmd/check/defer_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/check/main.go b/cmd/check/main.go index 713a99430..24cba65aa 100644 --- a/cmd/check/main.go +++ b/cmd/check/main.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/check/testdata/src/deferr/deferr.go b/cmd/check/testdata/src/deferr/deferr.go index 25633ca8d..9ad090ae6 100644 --- a/cmd/check/testdata/src/deferr/deferr.go +++ b/cmd/check/testdata/src/deferr/deferr.go @@ -1,3 +1,7 @@ +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com + package deferr import "fmt" diff --git a/cmd/gcbench/data.go b/cmd/gcbench/data.go index 5627ce06c..0554a2f95 100644 --- a/cmd/gcbench/data.go +++ b/cmd/gcbench/data.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/gcbench/gcbench.go b/cmd/gcbench/gcbench.go index c0cce78a8..9bf996f7e 100644 --- a/cmd/gcbench/gcbench.go +++ b/cmd/gcbench/gcbench.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com // Commands gcbench inserts random data in a GoatCounter installation for // performance testing purposes. diff --git a/cmd/goatcounter/buffer.go b/cmd/goatcounter/buffer.go index a724415aa..80fda021b 100644 --- a/cmd/goatcounter/buffer.go +++ b/cmd/goatcounter/buffer.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/buffer_test.go b/cmd/goatcounter/buffer_test.go index 4b4dadafc..777ceeb55 100644 --- a/cmd/goatcounter/buffer_test.go +++ b/cmd/goatcounter/buffer_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main @@ -52,7 +52,7 @@ func TestBuffer(t *testing.T) { var backend string { i := zsync.NewAtomicInt(0) - handle := handlers.NewBackend(zdb.MustGetDB(ctx), nil, false, false, "", 15) + handle := handlers.NewBackend(zdb.MustGetDB(ctx), nil, false, false, false, "", 15) goatcounter.Memstore.TestInit(zdb.MustGetDB(ctx)) s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { diff --git a/cmd/goatcounter/db.go b/cmd/goatcounter/db.go index d8e027f9b..d49efbe29 100644 --- a/cmd/goatcounter/db.go +++ b/cmd/goatcounter/db.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/db_migrate.go b/cmd/goatcounter/db_migrate.go index 3555da85b..93213c0ea 100644 --- a/cmd/goatcounter/db_migrate.go +++ b/cmd/goatcounter/db_migrate.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/db_test.go b/cmd/goatcounter/db_test.go index 4c88e1344..4e60c1124 100644 --- a/cmd/goatcounter/db_test.go +++ b/cmd/goatcounter/db_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/help.go b/cmd/goatcounter/help.go index 591a00209..abf256bd7 100644 --- a/cmd/goatcounter/help.go +++ b/cmd/goatcounter/help.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/help_test.go b/cmd/goatcounter/help_test.go index 5544ba920..1f0c753ef 100644 --- a/cmd/goatcounter/help_test.go +++ b/cmd/goatcounter/help_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/import.go b/cmd/goatcounter/import.go index ff40cf5ff..5a89987a3 100644 --- a/cmd/goatcounter/import.go +++ b/cmd/goatcounter/import.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/import_test.go b/cmd/goatcounter/import_test.go index f6cc723eb..a87b48d8c 100644 --- a/cmd/goatcounter/import_test.go +++ b/cmd/goatcounter/import_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/main.go b/cmd/goatcounter/main.go index de7b4dcf6..01d5c1d45 100644 --- a/cmd/goatcounter/main.go +++ b/cmd/goatcounter/main.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/main_test.go b/cmd/goatcounter/main_test.go index 458d5c3d8..b59d1fcbd 100644 --- a/cmd/goatcounter/main_test.go +++ b/cmd/goatcounter/main_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/monitor.go b/cmd/goatcounter/monitor.go index 34ffeccd8..04ccbf5eb 100644 --- a/cmd/goatcounter/monitor.go +++ b/cmd/goatcounter/monitor.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/monitor_test.go b/cmd/goatcounter/monitor_test.go index ad9d14615..6469144e2 100644 --- a/cmd/goatcounter/monitor_test.go +++ b/cmd/goatcounter/monitor_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/old.go b/cmd/goatcounter/old.go index 120f0798d..6995b6c64 100644 --- a/cmd/goatcounter/old.go +++ b/cmd/goatcounter/old.go @@ -1,3 +1,7 @@ +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com + //go:build !go1.17 // +build !go1.17 diff --git a/cmd/goatcounter/pg_test.go b/cmd/goatcounter/pg_test.go index ea69019a0..702673e6b 100644 --- a/cmd/goatcounter/pg_test.go +++ b/cmd/goatcounter/pg_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com //go:build testpg // +build testpg diff --git a/cmd/goatcounter/reindex.go b/cmd/goatcounter/reindex.go index 88c1b5984..19cda2aa1 100644 --- a/cmd/goatcounter/reindex.go +++ b/cmd/goatcounter/reindex.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/reindex_test.go b/cmd/goatcounter/reindex_test.go index cf283e623..1a2533e3d 100644 --- a/cmd/goatcounter/reindex_test.go +++ b/cmd/goatcounter/reindex_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/saas.go b/cmd/goatcounter/saas.go index 268cbecc1..094c6b83b 100644 --- a/cmd/goatcounter/saas.go +++ b/cmd/goatcounter/saas.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/saas_test.go b/cmd/goatcounter/saas_test.go index df92a4367..2dc536992 100644 --- a/cmd/goatcounter/saas_test.go +++ b/cmd/goatcounter/saas_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/serve.go b/cmd/goatcounter/serve.go index 76c591122..ad7bc7c87 100644 --- a/cmd/goatcounter/serve.go +++ b/cmd/goatcounter/serve.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/cmd/goatcounter/serve_test.go b/cmd/goatcounter/serve_test.go index 3cd2596ac..ad706859d 100644 --- a/cmd/goatcounter/serve_test.go +++ b/cmd/goatcounter/serve_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package main diff --git a/context.go b/context.go index 7da7e9e01..9b9bf9353 100644 --- a/context.go +++ b/context.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/context_test.go b/context_test.go index c234df5e8..9d4607503 100644 --- a/context_test.go +++ b/context_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/cron/browser_stat.go b/cron/browser_stat.go index 3a130e9e8..e6042927c 100644 --- a/cron/browser_stat.go +++ b/cron/browser_stat.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/browser_stat_test.go b/cron/browser_stat_test.go index e6ecbbdd7..7e4d2e5c3 100644 --- a/cron/browser_stat_test.go +++ b/cron/browser_stat_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron_test diff --git a/cron/cron.go b/cron/cron.go index fd08436ab..d5ea21d9a 100644 --- a/cron/cron.go +++ b/cron/cron.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com // Package cron schedules jobs. package cron diff --git a/cron/email_reports.go b/cron/email_reports.go index dd08a7ad1..56e556950 100644 --- a/cron/email_reports.go +++ b/cron/email_reports.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/email_reports_test.go b/cron/email_reports_test.go index 2f242fb61..4e12d10e0 100644 --- a/cron/email_reports_test.go +++ b/cron/email_reports_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron_test diff --git a/cron/hit_count.go b/cron/hit_count.go index 3b83db015..789f3d9b5 100644 --- a/cron/hit_count.go +++ b/cron/hit_count.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/hit_stat.go b/cron/hit_stat.go index 56272048a..653dacc17 100644 --- a/cron/hit_stat.go +++ b/cron/hit_stat.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/hit_stat_test.go b/cron/hit_stat_test.go index 1b7fecc73..8e6ceba92 100644 --- a/cron/hit_stat_test.go +++ b/cron/hit_stat_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron_test diff --git a/cron/language_stat.go b/cron/language_stat.go index b9b0c0c98..ce0313051 100644 --- a/cron/language_stat.go +++ b/cron/language_stat.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/location_stat.go b/cron/location_stat.go index b0bec37a0..81da6bafe 100644 --- a/cron/location_stat.go +++ b/cron/location_stat.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/location_stat_test.go b/cron/location_stat_test.go index 4aa84785e..8cecfab94 100644 --- a/cron/location_stat_test.go +++ b/cron/location_stat_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron_test diff --git a/cron/ref_count.go b/cron/ref_count.go index 45fd0150a..d2b9715dc 100644 --- a/cron/ref_count.go +++ b/cron/ref_count.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/size_stat.go b/cron/size_stat.go index e3db2d000..f4d87741e 100644 --- a/cron/size_stat.go +++ b/cron/size_stat.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/size_stat_test.go b/cron/size_stat_test.go index b8353dcc4..d81786558 100644 --- a/cron/size_stat_test.go +++ b/cron/size_stat_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron_test diff --git a/cron/system_stat.go b/cron/system_stat.go index f9db08b33..1abdc7f95 100644 --- a/cron/system_stat.go +++ b/cron/system_stat.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/tasks.go b/cron/tasks.go index 064dc4841..feaca7fce 100644 --- a/cron/tasks.go +++ b/cron/tasks.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron diff --git a/cron/tasks_test.go b/cron/tasks_test.go index 6af903d19..9e5c85d61 100644 --- a/cron/tasks_test.go +++ b/cron/tasks_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package cron_test diff --git a/db/migrate/gomig/2020-12-31-1-user_agents.go b/db/migrate/gomig/2020-12-31-1-user_agents.go index 83327d54d..2e620fd8f 100644 --- a/db/migrate/gomig/2020-12-31-1-user_agents.go +++ b/db/migrate/gomig/2020-12-31-1-user_agents.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package gomig diff --git a/db/migrate/gomig/2021-02-25-1-ua_version.go b/db/migrate/gomig/2021-02-25-1-ua_version.go index a524ae211..abcc66096 100644 --- a/db/migrate/gomig/2021-02-25-1-ua_version.go +++ b/db/migrate/gomig/2021-02-25-1-ua_version.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package gomig diff --git a/db/migrate/gomig/2021-03-29-1-widgets.go b/db/migrate/gomig/2021-03-29-1-widgets.go index 800a9b40e..b0b0c3f56 100644 --- a/db/migrate/gomig/2021-03-29-1-widgets.go +++ b/db/migrate/gomig/2021-03-29-1-widgets.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package gomig diff --git a/db/migrate/gomig/2021-12-08-1-set-chart-text.go b/db/migrate/gomig/2021-12-08-1-set-chart-text.go index 57539cdca..ea5e13123 100644 --- a/db/migrate/gomig/2021-12-08-1-set-chart-text.go +++ b/db/migrate/gomig/2021-12-08-1-set-chart-text.go @@ -1,3 +1,7 @@ +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com + package gomig import ( diff --git a/db/migrate/gomig/gomig.go b/db/migrate/gomig/gomig.go index ddd336a81..5b3e6abb8 100644 --- a/db/migrate/gomig/gomig.go +++ b/db/migrate/gomig/gomig.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package gomig diff --git a/export.go b/export.go index aef45882f..e75577d14 100644 --- a/export.go +++ b/export.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/export_test.go b/export_test.go index 9f2d35293..1bc2320e0 100644 --- a/export_test.go +++ b/export_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/gctest/gctest.go b/gctest/gctest.go index 84057b2e0..44aee2ec1 100644 --- a/gctest/gctest.go +++ b/gctest/gctest.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com // Package gctest contains testing helpers. package gctest diff --git a/gctest/gctest_test.go b/gctest/gctest_test.go index 70c553649..f3a98fd4d 100644 --- a/gctest/gctest_test.go +++ b/gctest/gctest_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package gctest diff --git a/gctest/pg.go b/gctest/pg.go index d95519d90..930bc6976 100644 --- a/gctest/pg.go +++ b/gctest/pg.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com //go:build testpg // +build testpg diff --git a/gen.go b/gen.go index e81d5d8e9..38d536b12 100644 --- a/gen.go +++ b/gen.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com //go:build go_run_only // +build go_run_only diff --git a/go.mod b/go.mod index 840032d39..fdd6f1712 100644 --- a/go.mod +++ b/go.mod @@ -10,30 +10,30 @@ require ( github.com/boombuler/barcode v1.0.1 github.com/go-chi/chi/v5 v5.0.7 github.com/google/uuid v1.3.0 - github.com/gorilla/websocket v1.4.2 - github.com/mattn/go-sqlite3 v1.14.9 + github.com/gorilla/websocket v1.5.0 + github.com/mattn/go-sqlite3 v1.14.12 github.com/monoculum/formam v3.5.5+incompatible github.com/oschwald/geoip2-golang v1.4.0 github.com/russross/blackfriday/v2 v2.1.0 github.com/teamwork/reload v1.4.0 - golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 - golang.org/x/image v0.0.0-20211028202545-6944b10bf410 - golang.org/x/net v0.0.0-20211216030914-fe4d6282115f + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 + golang.org/x/image v0.0.0-20220302094943-723b81ca9867 + golang.org/x/net v0.0.0-20220225172249-27dd8689420f golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/text v0.3.7 - golang.org/x/tools v0.1.8 + golang.org/x/tools v0.1.9 honnef.co/go/tools v0.2.2 zgo.at/blackmail v0.0.0-20211212060815-1f8e8a94692b zgo.at/errors v1.1.0 zgo.at/follow v0.0.0-20211017230838-112008350298 - zgo.at/gadget v0.0.0-20211017230912-e9a0ecc62867 + zgo.at/gadget v0.0.0-20220215192223-d8b0d7a0f8e8 zgo.at/guru v1.1.0 zgo.at/isbot v0.0.0-20220218084749-37964349899b zgo.at/json v0.0.0-20211017213340-cc8bf51df08c zgo.at/tz v0.0.0-20211017223207-006eae99adf6 zgo.at/z18n v0.0.0-20211201221236-c1ccdacc3808 zgo.at/zcache v1.0.1-0.20210412145246-76039d792310 - zgo.at/zdb v0.0.0-20220113132609-caba6bb9c06e + zgo.at/zdb v0.0.0-20220305202237-4742bea134e5 zgo.at/zhttp v0.0.0-20211213094732-dd554e63f604 zgo.at/zli v0.0.0-20211215141047-76dae1509b03 zgo.at/zlog v0.0.0-20211008102840-46c1167bf2a9 @@ -51,18 +51,14 @@ require ( github.com/lib/pq v1.10.4 // indirect github.com/oschwald/maxminddb-golang v1.8.0 // indirect golang.org/x/mod v0.5.1 // indirect - golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect - golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 // indirect + golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect + golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) // https://github.com/Teamwork/reload/pull/12 replace github.com/teamwork/reload => github.com/arp242/reload v1.4.1-0.20220116060443-b28a54916036 -// "Fork" of go-sqlite3 which removes the sqlite_json build constraint so it -// compiles with JSON support without having to specify a build tag. -replace github.com/mattn/go-sqlite3 => github.com/arp242/go-sqlite3 v1.13.1-0.20220110230139-61304ade21a9 - // https://github.com/oschwald/maxminddb-golang/pull/75 replace github.com/oschwald/maxminddb-golang => github.com/arp242/maxminddb-golang v1.8.1-0.20201227124339-dc03187a9664 diff --git a/go.sum b/go.sum index 7dd22fbf5..75cfd58c2 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,6 @@ github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x0 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= github.com/arp242/geoip2-golang v1.4.1-0.20201227124715-9eb17ed0da06 h1:rixtl++vUTZD/Y7USpx72TZopIdbScrTuRnEuDoMMR4= github.com/arp242/geoip2-golang v1.4.1-0.20201227124715-9eb17ed0da06/go.mod h1:G1gi89KVrG9jLzIPvR7hk/0pg0zfzp+FeRWnYzyF9c0= -github.com/arp242/go-sqlite3 v1.13.1-0.20220110230139-61304ade21a9 h1:DFcDVmUIvl67siiXYx0OwtsteLnQEeks07fGRRXc5rE= -github.com/arp242/go-sqlite3 v1.13.1-0.20220110230139-61304ade21a9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/arp242/maxminddb-golang v1.8.1-0.20201227124339-dc03187a9664 h1:dmj4nhkeg9oq8UpM8XmcCrDEOEdak8zMzobLJ2LGUEY= github.com/arp242/maxminddb-golang v1.8.1-0.20201227124339-dc03187a9664/go.mod h1:RXZtst0N6+FY/3qCNmZMBApR19cdQj43/NM9VkrNAis= github.com/arp242/reload v1.4.1-0.20220116060443-b28a54916036 h1:/6FPkO3Ct5N4f2SxUIjy0AWE7/aGL4F8OzPYxnOqU0s= @@ -30,10 +28,12 @@ github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfC github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0= +github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/monoculum/formam v3.5.5+incompatible h1:iPl5csfEN96G2N2mGu8V/ZB62XLf9ySTpC8KRH6qXec= github.com/monoculum/formam v3.5.5+incompatible/go.mod h1:RKgILGEJq24YyJ2ban8EO0RUVSJlF1pGsEvoLEACr/Q= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -50,10 +50,10 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ= -golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4= +golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= @@ -65,8 +65,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= @@ -82,12 +82,14 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/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/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 h1:EC6+IGYTjPpRfv9a2b/6Puw0W+hLtAhkV1tPsXhutqs= golang.org/x/term v0.0.0-20210317153231-de623e64d2a6/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.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -97,8 +99,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= -golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= 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 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= @@ -115,8 +117,8 @@ zgo.at/errors v1.1.0 h1:Pbii1NYBVmORykhsFd20NJfcCHqJWSuubhBQgmnOkPA= zgo.at/errors v1.1.0/go.mod h1:POfgvh1LafF2NZJk6buGYCIhcHWuR/miB3nndyf3ozs= zgo.at/follow v0.0.0-20211017230838-112008350298 h1:LVV0WlhCWFa/swHhJ9UT99TZ5Qr8wwFX3OvekZm0/s0= zgo.at/follow v0.0.0-20211017230838-112008350298/go.mod h1:PiuKBfdQxUV+p/Caa03VAKRxog7os3O/QvCjnDvOQu8= -zgo.at/gadget v0.0.0-20211017230912-e9a0ecc62867 h1:klTDeQyyrRq+GEMMWOtPF11XbGR7DyVuZsXRTjXHoFw= -zgo.at/gadget v0.0.0-20211017230912-e9a0ecc62867/go.mod h1:1x0AKFOjKScVTzJh+V69Ku6hTwvEM56MlnKOtrjMwSo= +zgo.at/gadget v0.0.0-20220215192223-d8b0d7a0f8e8 h1:vn3yJgOXo8GAexX9znTgffCbRcI3H7ekeSRtWIlWaj0= +zgo.at/gadget v0.0.0-20220215192223-d8b0d7a0f8e8/go.mod h1:1x0AKFOjKScVTzJh+V69Ku6hTwvEM56MlnKOtrjMwSo= zgo.at/guru v1.1.0 h1:hvMLOzPnv7XApwJZgxvFxBA8wb6RGPUw9lz8kmq450g= zgo.at/guru v1.1.0/go.mod h1:eltnfk6QwmM7ic3OLzmGMjEChP2iLuYXERyliREiA00= zgo.at/isbot v0.0.0-20220218084749-37964349899b h1:MTfMCAf92QR98OPL4epGzv2LcloV6OBdjpBIkwPHmGg= @@ -130,8 +132,8 @@ zgo.at/z18n v0.0.0-20211201221236-c1ccdacc3808 h1:M3ayjYZ0Qubr6ldGt64ONlx8m5SgsY zgo.at/z18n v0.0.0-20211201221236-c1ccdacc3808/go.mod h1:7/jQw/L0ng1iFUikdkYC9meSdeUkhXYfbtdm5OB1KHA= zgo.at/zcache v1.0.1-0.20210412145246-76039d792310 h1:lJ2j+bNqtRmn8TOJDZXqeaTuG856QzYGxXghRPw2iH8= zgo.at/zcache v1.0.1-0.20210412145246-76039d792310/go.mod h1:xWQo2ha/bamTmx8CbfrZl9Nf8AoT5uNh2hWfbQi8TiE= -zgo.at/zdb v0.0.0-20220113132609-caba6bb9c06e h1:RpUEHn7dQxCFCLfKd52EPVdyWhGVyE2S2N6O10qz5hM= -zgo.at/zdb v0.0.0-20220113132609-caba6bb9c06e/go.mod h1:yeN/Y52Q32mnn31mvT65RxoDJn/x6uEeBnDFA8/T/NE= +zgo.at/zdb v0.0.0-20220305202237-4742bea134e5 h1:qb5RS5aFvokpI8UZdFvT/w22kOErzU2PoEtJz30X9bc= +zgo.at/zdb v0.0.0-20220305202237-4742bea134e5/go.mod h1:btLfiemw1WfWa2aIz6htEWPTQfA3xAgixnD+Tuc9PsE= zgo.at/zhttp v0.0.0-20211213094732-dd554e63f604 h1:AkGFJhI2zTNIykhEmSpe3/qcvV//h162wW9C7NUT5Io= zgo.at/zhttp v0.0.0-20211213094732-dd554e63f604/go.mod h1:sc+IC0Mtp4c2zqPTGP09dEJugbj66aqoi58WGGhyVDg= zgo.at/zli v0.0.0-20211017231103-84f8e371c324/go.mod h1:pWkBHZ5qoEmvSDbFYdQMAKaRMEuAtdUKb21k/OOYOJw= diff --git a/handlers/api.go b/handlers/api.go index 6b7ed1398..5ff5a3182 100644 --- a/handlers/api.go +++ b/handlers/api.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/api_test.go b/handlers/api_test.go index fdf43fd76..140a945cf 100644 --- a/handlers/api_test.go +++ b/handlers/api_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/backend.go b/handlers/backend.go index 5c04d1b09..9a29e0ec0 100644 --- a/handlers/backend.go +++ b/handlers/backend.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/backend_test.go b/handlers/backend_test.go index 82188f9b4..fc69a5ed8 100644 --- a/handlers/backend_test.go +++ b/handlers/backend_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers @@ -174,4 +174,6 @@ func date(s string, tz *time.Location) time.Time { return d } -func newBackend(db zdb.DB) chi.Router { return NewBackend(db, nil, true, true, "example.com", 10) } +func newBackend(db zdb.DB) chi.Router { + return NewBackend(db, nil, true, true, false, "example.com", 10) +} diff --git a/handlers/billing.go b/handlers/billing.go index e470df4c1..9bcff434a 100644 --- a/handlers/billing.go +++ b/handlers/billing.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com /* Test webhooks with the Stripe CLI: diff --git a/handlers/billing_test.go b/handlers/billing_test.go index 5efae5019..2603f09cb 100644 --- a/handlers/billing_test.go +++ b/handlers/billing_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/bosmang.go b/handlers/bosmang.go index dfd74660b..a21ae45b7 100644 --- a/handlers/bosmang.go +++ b/handlers/bosmang.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/count.go b/handlers/count.go index 7d8e07334..dcdac4d7f 100644 --- a/handlers/count.go +++ b/handlers/count.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/count_test.go b/handlers/count_test.go index 2d3d20420..cc9b5deaf 100644 --- a/handlers/count_test.go +++ b/handlers/count_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/dashboard.go b/handlers/dashboard.go index 64d8f8720..94426c211 100644 --- a/handlers/dashboard.go +++ b/handlers/dashboard.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/dashboard_test.go b/handlers/dashboard_test.go index 0c9ab895f..fdd6d3cc5 100644 --- a/handlers/dashboard_test.go +++ b/handlers/dashboard_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/handlers.go b/handlers/handlers.go index 797e6c6cb..92b8ce555 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/http_test.go b/handlers/http_test.go index ce7cff72d..963d64a75 100644 --- a/handlers/http_test.go +++ b/handlers/http_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/i18n.go b/handlers/i18n.go index 64d61a2bd..a2c423704 100644 --- a/handlers/i18n.go +++ b/handlers/i18n.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/loader.go b/handlers/loader.go index 5bb8e34fb..d10acccc7 100644 --- a/handlers/loader.go +++ b/handlers/loader.go @@ -1,3 +1,7 @@ +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com + package handlers import ( diff --git a/handlers/mw.go b/handlers/mw.go index ca579cd16..634f5eb78 100644 --- a/handlers/mw.go +++ b/handlers/mw.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/settings.go b/handlers/settings.go index 961637359..2717db74c 100644 --- a/handlers/settings.go +++ b/handlers/settings.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/settings_test.go b/handlers/settings_test.go index 1acdd4e9a..b8cb90f50 100644 --- a/handlers/settings_test.go +++ b/handlers/settings_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/settings_user.go b/handlers/settings_user.go index 832e034a2..2b284ef4c 100644 --- a/handlers/settings_user.go +++ b/handlers/settings_user.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/user.go b/handlers/user.go index e5c20c308..1816de470 100644 --- a/handlers/user.go +++ b/handlers/user.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/user_test.go b/handlers/user_test.go index e8c758215..540dc5cfb 100644 --- a/handlers/user_test.go +++ b/handlers/user_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/vcounter.go b/handlers/vcounter.go index 12eb1b349..5612d3cc8 100644 --- a/handlers/vcounter.go +++ b/handlers/vcounter.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/website.go b/handlers/website.go index b8bf3ba8f..8ccaf042c 100644 --- a/handlers/website.go +++ b/handlers/website.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/handlers/website_test.go b/handlers/website_test.go index 9e67b57cd..a94238dbd 100644 --- a/handlers/website_test.go +++ b/handlers/website_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package handlers diff --git a/helper.go b/helper.go index 4d2340303..67d3720fd 100644 --- a/helper.go +++ b/helper.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com //go:generate go run gen.go diff --git a/helper_test.go b/helper_test.go index d2cdd9fbd..6b287f4ad 100644 --- a/helper_test.go +++ b/helper_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/hit.go b/hit.go index 52c0302a9..428d8fede 100644 --- a/hit.go +++ b/hit.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/hit_list.go b/hit_list.go index 322637193..7a33ef34f 100644 --- a/hit_list.go +++ b/hit_list.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/hit_list_test.go b/hit_list_test.go index d46e1520d..2647eb993 100644 --- a/hit_list_test.go +++ b/hit_list_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/hit_stats.go b/hit_stats.go index 31ef80daf..b32d2d70b 100644 --- a/hit_stats.go +++ b/hit_stats.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/hit_stats_test.go b/hit_stats_test.go index 721cf9828..5fba0087f 100644 --- a/hit_stats_test.go +++ b/hit_stats_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/hit_test.go b/hit_test.go index d74054835..a2a020e65 100644 --- a/hit_test.go +++ b/hit_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/i18n.go b/i18n.go index f288c324c..b0734db74 100644 --- a/i18n.go +++ b/i18n.go @@ -1,3 +1,7 @@ +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com + package goatcounter import ( @@ -45,7 +49,7 @@ func Translations(ctx context.Context) fs.FS { } var defaultBundle = func() *z18n.Bundle { - b, err := newBundle(Translations(nil)) + b, err := newBundle(Translations(context.TODO())) if err != nil { panic(err) } diff --git a/locations.go b/locations.go index 5e0424ee7..d100085fb 100644 --- a/locations.go +++ b/locations.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/locations_test.go b/locations_test.go index 5d1982fc1..deb3ae5f8 100644 --- a/locations_test.go +++ b/locations_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/logscan/logscan.go b/logscan/logscan.go index 0ad4b96be..d2787bcc1 100644 --- a/logscan/logscan.go +++ b/logscan/logscan.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package logscan diff --git a/logscan/logscan_test.go b/logscan/logscan_test.go index 298628e4c..e85334a91 100644 --- a/logscan/logscan_test.go +++ b/logscan/logscan_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package logscan diff --git a/memstore.go b/memstore.go index ee03cd55a..e48930733 100644 --- a/memstore.go +++ b/memstore.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/memstore_test.go b/memstore_test.go index a16e1a207..fd26a7248 100644 --- a/memstore_test.go +++ b/memstore_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/metrics/metrics.go b/metrics/metrics.go index a55af5a7f..e69f067f3 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com // Package metrics collects performance metrics. package metrics diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go index d742d2c41..9b5c45472 100644 --- a/metrics/metrics_test.go +++ b/metrics/metrics_test.go @@ -1,3 +1,7 @@ +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com + package metrics import ( diff --git a/path.go b/path.go index a6ffb3082..fd6d9e6b7 100644 --- a/path.go +++ b/path.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/path_test.go b/path_test.go index 03a71227b..49ec9a306 100644 --- a/path_test.go +++ b/path_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/ref.go b/ref.go index 43cd07e67..ceecb3b50 100644 --- a/ref.go +++ b/ref.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/ref_test.go b/ref_test.go index 0e1b03705..13e08c256 100644 --- a/ref_test.go +++ b/ref_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/refspam.go b/refspam.go index 485de7947..4ccdc9dc0 100644 --- a/refspam.go +++ b/refspam.go @@ -185,6 +185,7 @@ var refspam = map[string]struct{}{ "arendovalka.xyz": {}, "argo-visa.ru": {}, "arkkivoltti.net": {}, + "arpe.top": {}, "artblog.top": {}, "artclipart.ru": {}, "artdeko.info": {}, @@ -294,6 +295,7 @@ var refspam = map[string]struct{}{ "blog4u.top": {}, "blogking.top": {}, "bloglag.com": {}, + "blognet.top": {}, "blogseo.xyz": {}, "blogstar.fun": {}, "blogtotal.de": {}, @@ -314,6 +316,7 @@ var refspam = map[string]struct{}{ "bot-traffic.xyz": {}, "botamycos.fr": {}, "bottraffic.live": {}, + "bottraffic143.xyz ": {}, "bottraffic4free.club": {}, "bottraffic4free.host": {}, "bottraffic999.xyz": {}, @@ -485,6 +488,7 @@ var refspam = map[string]struct{}{ "coral-info.com": {}, "cosmediqueresults.com": {}, "covadhosting.biz": {}, + "covblog.top": {}, "coverage-my.com": {}, "covid-schutzmasken.de": {}, "cp24.com.ua": {}, @@ -500,9 +504,11 @@ var refspam = map[string]struct{}{ "curenaturalicancro.com": {}, "curenaturalicancro.nl": {}, "customsua.com.ua": {}, + "cvta.xyz": {}, "cyber-monday.ga": {}, "czcedu.com": {}, "dacha-svoimi-rukami.com": {}, + "dailyblog.xyz": {}, "dailyrank.net": {}, "dailyseo.xyz": {}, "dailystorm.ru": {}, @@ -658,6 +664,7 @@ var refspam = map[string]struct{}{ "escort-russian.com": {}, "eskei83.com": {}, "esoterikforum.at": {}, + "essaytags.com": {}, "estdj.com": {}, "este-line.com.ua": {}, "etairikavideo.gr": {}, @@ -796,6 +803,7 @@ var refspam = map[string]struct{}{ "global-smm.ru": {}, "gobongo.info": {}, "golden-praga.ru": {}, + "goldvaultmetals.com": {}, "golyedevushki.com": {}, "good-potolok.ru": {}, "goodbyecellulite.ru": {}, @@ -815,6 +823,7 @@ var refspam = map[string]struct{}{ "gruzchiki24.ru": {}, "guardlink.org": {}, "guidetopetersburg.com": {}, + "gxcb.net": {}, "halat.xyz": {}, "halefa.com": {}, "handicapvantoday.com": {}, @@ -832,6 +841,7 @@ var refspam = map[string]struct{}{ "healbio.ru": {}, "healgastro.com": {}, "healthhacks.ru": {}, + "heeha.net": {}, "hentai-manga.porn": {}, "heroero.com": {}, "hexometer.com": {}, @@ -913,6 +923,7 @@ var refspam = map[string]struct{}{ "i-spare.ru": {}, "ib-homecredit.ru": {}, "ib-rencredit.ru": {}, + "iblogpress.xyz": {}, "iceton.net": {}, "ico.re": {}, "ideayz.com": {}, @@ -971,6 +982,7 @@ var refspam = map[string]struct{}{ "javcoast.com": {}, "javlibrary.cc": {}, "jeffbullas.xyz": {}, + "jikem.com": {}, "jintub.com": {}, "jjbabskoe.ru": {}, "job-opros.ru": {}, @@ -1047,6 +1059,7 @@ var refspam = map[string]struct{}{ "kinosed.net": {}, "kinostar.online": {}, "kiyany-za-spravedluvist.com.ua": {}, + "klfd.net": {}, "knigonosha.net": {}, "kollekcioner.ru": {}, "komp-pomosch.ru": {}, @@ -1115,6 +1128,7 @@ var refspam = map[string]struct{}{ "loveorganic.ch": {}, "lowpricesiterx.com": {}, "lsex.xyz": {}, + "lsitenonrepeat.com": {}, "luckybull.io": {}, "lukoilcard.ru": {}, "lumb.co": {}, @@ -1265,6 +1279,7 @@ var refspam = map[string]struct{}{ "newsrosprom.ru": {}, "newstaffadsshop.club": {}, "nicola.top": {}, + "nicolaonline.top": {}, "niki-mlt.ru": {}, "ninacecillia.top": {}, "niuting.org": {}, @@ -1466,6 +1481,7 @@ var refspam = map[string]struct{}{ "quickchange.cc": {}, "quit-smoking.ga": {}, "qwesa.ru": {}, + "qxnr.net": {}, "rachelblog.online": {}, "rainbirds.ru": {}, "rangjued.com": {}, @@ -1577,6 +1593,7 @@ var refspam = map[string]struct{}{ "selfhotdog.com": {}, "sell-fb-group-here.com": {}, "semalt.com": {}, + "semalt.net ": {}, "semaltmedia.com": {}, "semxiu.com": {}, "senacertificados.co": {}, @@ -1771,7 +1788,9 @@ var refspam = map[string]struct{}{ "targetpay.nl": {}, "tattoo-stickers.ru": {}, "tattooha.com": {}, + "tccp.xyz": {}, "tcenavoprosa.ru": {}, + "tcyh.net": {}, "td-abs.ru": {}, "td-l-market.ru": {}, "td-perimetr.ru": {}, @@ -1828,9 +1847,11 @@ var refspam = map[string]struct{}{ "traffic2cash.xyz": {}, "traffic2money.com": {}, "trafficbot.life": {}, + "trafficbot4free.xyz": {}, "trafficgenius.xyz": {}, "trafficmonetize.org": {}, "trafficmonetizer.org": {}, + "trafficstudio.club": {}, "transit.in.ua": {}, "transsex-videochat.ru": {}, "traphouselatino.net": {}, @@ -1865,7 +1886,6 @@ var refspam = map[string]struct{}{ "uptime-as.net": {}, "uptime-eu.net": {}, "uptime-us.net": {}, - "uptime.com": {}, "uptimechecker.com": {}, "urblog.xyz": {}, "uruto.ru": {}, @@ -1957,6 +1977,7 @@ var refspam = map[string]struct{}{ "warmex.com.ua": {}, "wave-games.ru": {}, "wayfcoin.space": {}, + "wbjm.net": {}, "wdss.com.ua": {}, "we-ping-for-youic.info": {}, "web-analytics.date": {}, @@ -1975,6 +1996,7 @@ var refspam = map[string]struct{}{ "weburlopener.com": {}, "weightbelts.ru": {}, "wfdesigngroup.com": {}, + "wjxmenye.com": {}, "wmasterlead.com": {}, "woman-orgasm.ru": {}, "wordpress-crew.net": {}, @@ -2067,6 +2089,7 @@ var refspam = map[string]struct{}{ "your-tales.ru": {}, "yourserverisdown.com": {}, "yourtraffic.club": {}, + "yqpc.net": {}, "yur-p.ru": {}, "yurcons.pro": {}, "yuristproffi.ru": {}, diff --git a/refspam_test.go b/refspam_test.go index 6c64b64be..ab19a5c0f 100644 --- a/refspam_test.go +++ b/refspam_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/settings.go b/settings.go index 37d173664..ea5bf1e19 100644 --- a/settings.go +++ b/settings.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/site.go b/site.go index 7b8d864c1..1cf6978ce 100644 --- a/site.go +++ b/site.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/site_test.go b/site_test.go index b1d1a56f1..634dac432 100644 --- a/site_test.go +++ b/site_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/title/title.go b/title/title.go index cd6f9c208..0efa6defc 100644 --- a/title/title.go +++ b/title/title.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com // Package title fetches a HTML page's package title diff --git a/title/title_test.go b/title/title_test.go index c042afd43..defa7f4e3 100644 --- a/title/title_test.go +++ b/title/title_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij <martin@arp242.net> -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package title diff --git a/tpl.go b/tpl.go index f1af0d5ab..f6c95a6d6 100644 --- a/tpl.go +++ b/tpl.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter @@ -49,7 +49,7 @@ func init() { return float64(n) / float64(total) * 100 }) tplfunc.Add("ago", func(t time.Time) time.Duration { - return time.Now().Sub(t).Round(time.Second) + return time.Since(t).Round(time.Second) }) tplfunc.Add("round_duration", func(d time.Duration) time.Duration { diff --git a/tpl_test.go b/tpl_test.go index ff0950119..789816dd1 100644 --- a/tpl_test.go +++ b/tpl_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/types.go b/types.go index 53741284d..8d21229c9 100644 --- a/types.go +++ b/types.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/types_test.go b/types_test.go index eff96014f..737d55955 100644 --- a/types_test.go +++ b/types_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/update.go b/update.go index 232f80efc..f2748765b 100644 --- a/update.go +++ b/update.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com /* Adding a new update: diff --git a/user.go b/user.go index a2fc02591..da938970f 100644 --- a/user.go +++ b/user.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/user_agent.go b/user_agent.go index 55b7fbd88..e9ca1d2ac 100644 --- a/user_agent.go +++ b/user_agent.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij <martin@arp242.net> -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter diff --git a/user_agent_test.go b/user_agent_test.go index 333878d5b..e19944682 100644 --- a/user_agent_test.go +++ b/user_agent_test.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij <martin@arp242.net> -// This file is part of GoatCounter and published under the terms of the EUPL -// v1.2, which can be found in the LICENSE file or at http://eupl12.zgo.at +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package goatcounter_test diff --git a/user_test.go b/user_test.go index b70c16252..327e79cb1 100644 --- a/user_test.go +++ b/user_test.go @@ -1,3 +1,7 @@ +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com + package goatcounter_test import ( diff --git a/widgets/browsers.go b/widgets/browsers.go index 7aa6807bc..a8dd11723 100644 --- a/widgets/browsers.go +++ b/widgets/browsers.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/internal.go b/widgets/internal.go index 406a6f325..2310dff8a 100644 --- a/widgets/internal.go +++ b/widgets/internal.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/languages.go b/widgets/languages.go index a5aadd09b..1be4e8964 100644 --- a/widgets/languages.go +++ b/widgets/languages.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/locations.go b/widgets/locations.go index 1294b0fc8..63b2cb40c 100644 --- a/widgets/locations.go +++ b/widgets/locations.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/pages.go b/widgets/pages.go index 057b31327..79ccab33c 100644 --- a/widgets/pages.go +++ b/widgets/pages.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/sizes.go b/widgets/sizes.go index 788473fad..22b8bf4a3 100644 --- a/widgets/sizes.go +++ b/widgets/sizes.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/systems.go b/widgets/systems.go index f48b42a11..847853f96 100644 --- a/widgets/systems.go +++ b/widgets/systems.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/toprefs.go b/widgets/toprefs.go index ae90baddb..226c8bd88 100644 --- a/widgets/toprefs.go +++ b/widgets/toprefs.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/total_pages.go b/widgets/total_pages.go index ec215ef07..f77214a19 100644 --- a/widgets/total_pages.go +++ b/widgets/total_pages.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets diff --git a/widgets/widgets.go b/widgets/widgets.go index 3e4bc1b9e..cfb2e14de 100644 --- a/widgets/widgets.go +++ b/widgets/widgets.go @@ -1,6 +1,6 @@ -// Copyright © 2019 Martin Tournoij – This file is part of GoatCounter and -// published under the terms of a slightly modified EUPL v1.2 license, which can -// be found in the LICENSE file or at https://license.goatcounter.com +// Copyright © Martin Tournoij – This file is part of GoatCounter and published +// under the terms of a slightly modified EUPL v1.2 license, which can be found +// in the LICENSE file or at https://license.goatcounter.com package widgets