chore: increment version

fix: rebuild tailwind
fix: include icon library to fix missing emojis on some platforms (resolve #119 )
2023-08-10 21:12:56 +03:00 · 2021-04-16 19:17:30 +02:00 · 2021-04-16 17:09:23 +02:00 · 2021-04-16 17:07:11 +02:00 · 2021-04-16 16:02:55 +02:00 · 2021-04-16 12:35:49 +02:00
111 changed files with 110897 additions and 1358 deletions
--- a/.github/workflows/linux-build-on-release.yml
+++ b/.github/workflows/linux-build-on-release.yml
@ -17,7 +17,7 @@ jobs:
    - name: Set up Go 1.x
      uses: actions/setup-go@v2
      with:
-        go-version: ^1.13
+        go-version: ^1.16
      id: go

    - name: Check out code into the Go module directory
@ -25,9 +25,7 @@ jobs:

    - name: Get dependencies
      run: |
-        go get github.com/markbates/pkger/cmd/pkger
        go get
-        go generate

    - name: Build
      run: GO111MODULE=on go build -v .
--- a/.github/workflows/win-build-on-release.yml
+++ b/.github/workflows/win-build-on-release.yml
@ -17,7 +17,7 @@ jobs:
    - name: Set up Go 1.x
      uses: actions/setup-go@v2
      with:
-        go-version: ^1.13
+        go-version: ^1.16
      id: go

    - name: Check out code into the Go module directory
@ -25,9 +25,7 @@ jobs:

    - name: Get dependencies
      run: |
-        go get github.com/markbates/pkger/cmd/pkger
        go get
-        go generate

    - name: Enable Go 1.11 modules
      run: cmd /c "set GO111MODULE=on"
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,7 @@ build
 config*.yml
 !config.default.yml
 pkged.go
+package.json
+yarn.lock
+package-lock.json
+node_modules
--- a/7
+++ b/7
@ -1,16 +1,16 @@
 # Build Stage

-FROM golang:1.15 AS build-env
+FROM golang:1.16 AS build-env
 WORKDIR /src

 ADD ./go.mod .
-RUN go mod download && go get github.com/markbates/pkger/cmd/pkger
+RUN go mod download

 RUN curl "https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh" -o wait-for-it.sh && \
    chmod +x wait-for-it.sh

 ADD . .
-RUN go generate && go build -o wakapi
+RUN go build -o wakapi

 WORKDIR /app
 RUN cp /src/wakapi . && \
@ -31,6 +31,7 @@ WORKDIR /app
 RUN apt update && \
    apt install -y ca-certificates

+# See README.md and config.default.yml for all config options
 ENV ENVIRONMENT prod
 ENV WAKAPI_DB_TYPE sqlite3
 ENV WAKAPI_DB_USER ''
--- a/README.md
+++ b/README.md
@ -49,6 +49,8 @@
 * [Support](#-support)
 * [FAQs](#-faqs)

+Further instructions can be found in the [Wiki](https://github.com/muety/wakapi/wiki).
+
 ## 📬 **User Survey**
 I'd love to get some community feedback from active Wakapi users. If you want, please participate in the recent [user survey](https://github.com/muety/wakapi/issues/82). Thanks a lot!

@ -90,6 +92,8 @@ $ docker run -d \

 **Note:** By default, SQLite is used as a database. To run Wakapi in Docker with MySQL or Postgres, see [Dockerfile](https://github.com/muety/wakapi/blob/master/Dockerfile) and [config.default.yml](https://github.com/muety/wakapi/blob/master/config.default.yml) for further options.

+If you want to run Wakapi on **Kubernetes**, there is [wakapi-helm-chart](https://github.com/andreymaznyak/wakapi-helm-chart) for quick and easy deployment.
+
 ### 📦 Option 3: Run a release
 ```bash
 # Download the release and unpack it
@ -105,7 +109,7 @@ $ ./wakapi

 ### 🧑‍💻 Option 4: Run from source
 #### Prerequisites
-* Go >= 1.13 (with `$GOPATH` properly set)
+* Go >= 1.16 (with `$GOPATH` properly set)
 * gcc (to compile [go-sqlite3](https://github.com/mattn/go-sqlite3))
    * Fedora / RHEL: `dnf install @development-tools`
    * Ubuntu / Debian: `apt install build-essential`
@ -117,12 +121,7 @@ $ ./wakapi
 $ cp config.default.yml config.yml
 $ vi config.yml

-# Install packaging tool
-$ export GO111MODULE=on
-$ go get github.com/markbates/pkger/cmd/pkger
-
 # Build the executable
-$ go generate
 $ go build -o wakapi

 # Run it
@ -147,7 +146,7 @@ api_url = http://localhost:3000/api/heartbeat
 api_key = 406fe41f-6d69-4183-a4cc-121e0c524c2b
 ```

-Optionally, you can set up a [client-side proxy](docs/advanced_setup.md) in addition.
+Optionally, you can set up a [client-side proxy](https://github.com/muety/wakapi/wiki/Advanced-Setup:-Client-side-proxy) in addition.

 ## 🔧 Configuration Options
 You can specify configuration options either via a config file (default: `config.yml`, customziable through the `-c` argument) or via environment variables. Here is an overview of all options.
@ -164,15 +163,26 @@ You can specify configuration options either via a config file (default: `config
 | `server.base_path`          | `WAKAPI_BASE_PATH`          | `/`            | Web base path (change when running behind a proxy under a sub-path) |
 | `security.password_salt`    | `WAKAPI_PASSWORD_SALT`      | -              | Pepper to use for password hashing                                  |
 | `security.insecure_cookies` | `WAKAPI_INSECURE_COOKIES`   | `false`        | Whether or not to allow cookies over HTTP                           |
-| `security.cookie_max_age`   | `WAKAPI_COOKIE_MAX_AGE  `   | `172800`       | Lifetime of authentication cookies in seconds or `0` to use [Session](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#Define_the_lifetime_of_a_cookie) cookies |
+| `security.cookie_max_age`   | `WAKAPI_COOKIE_MAX_AGE`     | `172800`       | Lifetime of authentication cookies in seconds or `0` to use [Session](https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#Define_the_lifetime_of_a_cookie) cookies |
+| `security.allow_signup`     | `WAKAPI_ALLOW_SIGNUP`       | `true`         | Whether to enable user registration                                 |
+| `security.expose_metrics`   | `WAKAPI_EXPOSE_METRICS`     | `false`        | Whether to expose Prometheus metrics under `/api/metrics`               |
 | `db.host`                   | `WAKAPI_DB_HOST`            | -              | Database host                                                       |
 | `db.port`                   | `WAKAPI_DB_PORT`            | -              | Database port                                                       |
 | `db.user`                   | `WAKAPI_DB_USER`            | -              | Database user                                                       |
 | `db.password`               | `WAKAPI_DB_PASSWORD`        | -              | Database password                                                   |
 | `db.name`                   | `WAKAPI_DB_NAME`            | `wakapi_db.db` | Database name                                                       |
-| `db.dialect`                | `WAKAPI_DB_TYPE`            | `sqlite3`      | Database type (one of `sqlite3`, `mysql`, `postgres`, `cockroach`)                     |
+| `db.dialect`                | `WAKAPI_DB_TYPE`            | `sqlite3`      | Database type (one of `sqlite3`, `mysql`, `postgres`, `cockroach`)  |
+| `db.charset`                | `WAKAPI_DB_CHARSET`         | `utf8mb4`      | Database connection charset (for MySQL only)                        |
 | `db.max_conn`               | `WAKAPI_DB_MAX_CONNECTIONS` | `2`            | Maximum number of database connections                              |
 | `db.ssl`                    | `WAKAPI_DB_SSL`             | `false`        | Whether to use TLS encryption for database connection (Postgres and CockroachDB only) |
+| `mail.enabled`              | `WAKAPI_MAIL_ENABLED`       | `true`         | Whether to allow Wakapi to send e-mail (e.g. for password resets) |
+| `mail.provider`             | `WAKAPI_MAIL_PROVIDER`      | `smtp`         | Implementation to use for sending mails (one of [`smtp`, `mailwhale`]) |
+| `mail.smtp.*`               | `WAKAPI_MAIL_SMTP_*`        | `-`            | Various options to configure SMTP. See [default config](config.default.yaml) for details |
+| `mail.mailwhale.*`          | `WAKAPI_MAIL_MAILWHALE_*`   | `-`            | Various options to configure [MailWhale](https://mailwhale.dev) sending service. See [default config](config.default.yaml) for details |
+| `sentry.dsn`                | `WAKAPI_SENTRY_DSN`         | –              | DSN for to integrate [Sentry](https://sentry.io) for error logging and tracing (leave empty to disable) |
+| `sentry.enable_tracing`     | `WAKAPI_SENTRY_TRACING`     | `false`        | Whether to enable Sentry request tracing                           |
+| `sentry.sample_rate`        | `WAKAPI_SENTRY_SAMPLE_RATE` | `0.75`         | Probability of tracing a request in Sentry                         |
+| `sentry.sample_rate_heartbats` | `WAKAPI_SENTRY_SAMPLE_RATE_HEARTBEATS` | `0.1` | Probability of tracing a heartbeats request in Sentry         |

 ### Supported databases
 Wakapi uses [GORM](https://gorm.io) as an ORM. As a consequence, a set of different relational databases is supported.
@ -196,13 +206,37 @@ $ swag init -o static/docs

 ## 🤝 Integrations
 ### Prometheus Export
-If you want to export your Wakapi statistics to Prometheus to view them in a Grafana dashboard or so please refer to an excellent tool called **[wakatime_exporter](https://github.com/MacroPower/wakatime_exporter)**.
+You can export your Wakapi statistics to Prometheus to view them in a Grafana dashboard or so. Here is how.

-[![](https://github-readme-stats.vercel.app/api/pin/?username=MacroPower&repo=wakatime_exporter&show_owner=true&bg_color=2D3748&title_color=2F855A&icon_color=2F855A&text_color=ffffff)](https://github.com/MacroPower/wakatime_exporter)
+```bash
+# 1. Start Wakapi with the feature enabled
+$ export WAKAPI_EXPOSE_METRICS=true
+$ ./wakapi

-It is a standalone webserver that connects to your Wakapi instance and exposes the data as Prometheus metrics. Although originally developed to scrape data from WakaTime, it will mostly for with Wakapi as well, as the APIs are partially compatible.
+# 2. Get your API key and hash it
+$ echo "<YOUR_API_KEY>" | base64

-Simply configure the exporter with `WAKA_SCRAPE_URI` to equal `"https://wakapi.your-server.com/api/compat/wakatime/v1"` and set your API key accordingly.
+# 3. Add a Prometheus scrape config to your prometheus.yml (see below)
+```
+
+#### Scrape config example
+```yml
+# prometheus.yml
+# (assuming your Wakapi instance listens at localhost, port 3000)
+
+scrape_configs:
+  - job_name: 'wakapi'
+    scrape_interval: 1m
+    metrics_path: '/api/metrics'
+    bearer_token: '<YOUR_BASE64_HASHED_TOKEN>'
+    static_configs:
+      - targets: ['localhost:3000']
+```
+
+#### Grafana 
+There is also a [nice Grafana dashboard](https://grafana.com/grafana/dashboards/12790), provided by the author of [wakatime_exporter](https://github.com/MacroPower/wakatime_exporter).
+
+![](https://grafana.com/api/dashboards/12790/images/8741/image)

 ### WakaTime Integration
 Wakapi plays well together with [WakaTime](https://wakatime.com). For one thing, you can **forward heartbeats** from Wakapi to WakaTime to effectively use both services simultaneously. In addition, there is the option to **import historic data** from WakaTime for consistency between both services. Both features can be enabled in the _Integrations_ section of your Wakapi instance's settings page.     
@ -222,6 +256,22 @@ However, if you want to expose your wakapi instance to the public anyway, you ne
 CGO_FLAGS="-g -O2 -Wno-return-local-addr" go test -json -coverprofile=coverage/coverage.out ./... -run ./...
 ```

+### Building web assets
+To keep things minimal, Wakapi does not contain a `package.json`, `node_modules` or any sort of frontend build step. Instead, all JS and CSS assets are included as static files and checked in to Git. This way we can avoid requiring NodeJS to build Wakapi. However, for [TailwindCSS](https://tailwindcss.com/docs/installation#building-for-production) it makes sense to run it through a "build" step to benefit from purging and significantly reduce it in size. To only require this at the time of development, the compiled asset is checked in to Git as well. Similarly, [Iconify](https://iconify.design/docs/icon-bundles/) bundles are also created at development time and checked in to the repo. 
+
+#### TailwindCSS
+```bash
+$ tailwindcss-cli build static/assets/vendor/tailwind.css -o static/assets/vendor/tailwind.dist.css
+```
+
+#### Iconify
+```bash
+$ yarn add -D @iconify/json-tools @iconify/json
+$ node scripts/bundle_icons.js
+```
+
+New icons can be added by editing the `icons` array in [scripts/bundle_icons.js](scripts/bundle_icons.js).
+
 ## 🙏 Support
 If you like this project, please consider supporting it 🙂. You can donate either through [buying me a coffee](https://buymeacoff.ee/n1try) or becoming a GitHub sponsor. Every little donation is highly appreciated and boosts the developers' motivation to keep improving Wakapi!

--- a/config.default.yml
+++ b/config.default.yml
@ -1,19 +1,21 @@
 env: development

 server:
-  listen_ipv4: 127.0.0.1    # leave blank to disable ipv4
-  listen_ipv6: ::1          # leave blank to disable ipv6
-  tls_cert_path:            # leave blank to not use https
-  tls_key_path:             # leave blank to not use https
+  listen_ipv4: 127.0.0.1            # leave blank to disable ipv4
+  listen_ipv6: ::1                  # leave blank to disable ipv6
+  tls_cert_path:                    # leave blank to not use https
+  tls_key_path:                     # leave blank to not use https
  port: 3000
  base_path: /
+  public_url: http://localhost:3000 # required for links (e.g. password reset) in e-mail

 app:
  aggregation_time: '02:15' # time at which to run daily aggregation batch jobs
-  counting_time: '05:15'    # time at which to run daily job to count total hours tracked in the system
+  inactive_days: 7          # time of previous days within a user must have logged in to be considered active
  custom_languages:
    vue: Vue
    jsx: JSX
+    svelte: Svelte

 db:
  host:                     # leave blank when using sqlite3
@ -22,11 +24,34 @@ db:
  password:                 # leave blank when using sqlite3
  name: wakapi_db.db        # database name for mysql / postgres or file path for sqlite (e.g. /tmp/wakapi.db)
  dialect: sqlite3          # mysql, postgres, sqlite3
+  charset: utf8mb4          # only used for mysql connections
  max_conn: 2               # maximum number of concurrent connections to maintain
  ssl: false                # whether to use tls for db connection (must be true for cockroachdb) (ignored for mysql and sqlite)

 security:
  password_salt:            # CHANGE !
-  insecure_cookies: false
+  insecure_cookies: false   # You need to set this to 'true' when on localhost
  cookie_max_age: 172800
-  allow_signup: true
+  allow_signup: true
+  expose_metrics: false
+
+sentry:
+  dsn:                        # leave blank to disable sentry integration
+  enable_tracing: true        # whether to use performance monitoring
+  sample_rate: 0.75           # probability of tracing a request
+  sample_rate_heartbeats: 0.1 # probability of tracing a heartbeat request
+
+mail:
+  enabled: true                         # whether to enable mails (used for password resets, reports, etc.)
+  provider: smtp                        # method for sending mails, currently one of ['smtp', 'mailwhale']
+  smtp:                                 # smtp settings when sending mails via smtp
+    host:
+    port:
+    username:
+    password:
+    tls:
+    sender: Wakapi <noreply@wakapi.dev>
+  mailwhale:                            # mailwhale.dev settings when using mailwhale as sending service
+    url:
+    client_id:
+    client_secret:
--- a/config/config.go
+++ b/config/config.go
@ -4,20 +4,20 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"github.com/emvi/logbuch"
-	"github.com/gorilla/securecookie"
-	"github.com/jinzhu/configor"
-	"github.com/markbates/pkger"
-	"github.com/muety/wakapi/models"
-	migrate "github.com/rubenv/sql-migrate"
-	"gorm.io/driver/mysql"
-	"gorm.io/driver/postgres"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
+
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/securecookie"
+	"github.com/jinzhu/configor"
+	"github.com/muety/wakapi/data"
+	"github.com/muety/wakapi/models"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
 )

 const (
@ -30,6 +30,12 @@ const (
 	KeyLatestTotalTime  = "latest_total_time"
 	KeyLatestTotalUsers = "latest_total_users"
 	KeyLastImportImport = "last_import"
+
+	SimpleDateFormat     = "2006-01-02"
+	SimpleDateTimeFormat = "2006-01-02 15:04:05"
+
+	ErrUnauthorized        = "401 unauthorized"
+	ErrInternalServerError = "500 internal server error"
 )

 const (
@ -42,20 +48,32 @@ const (
 	WakatimeApiMachineNamesUrl   = "/users/current/machine_names"
 )

+const (
+	MailProviderSmtp      = "smtp"
+	MailProviderMailWhale = "mailwhale"
+)
+
+var emailProviders = []string{
+	MailProviderSmtp,
+	MailProviderMailWhale,
+}
+
 var cfg *Config
 var cFlag = flag.String("config", defaultConfigPath, "config file location")
+var env string

 type appConfig struct {
 	AggregationTime  string                       `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
-	CountingTime     string                       `yaml:"counting_time" default:"05:15" env:"WAKAPI_COUNTING_TIME"`
 	ImportBackoffMin int                          `yaml:"import_backoff_min" default:"5" env:"WAKAPI_IMPORT_BACKOFF_MIN"`
 	ImportBatchSize  int                          `yaml:"import_batch_size" default:"100" env:"WAKAPI_IMPORT_BATCH_SIZE"`
+	InactiveDays     int                          `yaml:"inactive_days" default:"7" env:"WAKAPI_INACTIVE_DAYS"`
 	CustomLanguages  map[string]string            `yaml:"custom_languages"`
 	Colors           map[string]map[string]string `yaml:"-"`
 }

 type securityConfig struct {
-	AllowSignup bool `yaml:"allow_signup" default:"true" env:"WAKAPI_ALLOW_SIGNUP"`
+	AllowSignup   bool `yaml:"allow_signup" default:"true" env:"WAKAPI_ALLOW_SIGNUP"`
+	ExposeMetrics bool `yaml:"expose_metrics" default:"false" env:"WAKAPI_EXPOSE_METRICS"`
 	// this is actually a pepper (https://en.wikipedia.org/wiki/Pepper_(cryptography))
 	PasswordSalt    string                     `yaml:"password_salt" default:"" env:"WAKAPI_PASSWORD_SALT"`
 	InsecureCookies bool                       `yaml:"insecure_cookies" default:"false" env:"WAKAPI_INSECURE_COOKIES"`
@ -70,6 +88,7 @@ type dbConfig struct {
 	Password string `env:"WAKAPI_DB_PASSWORD"`
 	Name     string `default:"wakapi_db.db" env:"WAKAPI_DB_NAME"`
 	Dialect  string `yaml:"-"`
+	Charset  string `default:"utf8mb4" env:"WAKAPI_DB_CHARSET"`
 	Type     string `yaml:"dialect" default:"sqlite3" env:"WAKAPI_DB_TYPE"`
 	MaxConn  uint   `yaml:"max_conn" default:"2" env:"WAKAPI_DB_MAX_CONNECTIONS"`
 	Ssl      bool   `default:"false" env:"WAKAPI_DB_SSL"`
@ -80,10 +99,40 @@ type serverConfig struct {
 	ListenIpV4  string `yaml:"listen_ipv4" default:"127.0.0.1" env:"WAKAPI_LISTEN_IPV4"`
 	ListenIpV6  string `yaml:"listen_ipv6" default:"::1" env:"WAKAPI_LISTEN_IPV6"`
 	BasePath    string `yaml:"base_path" default:"/" env:"WAKAPI_BASE_PATH"`
+	PublicUrl   string `yaml:"public_url" default:"http://localhost:3000" env:"WAKAPI_PUBLIC_URL"`
 	TlsCertPath string `yaml:"tls_cert_path" default:"" env:"WAKAPI_TLS_CERT_PATH"`
 	TlsKeyPath  string `yaml:"tls_key_path" default:"" env:"WAKAPI_TLS_KEY_PATH"`
 }

+type sentryConfig struct {
+	Dsn                  string  `env:"WAKAPI_SENTRY_DSN"`
+	EnableTracing        bool    `yaml:"enable_tracing" env:"WAKAPI_SENTRY_TRACING"`
+	SampleRate           float32 `yaml:"sample_rate" default:"0.75" env:"WAKAPI_SENTRY_SAMPLE_RATE"`
+	SampleRateHeartbeats float32 `yaml:"sample_rate_heartbeats" default:"0.1" env:"WAKAPI_SENTRY_SAMPLE_RATE_HEARTBEATS"`
+}
+
+type mailConfig struct {
+	Enabled   bool                `env:"WAKAPI_MAIL_ENABLED" default:"true"`
+	Provider  string              `env:"WAKAPI_MAIL_PROVIDER" default:"smtp"`
+	MailWhale MailwhaleMailConfig `yaml:"mailwhale"`
+	Smtp      SMTPMailConfig      `yaml:"smtp"`
+}
+
+type MailwhaleMailConfig struct {
+	Url          string `env:"WAKAPI_MAIL_MAILWHALE_URL"`
+	ClientId     string `yaml:"client_id" env:"WAKAPI_MAIL_MAILWHALE_CLIENT_ID"`
+	ClientSecret string `yaml:"client_secret" env:"WAKAPI_MAIL_MAILWHALE_CLIENT_SECRET"`
+}
+
+type SMTPMailConfig struct {
+	Host     string `env:"WAKAPI_MAIL_SMTP_HOST"`
+	Port     uint   `env:"WAKAPI_MAIL_SMTP_PORT"`
+	Username string `env:"WAKAPI_MAIL_SMTP_USER"`
+	Password string `env:"WAKAPI_MAIL_SMTP_PASS"`
+	TLS      bool   `env:"WAKAPI_MAIL_SMTP_TLS"`
+	Sender   string `env:"WAKAPI_MAIL_SMTP_SENDER"`
+}
+
 type Config struct {
 	Env      string `default:"dev" env:"ENVIRONMENT"`
 	Version  string `yaml:"-"`
@ -91,6 +140,8 @@ type Config struct {
 	Security securityConfig
 	Db       dbConfig
 	Server   serverConfig
+	Sentry   sentryConfig
+	Mail     mailConfig
 }

 func (c *Config) CreateCookie(name, value, path string) *http.Cookie {
@ -125,36 +176,32 @@ func (c *Config) GetMigrationFunc(dbDialect string) models.MigrationFunc {
 	switch dbDialect {
 	default:
 		return func(db *gorm.DB) error {
-			db.AutoMigrate(&models.User{})
-			db.AutoMigrate(&models.KeyStringValue{})
-			db.AutoMigrate(&models.Alias{})
-			db.AutoMigrate(&models.Heartbeat{})
-			db.AutoMigrate(&models.Summary{})
-			db.AutoMigrate(&models.SummaryItem{})
-			db.AutoMigrate(&models.LanguageMapping{})
+			if err := db.AutoMigrate(&models.User{}); err != nil {
+				return err
+			}
+			if err := db.AutoMigrate(&models.KeyStringValue{}); err != nil {
+				return err
+			}
+			if err := db.AutoMigrate(&models.Alias{}); err != nil {
+				return err
+			}
+			if err := db.AutoMigrate(&models.Heartbeat{}); err != nil {
+				return err
+			}
+			if err := db.AutoMigrate(&models.Summary{}); err != nil {
+				return err
+			}
+			if err := db.AutoMigrate(&models.SummaryItem{}); err != nil {
+				return err
+			}
+			if err := db.AutoMigrate(&models.LanguageMapping{}); err != nil {
+				return err
+			}
 			return nil
 		}
 	}
 }

-func (c *Config) GetFixturesFunc(dbDialect string) models.MigrationFunc {
-	return func(db *gorm.DB) error {
-		migrations := &migrate.HttpFileSystemMigrationSource{
-			FileSystem: pkger.Dir("/migrations"),
-		}
-
-		migrate.SetIgnoreUnknown(true)
-		sqlDb, _ := db.DB()
-		n, err := migrate.Exec(sqlDb, dbDialect, migrations, migrate.Up)
-		if err != nil {
-			return err
-		}
-
-		logbuch.Info("applied %d fixtures", n)
-		return nil
-	}
-}
-
 func (c *dbConfig) GetDialector() gorm.Dialector {
 	switch c.Dialect {
 	case SQLDialectMysql:
@ -174,12 +221,13 @@ func (c *dbConfig) GetDialector() gorm.Dialector {

 func mysqlConnectionString(config *dbConfig) string {
 	//location, _ := time.LoadLocation("Local")
-	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
+	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=%s&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
 		config.User,
 		config.Password,
 		config.Host,
 		config.Port,
 		config.Name,
+		config.Charset,
 		"Local",
 	)
 }
@ -220,23 +268,16 @@ func (c *appConfig) GetOSColors() map[string]string {
 	return cloneStringMap(c.Colors["operating_systems"], true)
 }

-func IsDev(env string) bool {
-	return env == "dev" || env == "development"
+func (c *serverConfig) GetPublicUrl() string {
+	return strings.TrimSuffix(c.PublicUrl, "/")
 }

-func readVersion() string {
-	file, err := pkger.Open("/version.txt")
-	if err != nil {
-		logbuch.Fatal(err.Error())
-	}
-	defer file.Close()
+func (c *SMTPMailConfig) ConnStr() string {
+	return fmt.Sprintf("%s:%d", c.Host, c.Port)
+}

-	bytes, err := ioutil.ReadAll(file)
-	if err != nil {
-		logbuch.Fatal(err.Error())
-	}
-
-	return strings.TrimSpace(string(bytes))
+func IsDev(env string) bool {
+	return env == "dev" || env == "development"
 }

 func readColors() map[string]map[string]string {
@ -248,19 +289,14 @@ func readColors() map[string]map[string]string {
 	// Extracted from Wakatime website with XPath (see below) and did a bit of regex magic after.
 	// – $x('//span[@class="editor-icon tip"]/@data-original-title').map(e => e.nodeValue)
 	// – $x('//span[@class="editor-icon tip"]/div[1]/text()').map(e => e.nodeValue)
+
+	raw := data.ColorsFile
+	if IsDev(env) {
+		raw, _ = ioutil.ReadFile("data/colors.json")
+	}
+
 	var colors = make(map[string]map[string]string)
-
-	file, err := pkger.Open("/data/colors.json")
-	if err != nil {
-		logbuch.Fatal(err.Error())
-	}
-	defer file.Close()
-	bytes, err := ioutil.ReadAll(file)
-	if err != nil {
-		logbuch.Fatal(err.Error())
-	}
-
-	if err := json.Unmarshal(bytes, &colors); err != nil {
+	if err := json.Unmarshal(raw, &colors); err != nil {
 		logbuch.Fatal(err.Error())
 	}

@ -281,6 +317,15 @@ func resolveDbDialect(dbType string) string {
 	return dbType
 }

+func findString(needle string, haystack []string, defaultVal string) string {
+	for _, s := range haystack {
+		if s == needle {
+			return s
+		}
+	}
+	return defaultVal
+}
+
 func Set(config *Config) {
 	cfg = config
 }
@ -289,7 +334,7 @@ func Get() *Config {
 	return cfg
 }

-func Load() *Config {
+func Load(version string) *Config {
 	config := &Config{}

 	flag.Parse()
@ -298,7 +343,8 @@ func Load() *Config {
 		logbuch.Fatal("failed to read config: %v", err)
 	}

-	config.Version = readVersion()
+	env = config.Env
+	config.Version = strings.TrimSpace(version)
 	config.App.Colors = readColors()
 	config.Db.Dialect = resolveDbDialect(config.Db.Type)
 	config.Security.SecureCookie = securecookie.New(
@ -324,6 +370,15 @@ func Load() *Config {
 		logbuch.Fatal("you must allow at least one database connection")
 	}

+	if config.Sentry.Dsn != "" {
+		logbuch.Info("enabling sentry integration")
+		initSentry(config.Sentry, config.IsDev())
+	}
+
+	if config.Mail.Provider != "" && findString(config.Mail.Provider, emailProviders, "") == "" {
+		logbuch.Fatal("unknown mail provider '%s'", config.Mail.Provider)
+	}
+
 	Set(config)
 	return Get()
 }
--- a/config/config_test.go
+++ b/config/config_test.go
@ -22,11 +22,12 @@ func Test_mysqlConnectionString(t *testing.T) {
 		Password: "test_password",
 		Name:     "test_name",
 		Dialect:  "mysql",
+		Charset:  "utf8mb4",
 		MaxConn:  10,
 	}

 	assert.Equal(t, fmt.Sprintf(
-		"%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
+		"%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
 		c.User,
 		c.Password,
 		c.Host,
--- a/config/fs.go
+++ b/config/fs.go
@ -0,0 +1,14 @@
+package config
+
+import (
+	"io/fs"
+	"os"
+)
+
+// ChooseFS returns a local (DirFS) file system when on 'dev' environment and the given go-embed file system otherwise
+func ChooseFS(localDir string, embeddedFS fs.FS) fs.FS {
+	if Get().IsDev() {
+		return os.DirFS(localDir)
+	}
+	return embeddedFS
+}
--- a/config/sentry.go
+++ b/config/sentry.go
@ -0,0 +1,146 @@
+package config
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/getsentry/sentry-go"
+	"github.com/muety/wakapi/models"
+	"io"
+	"net/http"
+	"os"
+	"strings"
+)
+
+// How to: Logging
+// Use logbuch.[Debug|Info|Warn|Error|Fatal]() by default
+// Use config.Log().[Debug|Info|Warn|Error|Fatal]() when wanting the log to appear in Sentry as well
+
+type capturingWriter struct {
+	Writer  io.Writer
+	Message string
+}
+
+func (c *capturingWriter) Clear() {
+	c.Message = ""
+}
+
+func (c *capturingWriter) Write(p []byte) (n int, err error) {
+	c.Message = string(p)
+	return c.Writer.Write(p)
+}
+
+// SentryWrapperLogger is a wrapper around a logbuch.Logger that forwards events to Sentry in addition and optionally allows to attach a request context
+type SentryWrapperLogger struct {
+	*logbuch.Logger
+	req       *http.Request
+	outWriter *capturingWriter
+	errWriter *capturingWriter
+}
+
+func Log() *SentryWrapperLogger {
+	ow, ew := &capturingWriter{Writer: os.Stdout}, &capturingWriter{Writer: os.Stderr}
+	return &SentryWrapperLogger{
+		Logger:    logbuch.NewLogger(ow, ew),
+		outWriter: ow,
+		errWriter: ew,
+	}
+}
+
+func (l *SentryWrapperLogger) Request(req *http.Request) *SentryWrapperLogger {
+	l.req = req
+	return l
+}
+
+func (l *SentryWrapperLogger) Debug(msg string, params ...interface{}) {
+	l.outWriter.Clear()
+	l.Logger.Debug(msg, params...)
+	l.log(l.errWriter.Message, sentry.LevelDebug)
+}
+
+func (l *SentryWrapperLogger) Info(msg string, params ...interface{}) {
+	l.outWriter.Clear()
+	l.Logger.Info(msg, params...)
+	l.log(l.errWriter.Message, sentry.LevelInfo)
+}
+
+func (l *SentryWrapperLogger) Warn(msg string, params ...interface{}) {
+	l.outWriter.Clear()
+	l.Logger.Warn(msg, params...)
+	l.log(l.errWriter.Message, sentry.LevelWarning)
+}
+
+func (l *SentryWrapperLogger) Error(msg string, params ...interface{}) {
+	l.errWriter.Clear()
+	l.Logger.Error(msg, params...)
+	l.log(l.errWriter.Message, sentry.LevelError)
+}
+
+func (l *SentryWrapperLogger) Fatal(msg string, params ...interface{}) {
+	l.errWriter.Clear()
+	l.Logger.Fatal(msg, params...)
+	l.log(l.errWriter.Message, sentry.LevelFatal)
+}
+
+func (l *SentryWrapperLogger) log(msg string, level sentry.Level) {
+	event := sentry.NewEvent()
+	event.Level = level
+	event.Message = msg
+
+	if l.req != nil {
+		if h := l.req.Context().Value(sentry.HubContextKey); h != nil {
+			hub := h.(*sentry.Hub)
+			hub.Scope().SetRequest(l.req)
+			if u := getPrincipal(l.req); u != nil {
+				hub.Scope().SetUser(sentry.User{ID: u.ID})
+			}
+			hub.CaptureEvent(event)
+			return
+		}
+	}
+
+	sentry.CaptureEvent(event)
+}
+
+func initSentry(config sentryConfig, debug bool) {
+	if err := sentry.Init(sentry.ClientOptions{
+		Dsn:   config.Dsn,
+		Debug: debug,
+		TracesSampler: sentry.TracesSamplerFunc(func(ctx sentry.SamplingContext) sentry.Sampled {
+			if !config.EnableTracing {
+				return sentry.SampledFalse
+			}
+
+			hub := sentry.GetHubFromContext(ctx.Span.Context())
+			txName := hub.Scope().Transaction()
+
+			if strings.HasPrefix(txName, "GET /assets") || strings.HasPrefix(txName, "GET /api/health") {
+				return sentry.SampledFalse
+			}
+			if txName == "POST /api/heartbeat" {
+				return sentry.UniformTracesSampler(config.SampleRateHeartbeats).Sample(ctx)
+			}
+			return sentry.UniformTracesSampler(config.SampleRate).Sample(ctx)
+		}),
+		BeforeSend: func(event *sentry.Event, hint *sentry.EventHint) *sentry.Event {
+			if hint.Context != nil {
+				if req, ok := hint.Context.Value(sentry.RequestContextKey).(*http.Request); ok {
+					if u := getPrincipal(req); u != nil {
+						event.User.ID = u.ID
+					}
+				}
+			}
+			return event
+		},
+	}); err != nil {
+		logbuch.Fatal("failed to initialized sentry – %v", err)
+	}
+}
+
+func getPrincipal(r *http.Request) *models.User {
+	type principalGetter interface {
+		GetPrincipal() *models.User
+	}
+	if p := r.Context().Value("principal"); p != nil {
+		return p.(principalGetter).GetPrincipal()
+	}
+	return nil
+}
--- a/config/templates.go
+++ b/config/templates.go
@ -1,10 +1,12 @@
 package config

 const (
-	IndexTemplate    = "index.tpl.html"
-	LoginTemplate    = "login.tpl.html"
-	ImprintTemplate  = "imprint.tpl.html"
-	SignupTemplate   = "signup.tpl.html"
-	SettingsTemplate = "settings.tpl.html"
-	SummaryTemplate  = "summary.tpl.html"
+	IndexTemplate         = "index.tpl.html"
+	LoginTemplate         = "login.tpl.html"
+	ImprintTemplate       = "imprint.tpl.html"
+	SignupTemplate        = "signup.tpl.html"
+	SetPasswordTemplate   = "set-password.tpl.html"
+	ResetPasswordTemplate = "reset-password.tpl.html"
+	SettingsTemplate      = "settings.tpl.html"
+	SummaryTemplate       = "summary.tpl.html"
 )
--- a/coverage/coverage.out
+++ b/coverage/coverage.out
@ -1,108 +1,108 @@
 mode: set
+github.com/muety/wakapi/models/heartbeat.go:32.34,34.2 1 1
+github.com/muety/wakapi/models/heartbeat.go:36.65,38.46 2 1
+github.com/muety/wakapi/models/heartbeat.go:38.46,39.108 1 1
+github.com/muety/wakapi/models/heartbeat.go:39.108,42.4 2 1
+github.com/muety/wakapi/models/heartbeat.go:46.50,47.11 1 1
+github.com/muety/wakapi/models/heartbeat.go:60.2,60.15 1 1
+github.com/muety/wakapi/models/heartbeat.go:64.2,64.12 1 1
+github.com/muety/wakapi/models/heartbeat.go:48.22,49.18 1 1
+github.com/muety/wakapi/models/heartbeat.go:50.21,51.17 1 1
+github.com/muety/wakapi/models/heartbeat.go:52.23,53.19 1 1
+github.com/muety/wakapi/models/heartbeat.go:54.17,55.26 1 1
+github.com/muety/wakapi/models/heartbeat.go:56.22,57.18 1 1
+github.com/muety/wakapi/models/heartbeat.go:60.15,62.3 1 1
+github.com/muety/wakapi/models/heartbeat.go:67.37,83.2 1 0
+github.com/muety/wakapi/models/heartbeat.go:91.41,93.16 2 0
+github.com/muety/wakapi/models/heartbeat.go:96.2,97.10 2 0
+github.com/muety/wakapi/models/heartbeat.go:93.16,95.3 1 0
+github.com/muety/wakapi/models/interval.go:39.47,40.23 1 0
+github.com/muety/wakapi/models/interval.go:45.2,45.14 1 0
+github.com/muety/wakapi/models/interval.go:40.23,41.13 1 0
+github.com/muety/wakapi/models/interval.go:41.13,43.4 1 0
+github.com/muety/wakapi/models/language_mapping.go:11.42,13.2 1 0
+github.com/muety/wakapi/models/language_mapping.go:15.51,17.2 1 0
+github.com/muety/wakapi/models/language_mapping.go:19.52,21.2 1 0
+github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
+github.com/muety/wakapi/models/shared.go:35.52,37.2 1 0
+github.com/muety/wakapi/models/shared.go:39.52,42.16 3 0
+github.com/muety/wakapi/models/shared.go:45.2,47.12 3 0
+github.com/muety/wakapi/models/shared.go:42.16,44.3 1 0
+github.com/muety/wakapi/models/shared.go:51.52,57.22 2 0
+github.com/muety/wakapi/models/shared.go:73.2,76.12 3 0
+github.com/muety/wakapi/models/shared.go:58.14,60.17 2 0
+github.com/muety/wakapi/models/shared.go:63.13,65.8 2 0
+github.com/muety/wakapi/models/shared.go:66.17,68.8 2 0
+github.com/muety/wakapi/models/shared.go:69.10,70.64 1 0
+github.com/muety/wakapi/models/shared.go:60.17,62.4 1 0
+github.com/muety/wakapi/models/shared.go:79.45,81.2 1 0
+github.com/muety/wakapi/models/shared.go:83.51,86.2 2 0
+github.com/muety/wakapi/models/shared.go:88.37,91.2 2 0
+github.com/muety/wakapi/models/shared.go:93.35,95.2 1 0
+github.com/muety/wakapi/models/shared.go:97.34,99.2 1 0
+github.com/muety/wakapi/models/summary.go:70.29,72.2 1 1
+github.com/muety/wakapi/models/summary.go:74.37,81.2 6 1
+github.com/muety/wakapi/models/summary.go:83.35,85.2 1 1
+github.com/muety/wakapi/models/summary.go:87.57,95.2 1 1
+github.com/muety/wakapi/models/summary.go:97.64,99.2 1 0
+github.com/muety/wakapi/models/summary.go:112.33,117.26 4 1
+github.com/muety/wakapi/models/summary.go:124.2,124.37 1 1
+github.com/muety/wakapi/models/summary.go:128.2,131.33 2 1
+github.com/muety/wakapi/models/summary.go:117.26,118.30 1 1
+github.com/muety/wakapi/models/summary.go:118.30,120.4 1 1
+github.com/muety/wakapi/models/summary.go:124.37,126.3 1 0
+github.com/muety/wakapi/models/summary.go:131.33,137.3 1 1
+github.com/muety/wakapi/models/summary.go:140.45,145.30 3 1
+github.com/muety/wakapi/models/summary.go:154.2,154.30 1 1
+github.com/muety/wakapi/models/summary.go:145.30,146.47 1 1
+github.com/muety/wakapi/models/summary.go:146.47,147.32 1 1
+github.com/muety/wakapi/models/summary.go:150.4,150.9 1 1
+github.com/muety/wakapi/models/summary.go:147.32,149.5 1 1
+github.com/muety/wakapi/models/summary.go:157.73,159.55 2 1
+github.com/muety/wakapi/models/summary.go:164.2,164.16 1 1
+github.com/muety/wakapi/models/summary.go:159.55,160.31 1 1
+github.com/muety/wakapi/models/summary.go:160.31,162.4 1 1
+github.com/muety/wakapi/models/summary.go:167.88,169.55 2 1
+github.com/muety/wakapi/models/summary.go:177.2,177.16 1 1
+github.com/muety/wakapi/models/summary.go:169.55,170.31 1 1
+github.com/muety/wakapi/models/summary.go:170.31,171.23 1 1
+github.com/muety/wakapi/models/summary.go:174.4,174.46 1 1
+github.com/muety/wakapi/models/summary.go:171.23,172.13 1 1
+github.com/muety/wakapi/models/summary.go:180.70,182.8 2 1
+github.com/muety/wakapi/models/summary.go:185.2,185.10 1 1
+github.com/muety/wakapi/models/summary.go:182.8,184.3 1 1
+github.com/muety/wakapi/models/summary.go:188.71,189.63 1 1
+github.com/muety/wakapi/models/summary.go:229.2,235.10 6 1
+github.com/muety/wakapi/models/summary.go:189.63,192.45 2 1
+github.com/muety/wakapi/models/summary.go:201.3,201.31 1 1
+github.com/muety/wakapi/models/summary.go:208.3,208.31 1 1
+github.com/muety/wakapi/models/summary.go:225.3,225.16 1 1
+github.com/muety/wakapi/models/summary.go:192.45,193.32 1 1
+github.com/muety/wakapi/models/summary.go:198.4,198.14 1 1
+github.com/muety/wakapi/models/summary.go:193.32,194.24 1 1
+github.com/muety/wakapi/models/summary.go:194.24,196.6 1 1
+github.com/muety/wakapi/models/summary.go:201.31,203.60 1 1
+github.com/muety/wakapi/models/summary.go:203.60,205.5 1 1
+github.com/muety/wakapi/models/summary.go:208.31,210.60 1 1
+github.com/muety/wakapi/models/summary.go:210.60,211.55 1 1
+github.com/muety/wakapi/models/summary.go:211.55,213.6 1 1
+github.com/muety/wakapi/models/summary.go:213.11,221.6 1 1
+github.com/muety/wakapi/models/summary.go:238.33,240.2 1 1
+github.com/muety/wakapi/models/summary.go:242.43,244.2 1 1
+github.com/muety/wakapi/models/summary.go:246.38,248.2 1 1
+github.com/muety/wakapi/models/user.go:5.13,7.2 1 1
+github.com/muety/wakapi/models/user.go:70.43,73.2 1 0
+github.com/muety/wakapi/models/user.go:75.45,78.2 1 0
+github.com/muety/wakapi/models/user.go:80.33,85.2 1 0
+github.com/muety/wakapi/models/user.go:87.41,89.2 1 0
+github.com/muety/wakapi/models/user.go:91.45,93.2 1 0
+github.com/muety/wakapi/models/user.go:95.45,97.2 1 0
+github.com/muety/wakapi/models/user.go:99.39,101.2 1 0
 github.com/muety/wakapi/models/alias.go:12.32,14.2 1 0
 github.com/muety/wakapi/models/alias.go:16.37,17.35 1 0
 github.com/muety/wakapi/models/alias.go:22.2,22.14 1 0
 github.com/muety/wakapi/models/alias.go:17.35,18.18 1 0
 github.com/muety/wakapi/models/alias.go:18.18,20.4 1 0
-github.com/muety/wakapi/models/heartbeat.go:32.34,34.2 1 1
-github.com/muety/wakapi/models/heartbeat.go:36.65,37.28 1 1
-github.com/muety/wakapi/models/heartbeat.go:40.2,41.45 2 1
-github.com/muety/wakapi/models/heartbeat.go:44.2,45.44 2 1
-github.com/muety/wakapi/models/heartbeat.go:48.2,48.42 1 1
-github.com/muety/wakapi/models/heartbeat.go:37.28,39.3 1 1
-github.com/muety/wakapi/models/heartbeat.go:41.45,43.3 1 0
-github.com/muety/wakapi/models/heartbeat.go:45.44,47.3 1 0
-github.com/muety/wakapi/models/heartbeat.go:51.50,52.11 1 1
-github.com/muety/wakapi/models/heartbeat.go:65.2,65.15 1 1
-github.com/muety/wakapi/models/heartbeat.go:69.2,69.12 1 1
-github.com/muety/wakapi/models/heartbeat.go:53.22,54.18 1 1
-github.com/muety/wakapi/models/heartbeat.go:55.21,56.17 1 1
-github.com/muety/wakapi/models/heartbeat.go:57.23,58.19 1 1
-github.com/muety/wakapi/models/heartbeat.go:59.17,60.26 1 1
-github.com/muety/wakapi/models/heartbeat.go:61.22,62.18 1 1
-github.com/muety/wakapi/models/heartbeat.go:65.15,67.3 1 1
-github.com/muety/wakapi/models/heartbeat.go:72.37,88.2 1 0
-github.com/muety/wakapi/models/heartbeat.go:96.41,98.16 2 0
-github.com/muety/wakapi/models/heartbeat.go:101.2,102.10 2 0
-github.com/muety/wakapi/models/heartbeat.go:98.16,100.3 1 0
-github.com/muety/wakapi/models/heartbeats.go:7.31,9.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:11.41,13.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:15.36,17.2 1 0
-github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0
-github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0
-github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0
-github.com/muety/wakapi/models/heartbeats.go:26.18,28.3 1 0
-github.com/muety/wakapi/models/heartbeats.go:32.40,34.18 1 0
-github.com/muety/wakapi/models/heartbeats.go:37.2,37.24 1 0
-github.com/muety/wakapi/models/heartbeats.go:34.18,36.3 1 0
-github.com/muety/wakapi/models/language_mapping.go:11.42,13.2 1 0
-github.com/muety/wakapi/models/language_mapping.go:15.51,17.2 1 0
-github.com/muety/wakapi/models/language_mapping.go:19.52,21.2 1 0
-github.com/muety/wakapi/models/models.go:3.14,5.2 0 1
-github.com/muety/wakapi/models/shared.go:34.52,37.16 3 0
-github.com/muety/wakapi/models/shared.go:40.2,42.12 3 0
-github.com/muety/wakapi/models/shared.go:37.16,39.3 1 0
-github.com/muety/wakapi/models/shared.go:46.52,52.22 2 0
-github.com/muety/wakapi/models/shared.go:68.2,71.12 3 0
-github.com/muety/wakapi/models/shared.go:53.14,55.17 2 0
-github.com/muety/wakapi/models/shared.go:58.13,60.8 2 0
-github.com/muety/wakapi/models/shared.go:61.17,63.8 2 0
-github.com/muety/wakapi/models/shared.go:64.10,65.64 1 0
-github.com/muety/wakapi/models/shared.go:55.17,57.4 1 0
-github.com/muety/wakapi/models/shared.go:74.45,76.2 1 0
-github.com/muety/wakapi/models/shared.go:78.51,81.2 2 0
-github.com/muety/wakapi/models/shared.go:83.37,86.2 2 0
-github.com/muety/wakapi/models/shared.go:88.35,90.2 1 0
-github.com/muety/wakapi/models/shared.go:92.34,94.2 1 0
-github.com/muety/wakapi/models/summary.go:67.29,69.2 1 1
-github.com/muety/wakapi/models/summary.go:71.37,78.2 6 1
-github.com/muety/wakapi/models/summary.go:80.35,82.2 1 1
-github.com/muety/wakapi/models/summary.go:84.57,92.2 1 1
-github.com/muety/wakapi/models/summary.go:105.33,110.26 4 1
-github.com/muety/wakapi/models/summary.go:117.2,117.37 1 1
-github.com/muety/wakapi/models/summary.go:121.2,124.33 2 1
-github.com/muety/wakapi/models/summary.go:110.26,111.30 1 1
-github.com/muety/wakapi/models/summary.go:111.30,113.4 1 1
-github.com/muety/wakapi/models/summary.go:117.37,119.3 1 0
-github.com/muety/wakapi/models/summary.go:124.33,130.3 1 1
-github.com/muety/wakapi/models/summary.go:133.45,138.30 3 1
-github.com/muety/wakapi/models/summary.go:147.2,147.30 1 1
-github.com/muety/wakapi/models/summary.go:138.30,139.47 1 1
-github.com/muety/wakapi/models/summary.go:139.47,140.32 1 1
-github.com/muety/wakapi/models/summary.go:143.4,143.9 1 1
-github.com/muety/wakapi/models/summary.go:140.32,142.5 1 1
-github.com/muety/wakapi/models/summary.go:150.73,152.55 2 1
-github.com/muety/wakapi/models/summary.go:157.2,157.16 1 1
-github.com/muety/wakapi/models/summary.go:152.55,153.31 1 1
-github.com/muety/wakapi/models/summary.go:153.31,155.4 1 1
-github.com/muety/wakapi/models/summary.go:160.88,162.55 2 1
-github.com/muety/wakapi/models/summary.go:170.2,170.16 1 1
-github.com/muety/wakapi/models/summary.go:162.55,163.31 1 1
-github.com/muety/wakapi/models/summary.go:163.31,164.23 1 1
-github.com/muety/wakapi/models/summary.go:167.4,167.46 1 1
-github.com/muety/wakapi/models/summary.go:164.23,165.13 1 1
-github.com/muety/wakapi/models/summary.go:173.70,175.8 2 1
-github.com/muety/wakapi/models/summary.go:178.2,178.10 1 1
-github.com/muety/wakapi/models/summary.go:175.8,177.3 1 1
-github.com/muety/wakapi/models/summary.go:181.71,182.63 1 1
-github.com/muety/wakapi/models/summary.go:222.2,228.10 6 1
-github.com/muety/wakapi/models/summary.go:182.63,185.45 2 1
-github.com/muety/wakapi/models/summary.go:194.3,194.31 1 1
-github.com/muety/wakapi/models/summary.go:201.3,201.31 1 1
-github.com/muety/wakapi/models/summary.go:218.3,218.16 1 1
-github.com/muety/wakapi/models/summary.go:185.45,186.32 1 1
-github.com/muety/wakapi/models/summary.go:191.4,191.14 1 1
-github.com/muety/wakapi/models/summary.go:186.32,187.24 1 1
-github.com/muety/wakapi/models/summary.go:187.24,189.6 1 1
-github.com/muety/wakapi/models/summary.go:194.31,196.60 1 1
-github.com/muety/wakapi/models/summary.go:196.60,198.5 1 1
-github.com/muety/wakapi/models/summary.go:201.31,203.60 1 1
-github.com/muety/wakapi/models/summary.go:203.60,204.55 1 1
-github.com/muety/wakapi/models/summary.go:204.55,206.6 1 1
-github.com/muety/wakapi/models/summary.go:206.11,214.6 1 1
-github.com/muety/wakapi/models/summary.go:231.33,233.2 1 1
-github.com/muety/wakapi/models/summary.go:235.43,237.2 1 1
-github.com/muety/wakapi/models/summary.go:239.38,241.2 1 1
 github.com/muety/wakapi/models/filters.go:16.56,17.16 1 0
 github.com/muety/wakapi/models/filters.go:29.2,29.19 1 0
 github.com/muety/wakapi/models/filters.go:18.22,19.32 1 0
@ -121,78 +121,206 @@ github.com/muety/wakapi/models/filters.go:39.8,39.27 1 1
 github.com/muety/wakapi/models/filters.go:39.27,41.3 1 0
 github.com/muety/wakapi/models/filters.go:41.8,41.28 1 1
 github.com/muety/wakapi/models/filters.go:41.28,43.3 1 0
-github.com/muety/wakapi/models/interval.go:39.47,40.23 1 0
-github.com/muety/wakapi/models/interval.go:45.2,45.14 1 0
-github.com/muety/wakapi/models/interval.go:40.23,41.13 1 0
-github.com/muety/wakapi/models/interval.go:41.13,43.4 1 0
-github.com/muety/wakapi/models/user.go:40.43,43.2 1 0
-github.com/muety/wakapi/models/user.go:45.33,49.2 1 0
-github.com/muety/wakapi/models/user.go:51.45,53.2 1 0
-github.com/muety/wakapi/models/user.go:55.45,57.2 1 0
-github.com/muety/wakapi/config/config.go:95.70,97.2 1 0
-github.com/muety/wakapi/config/config.go:99.65,101.2 1 0
-github.com/muety/wakapi/config/config.go:103.82,113.2 1 0
-github.com/muety/wakapi/config/config.go:115.31,117.2 1 0
-github.com/muety/wakapi/config/config.go:119.32,121.2 1 0
-github.com/muety/wakapi/config/config.go:123.74,124.19 1 0
-github.com/muety/wakapi/config/config.go:125.10,126.34 1 0
-github.com/muety/wakapi/config/config.go:126.34,135.4 8 0
-github.com/muety/wakapi/config/config.go:139.73,140.33 1 0
-github.com/muety/wakapi/config/config.go:140.33,148.17 5 0
-github.com/muety/wakapi/config/config.go:152.3,153.13 2 0
-github.com/muety/wakapi/config/config.go:148.17,150.4 1 0
-github.com/muety/wakapi/config/config.go:157.50,158.19 1 0
-github.com/muety/wakapi/config/config.go:171.2,171.12 1 0
-github.com/muety/wakapi/config/config.go:159.23,163.5 1 0
-github.com/muety/wakapi/config/config.go:164.26,167.5 1 0
-github.com/muety/wakapi/config/config.go:168.24,169.48 1 0
-github.com/muety/wakapi/config/config.go:174.53,184.2 1 1
-github.com/muety/wakapi/config/config.go:186.56,188.16 2 1
-github.com/muety/wakapi/config/config.go:192.2,199.3 1 1
-github.com/muety/wakapi/config/config.go:188.16,190.3 1 0
-github.com/muety/wakapi/config/config.go:202.54,204.2 1 1
-github.com/muety/wakapi/config/config.go:206.60,208.2 1 0
-github.com/muety/wakapi/config/config.go:210.59,212.2 1 0
-github.com/muety/wakapi/config/config.go:214.57,216.2 1 0
-github.com/muety/wakapi/config/config.go:218.53,220.2 1 0
-github.com/muety/wakapi/config/config.go:222.29,224.2 1 1
-github.com/muety/wakapi/config/config.go:226.27,228.16 2 0
-github.com/muety/wakapi/config/config.go:231.2,234.16 3 0
-github.com/muety/wakapi/config/config.go:238.2,238.41 1 0
-github.com/muety/wakapi/config/config.go:228.16,230.3 1 0
-github.com/muety/wakapi/config/config.go:234.16,236.3 1 0
-github.com/muety/wakapi/config/config.go:241.48,253.16 3 0
-github.com/muety/wakapi/config/config.go:256.2,258.16 3 0
-github.com/muety/wakapi/config/config.go:262.2,262.55 1 0
-github.com/muety/wakapi/config/config.go:266.2,266.15 1 0
-github.com/muety/wakapi/config/config.go:253.16,255.3 1 0
-github.com/muety/wakapi/config/config.go:258.16,260.3 1 0
-github.com/muety/wakapi/config/config.go:262.55,264.3 1 0
-github.com/muety/wakapi/config/config.go:269.38,270.43 1 0
-github.com/muety/wakapi/config/config.go:273.2,273.15 1 0
-github.com/muety/wakapi/config/config.go:270.43,272.3 1 0
-github.com/muety/wakapi/config/config.go:276.45,277.27 1 0
-github.com/muety/wakapi/config/config.go:280.2,280.15 1 0
-github.com/muety/wakapi/config/config.go:277.27,279.3 1 0
-github.com/muety/wakapi/config/config.go:283.26,285.2 1 0
-github.com/muety/wakapi/config/config.go:287.20,289.2 1 0
-github.com/muety/wakapi/config/config.go:291.21,296.96 3 0
-github.com/muety/wakapi/config/config.go:300.2,308.52 5 0
-github.com/muety/wakapi/config/config.go:312.2,312.47 1 0
-github.com/muety/wakapi/config/config.go:318.2,318.70 1 0
-github.com/muety/wakapi/config/config.go:322.2,322.28 1 0
-github.com/muety/wakapi/config/config.go:326.2,327.14 2 0
-github.com/muety/wakapi/config/config.go:296.96,298.3 1 0
-github.com/muety/wakapi/config/config.go:308.52,310.3 1 0
-github.com/muety/wakapi/config/config.go:312.47,313.14 1 0
-github.com/muety/wakapi/config/config.go:313.14,315.4 1 0
-github.com/muety/wakapi/config/config.go:318.70,320.3 1 0
-github.com/muety/wakapi/config/config.go:322.28,324.3 1 0
+github.com/muety/wakapi/models/heartbeats.go:7.31,9.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:11.41,13.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:15.36,17.2 1 0
+github.com/muety/wakapi/models/heartbeats.go:19.43,22.2 2 0
+github.com/muety/wakapi/models/heartbeats.go:24.41,26.18 1 0
+github.com/muety/wakapi/models/heartbeats.go:29.2,29.16 1 0
+github.com/muety/wakapi/models/heartbeats.go:26.18,28.3 1 0
+github.com/muety/wakapi/models/heartbeats.go:32.40,34.18 1 0
+github.com/muety/wakapi/models/heartbeats.go:37.2,37.24 1 0
+github.com/muety/wakapi/models/heartbeats.go:34.18,36.3 1 0
+github.com/muety/wakapi/models/mail.go:16.44,20.2 3 0
+github.com/muety/wakapi/models/mail.go:22.44,26.2 3 0
+github.com/muety/wakapi/models/mail.go:28.32,41.2 1 0
+github.com/muety/wakapi/models/mail.go:43.41,45.2 1 0
+github.com/muety/wakapi/models/mail_address.go:15.13,18.2 2 1
+github.com/muety/wakapi/models/mail_address.go:24.38,26.2 1 0
+github.com/muety/wakapi/models/mail_address.go:28.35,30.21 2 1
+github.com/muety/wakapi/models/mail_address.go:36.2,36.11 1 1
+github.com/muety/wakapi/models/mail_address.go:30.21,31.21 1 1
+github.com/muety/wakapi/models/mail_address.go:34.3,34.18 1 1
+github.com/muety/wakapi/models/mail_address.go:31.21,33.4 1 1
+github.com/muety/wakapi/models/mail_address.go:39.35,41.2 1 1
+github.com/muety/wakapi/models/mail_address.go:43.43,45.22 2 0
+github.com/muety/wakapi/models/mail_address.go:48.2,48.12 1 0
+github.com/muety/wakapi/models/mail_address.go:45.22,47.3 1 0
+github.com/muety/wakapi/models/mail_address.go:51.46,53.22 2 1
+github.com/muety/wakapi/models/mail_address.go:56.2,56.12 1 1
+github.com/muety/wakapi/models/mail_address.go:53.22,55.3 1 1
+github.com/muety/wakapi/models/mail_address.go:59.40,60.22 1 1
+github.com/muety/wakapi/models/mail_address.go:65.2,65.13 1 1
+github.com/muety/wakapi/models/mail_address.go:60.22,61.17 1 1
+github.com/muety/wakapi/models/mail_address.go:61.17,63.4 1 1
 github.com/muety/wakapi/config/utils.go:5.78,7.22 2 0
 github.com/muety/wakapi/config/utils.go:13.2,13.11 1 0
 github.com/muety/wakapi/config/utils.go:7.22,8.18 1 0
 github.com/muety/wakapi/config/utils.go:11.3,11.12 1 0
 github.com/muety/wakapi/config/utils.go:8.18,10.4 1 0
+github.com/muety/wakapi/config/config.go:145.70,147.2 1 0
+github.com/muety/wakapi/config/config.go:149.65,151.2 1 0
+github.com/muety/wakapi/config/config.go:153.82,163.2 1 0
+github.com/muety/wakapi/config/config.go:165.31,167.2 1 0
+github.com/muety/wakapi/config/config.go:169.32,171.2 1 0
+github.com/muety/wakapi/config/config.go:173.74,174.19 1 0
+github.com/muety/wakapi/config/config.go:175.10,176.34 1 0
+github.com/muety/wakapi/config/config.go:176.34,177.57 1 0
+github.com/muety/wakapi/config/config.go:180.4,180.67 1 0
+github.com/muety/wakapi/config/config.go:183.4,183.58 1 0
+github.com/muety/wakapi/config/config.go:186.4,186.62 1 0
+github.com/muety/wakapi/config/config.go:189.4,189.60 1 0
+github.com/muety/wakapi/config/config.go:192.4,192.64 1 0
+github.com/muety/wakapi/config/config.go:195.4,195.68 1 0
+github.com/muety/wakapi/config/config.go:198.4,198.14 1 0
+github.com/muety/wakapi/config/config.go:177.57,179.5 1 0
+github.com/muety/wakapi/config/config.go:180.67,182.5 1 0
+github.com/muety/wakapi/config/config.go:183.58,185.5 1 0
+github.com/muety/wakapi/config/config.go:186.62,188.5 1 0
+github.com/muety/wakapi/config/config.go:189.60,191.5 1 0
+github.com/muety/wakapi/config/config.go:192.64,194.5 1 0
+github.com/muety/wakapi/config/config.go:195.68,197.5 1 0
+github.com/muety/wakapi/config/config.go:203.50,204.19 1 0
+github.com/muety/wakapi/config/config.go:217.2,217.12 1 0
+github.com/muety/wakapi/config/config.go:205.23,209.5 1 0
+github.com/muety/wakapi/config/config.go:210.26,213.5 1 0
+github.com/muety/wakapi/config/config.go:214.24,215.48 1 0
+github.com/muety/wakapi/config/config.go:220.53,231.2 1 1
+github.com/muety/wakapi/config/config.go:233.56,235.16 2 1
+github.com/muety/wakapi/config/config.go:239.2,246.3 1 1
+github.com/muety/wakapi/config/config.go:235.16,237.3 1 0
+github.com/muety/wakapi/config/config.go:249.54,251.2 1 1
+github.com/muety/wakapi/config/config.go:253.60,255.2 1 0
+github.com/muety/wakapi/config/config.go:257.59,259.2 1 0
+github.com/muety/wakapi/config/config.go:261.57,263.2 1 0
+github.com/muety/wakapi/config/config.go:265.53,267.2 1 0
+github.com/muety/wakapi/config/config.go:269.46,271.2 1 0
+github.com/muety/wakapi/config/config.go:273.43,275.2 1 0
+github.com/muety/wakapi/config/config.go:277.29,279.2 1 1
+github.com/muety/wakapi/config/config.go:281.48,291.65 2 0
+github.com/muety/wakapi/config/config.go:295.2,295.15 1 0
+github.com/muety/wakapi/config/config.go:291.65,293.3 1 0
+github.com/muety/wakapi/config/config.go:298.38,299.43 1 0
+github.com/muety/wakapi/config/config.go:302.2,302.15 1 0
+github.com/muety/wakapi/config/config.go:299.43,301.3 1 0
+github.com/muety/wakapi/config/config.go:305.45,306.27 1 0
+github.com/muety/wakapi/config/config.go:309.2,309.15 1 0
+github.com/muety/wakapi/config/config.go:306.27,308.3 1 0
+github.com/muety/wakapi/config/config.go:312.77,313.29 1 0
+github.com/muety/wakapi/config/config.go:318.2,318.19 1 0
+github.com/muety/wakapi/config/config.go:313.29,314.18 1 0
+github.com/muety/wakapi/config/config.go:314.18,316.4 1 0
+github.com/muety/wakapi/config/config.go:321.26,323.2 1 0
+github.com/muety/wakapi/config/config.go:325.20,327.2 1 0
+github.com/muety/wakapi/config/config.go:329.35,334.96 3 0
+github.com/muety/wakapi/config/config.go:338.2,346.52 5 0
+github.com/muety/wakapi/config/config.go:350.2,350.47 1 0
+github.com/muety/wakapi/config/config.go:356.2,356.70 1 0
+github.com/muety/wakapi/config/config.go:360.2,360.28 1 0
+github.com/muety/wakapi/config/config.go:364.2,364.29 1 0
+github.com/muety/wakapi/config/config.go:369.2,369.94 1 0
+github.com/muety/wakapi/config/config.go:373.2,374.14 2 0
+github.com/muety/wakapi/config/config.go:334.96,336.3 1 0
+github.com/muety/wakapi/config/config.go:346.52,348.3 1 0
+github.com/muety/wakapi/config/config.go:350.47,351.14 1 0
+github.com/muety/wakapi/config/config.go:351.14,353.4 1 0
+github.com/muety/wakapi/config/config.go:356.70,358.3 1 0
+github.com/muety/wakapi/config/config.go:360.28,362.3 1 0
+github.com/muety/wakapi/config/config.go:364.29,367.3 2 0
+github.com/muety/wakapi/config/config.go:369.94,371.3 1 0
+github.com/muety/wakapi/config/sentry.go:16.64,19.2 2 0
+github.com/muety/wakapi/config/sentry.go:21.13,23.2 1 1
+github.com/muety/wakapi/config/sentry.go:25.50,29.91 1 0
+github.com/muety/wakapi/config/sentry.go:29.91,30.29 1 0
+github.com/muety/wakapi/config/sentry.go:34.4,37.96 3 0
+github.com/muety/wakapi/config/sentry.go:40.4,40.39 1 0
+github.com/muety/wakapi/config/sentry.go:43.4,43.69 1 0
+github.com/muety/wakapi/config/sentry.go:30.29,32.5 1 0
+github.com/muety/wakapi/config/sentry.go:37.96,39.5 1 0
+github.com/muety/wakapi/config/sentry.go:40.39,42.5 1 0
+github.com/muety/wakapi/config/sentry.go:45.79,49.27 2 0
+github.com/muety/wakapi/config/sentry.go:56.4,56.16 1 0
+github.com/muety/wakapi/config/sentry.go:49.27,50.84 1 0
+github.com/muety/wakapi/config/sentry.go:50.84,51.57 1 0
+github.com/muety/wakapi/config/sentry.go:51.57,53.7 1 0
+github.com/muety/wakapi/config/sentry.go:58.17,60.3 1 0
+github.com/muety/wakapi/utils/common.go:10.48,12.2 1 0
+github.com/muety/wakapi/utils/common.go:14.52,16.2 1 0
+github.com/muety/wakapi/utils/common.go:18.40,20.2 1 0
+github.com/muety/wakapi/utils/common.go:22.44,24.2 1 0
+github.com/muety/wakapi/utils/common.go:26.45,28.2 1 0
+github.com/muety/wakapi/utils/common.go:30.24,32.2 1 0
+github.com/muety/wakapi/utils/common.go:34.56,37.45 3 1
+github.com/muety/wakapi/utils/common.go:40.2,40.40 1 1
+github.com/muety/wakapi/utils/common.go:37.45,39.3 1 1
+github.com/muety/wakapi/utils/date.go:8.31,10.2 1 0
+github.com/muety/wakapi/utils/date.go:12.43,14.2 1 0
+github.com/muety/wakapi/utils/date.go:16.30,20.2 3 0
+github.com/muety/wakapi/utils/date.go:22.31,25.2 2 0
+github.com/muety/wakapi/utils/date.go:27.30,30.2 2 0
+github.com/muety/wakapi/utils/date.go:33.42,35.2 1 1
+github.com/muety/wakapi/utils/date.go:38.41,40.21 2 1
+github.com/muety/wakapi/utils/date.go:43.2,43.34 1 1
+github.com/muety/wakapi/utils/date.go:40.21,42.3 1 1
+github.com/muety/wakapi/utils/date.go:46.67,49.33 2 0
+github.com/muety/wakapi/utils/date.go:58.2,58.18 1 0
+github.com/muety/wakapi/utils/date.go:49.33,51.19 2 0
+github.com/muety/wakapi/utils/date.go:54.3,55.10 2 0
+github.com/muety/wakapi/utils/date.go:51.19,53.4 1 0
+github.com/muety/wakapi/utils/date.go:61.50,67.2 5 0
+github.com/muety/wakapi/utils/date.go:70.79,73.36 3 0
+github.com/muety/wakapi/utils/date.go:77.2,77.21 1 0
+github.com/muety/wakapi/utils/date.go:81.2,81.21 1 0
+github.com/muety/wakapi/utils/date.go:85.2,85.13 1 0
+github.com/muety/wakapi/utils/date.go:73.36,76.3 2 0
+github.com/muety/wakapi/utils/date.go:77.21,80.3 2 0
+github.com/muety/wakapi/utils/date.go:81.21,84.3 2 0
+github.com/muety/wakapi/utils/http.go:9.73,12.58 3 0
+github.com/muety/wakapi/utils/http.go:12.58,14.3 1 0
+github.com/muety/wakapi/utils/summary.go:10.66,11.40 1 0
+github.com/muety/wakapi/utils/summary.go:16.2,16.48 1 0
+github.com/muety/wakapi/utils/summary.go:11.40,12.27 1 0
+github.com/muety/wakapi/utils/summary.go:12.27,14.4 1 0
+github.com/muety/wakapi/utils/summary.go:19.67,22.2 2 0
+github.com/muety/wakapi/utils/summary.go:24.74,26.16 2 0
+github.com/muety/wakapi/utils/summary.go:29.2,29.32 1 0
+github.com/muety/wakapi/utils/summary.go:26.16,28.3 1 0
+github.com/muety/wakapi/utils/summary.go:32.84,35.18 2 0
+github.com/muety/wakapi/utils/summary.go:70.2,70.22 1 0
+github.com/muety/wakapi/utils/summary.go:36.28,37.24 1 0
+github.com/muety/wakapi/utils/summary.go:38.32,40.22 2 0
+github.com/muety/wakapi/utils/summary.go:41.31,42.23 1 0
+github.com/muety/wakapi/utils/summary.go:43.31,45.21 2 0
+github.com/muety/wakapi/utils/summary.go:46.32,47.24 1 0
+github.com/muety/wakapi/utils/summary.go:48.32,50.22 2 0
+github.com/muety/wakapi/utils/summary.go:51.31,52.23 1 0
+github.com/muety/wakapi/utils/summary.go:53.32,54.42 1 0
+github.com/muety/wakapi/utils/summary.go:55.41,57.40 2 0
+github.com/muety/wakapi/utils/summary.go:58.33,59.43 1 0
+github.com/muety/wakapi/utils/summary.go:60.33,61.43 1 0
+github.com/muety/wakapi/utils/summary.go:62.35,63.43 1 0
+github.com/muety/wakapi/utils/summary.go:64.26,65.21 1 0
+github.com/muety/wakapi/utils/summary.go:66.10,67.39 1 0
+github.com/muety/wakapi/utils/summary.go:73.73,80.56 5 0
+github.com/muety/wakapi/utils/summary.go:102.2,109.8 2 0
+github.com/muety/wakapi/utils/summary.go:80.56,82.3 1 0
+github.com/muety/wakapi/utils/summary.go:82.8,82.54 1 0
+github.com/muety/wakapi/utils/summary.go:82.54,84.3 1 0
+github.com/muety/wakapi/utils/summary.go:84.8,86.17 2 0
+github.com/muety/wakapi/utils/summary.go:93.3,94.17 2 0
+github.com/muety/wakapi/utils/summary.go:86.17,88.18 2 0
+github.com/muety/wakapi/utils/summary.go:88.18,90.5 1 0
+github.com/muety/wakapi/utils/summary.go:94.17,96.18 2 0
+github.com/muety/wakapi/utils/summary.go:96.18,98.5 1 0
+github.com/muety/wakapi/utils/summary.go:112.48,116.51 2 0
+github.com/muety/wakapi/utils/summary.go:119.2,119.12 1 0
+github.com/muety/wakapi/utils/summary.go:116.51,118.3 1 0
+github.com/muety/wakapi/utils/template.go:8.41,10.16 2 0
+github.com/muety/wakapi/utils/template.go:13.2,13.23 1 0
+github.com/muety/wakapi/utils/template.go:10.16,12.3 1 0
+github.com/muety/wakapi/utils/template.go:16.37,17.30 1 0
+github.com/muety/wakapi/utils/template.go:20.2,20.10 1 0
+github.com/muety/wakapi/utils/template.go:17.30,19.3 1 0
 github.com/muety/wakapi/utils/auth.go:16.79,18.54 2 0
 github.com/muety/wakapi/utils/auth.go:22.2,24.16 3 0
 github.com/muety/wakapi/utils/auth.go:28.2,30.45 3 0
@ -200,9 +328,9 @@ github.com/muety/wakapi/utils/auth.go:33.2,34.32 2 0
 github.com/muety/wakapi/utils/auth.go:18.54,20.3 1 0
 github.com/muety/wakapi/utils/auth.go:24.16,26.3 1 0
 github.com/muety/wakapi/utils/auth.go:30.45,32.3 1 0
-github.com/muety/wakapi/utils/auth.go:37.65,39.54 2 0
+github.com/muety/wakapi/utils/auth.go:37.65,39.85 2 0
 github.com/muety/wakapi/utils/auth.go:43.2,44.30 2 0
-github.com/muety/wakapi/utils/auth.go:39.54,41.3 1 0
+github.com/muety/wakapi/utils/auth.go:39.85,41.3 1 0
 github.com/muety/wakapi/utils/auth.go:47.94,49.16 2 0
 github.com/muety/wakapi/utils/auth.go:53.2,53.107 1 0
 github.com/muety/wakapi/utils/auth.go:57.2,57.22 1 0
@ -212,46 +340,10 @@ github.com/muety/wakapi/utils/auth.go:60.56,64.2 3 0
 github.com/muety/wakapi/utils/auth.go:66.55,69.16 3 0
 github.com/muety/wakapi/utils/auth.go:72.2,72.16 1 0
 github.com/muety/wakapi/utils/auth.go:69.16,71.3 1 0
-github.com/muety/wakapi/utils/date.go:8.31,10.2 1 0
-github.com/muety/wakapi/utils/date.go:12.43,14.2 1 0
-github.com/muety/wakapi/utils/date.go:16.30,20.2 3 0
-github.com/muety/wakapi/utils/date.go:22.31,25.2 2 0
-github.com/muety/wakapi/utils/date.go:27.30,30.2 2 0
-github.com/muety/wakapi/utils/date.go:32.67,35.33 2 0
-github.com/muety/wakapi/utils/date.go:44.2,44.18 1 0
-github.com/muety/wakapi/utils/date.go:35.33,37.19 2 0
-github.com/muety/wakapi/utils/date.go:40.3,41.10 2 0
-github.com/muety/wakapi/utils/date.go:37.19,39.4 1 0
-github.com/muety/wakapi/utils/date.go:47.50,53.2 5 0
-github.com/muety/wakapi/utils/date.go:56.79,59.36 3 0
-github.com/muety/wakapi/utils/date.go:63.2,63.21 1 0
-github.com/muety/wakapi/utils/date.go:67.2,67.21 1 0
-github.com/muety/wakapi/utils/date.go:71.2,71.13 1 0
-github.com/muety/wakapi/utils/date.go:59.36,62.3 2 0
-github.com/muety/wakapi/utils/date.go:63.21,66.3 2 0
-github.com/muety/wakapi/utils/date.go:67.21,70.3 2 0
-github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0
-github.com/muety/wakapi/utils/strings.go:12.77,13.29 1 0
-github.com/muety/wakapi/utils/strings.go:18.2,18.19 1 0
-github.com/muety/wakapi/utils/strings.go:13.29,14.18 1 0
-github.com/muety/wakapi/utils/strings.go:14.18,16.4 1 0
-github.com/muety/wakapi/utils/template.go:8.41,10.16 2 0
-github.com/muety/wakapi/utils/template.go:13.2,13.23 1 0
-github.com/muety/wakapi/utils/template.go:10.16,12.3 1 0
-github.com/muety/wakapi/utils/template.go:16.37,17.30 1 0
-github.com/muety/wakapi/utils/template.go:20.2,20.10 1 0
-github.com/muety/wakapi/utils/template.go:17.30,19.3 1 0
 github.com/muety/wakapi/utils/color.go:8.90,10.32 2 0
 github.com/muety/wakapi/utils/color.go:15.2,15.15 1 0
 github.com/muety/wakapi/utils/color.go:10.32,11.50 1 0
 github.com/muety/wakapi/utils/color.go:11.50,13.4 1 0
-github.com/muety/wakapi/utils/common.go:9.48,11.2 1 0
-github.com/muety/wakapi/utils/common.go:13.40,15.2 1 0
-github.com/muety/wakapi/utils/common.go:17.45,19.2 1 0
-github.com/muety/wakapi/utils/common.go:21.24,23.2 1 0
-github.com/muety/wakapi/utils/common.go:25.56,28.45 3 1
-github.com/muety/wakapi/utils/common.go:31.2,31.40 1 1
-github.com/muety/wakapi/utils/common.go:28.45,30.3 1 1
 github.com/muety/wakapi/utils/filesystem.go:14.68,16.16 2 0
 github.com/muety/wakapi/utils/filesystem.go:20.2,21.15 2 0
 github.com/muety/wakapi/utils/filesystem.go:33.2,33.15 1 0
@ -260,108 +352,37 @@ github.com/muety/wakapi/utils/filesystem.go:21.15,23.47 2 0
 github.com/muety/wakapi/utils/filesystem.go:23.47,25.23 2 0
 github.com/muety/wakapi/utils/filesystem.go:29.4,29.19 1 0
 github.com/muety/wakapi/utils/filesystem.go:25.23,27.5 1 0
-github.com/muety/wakapi/utils/http.go:9.73,12.58 3 0
-github.com/muety/wakapi/utils/http.go:12.58,14.3 1 0
-github.com/muety/wakapi/utils/summary.go:10.66,11.40 1 0
-github.com/muety/wakapi/utils/summary.go:16.2,16.48 1 0
-github.com/muety/wakapi/utils/summary.go:11.40,12.27 1 0
-github.com/muety/wakapi/utils/summary.go:12.27,14.4 1 0
-github.com/muety/wakapi/utils/summary.go:19.74,21.16 2 0
-github.com/muety/wakapi/utils/summary.go:24.2,24.32 1 0
-github.com/muety/wakapi/utils/summary.go:21.16,23.3 1 0
-github.com/muety/wakapi/utils/summary.go:27.84,30.18 2 0
-github.com/muety/wakapi/utils/summary.go:65.2,65.22 1 0
-github.com/muety/wakapi/utils/summary.go:31.28,32.24 1 0
-github.com/muety/wakapi/utils/summary.go:33.32,35.22 2 0
-github.com/muety/wakapi/utils/summary.go:36.31,37.23 1 0
-github.com/muety/wakapi/utils/summary.go:38.31,40.21 2 0
-github.com/muety/wakapi/utils/summary.go:41.32,42.24 1 0
-github.com/muety/wakapi/utils/summary.go:43.32,45.22 2 0
-github.com/muety/wakapi/utils/summary.go:46.31,47.23 1 0
-github.com/muety/wakapi/utils/summary.go:48.32,49.42 1 0
-github.com/muety/wakapi/utils/summary.go:50.41,52.40 2 0
-github.com/muety/wakapi/utils/summary.go:53.33,54.43 1 0
-github.com/muety/wakapi/utils/summary.go:55.33,56.43 1 0
-github.com/muety/wakapi/utils/summary.go:57.35,58.43 1 0
-github.com/muety/wakapi/utils/summary.go:59.26,60.21 1 0
-github.com/muety/wakapi/utils/summary.go:61.10,62.39 1 0
-github.com/muety/wakapi/utils/summary.go:68.73,75.56 5 0
-github.com/muety/wakapi/utils/summary.go:89.2,96.8 2 0
-github.com/muety/wakapi/utils/summary.go:75.56,77.3 1 0
-github.com/muety/wakapi/utils/summary.go:77.8,79.17 2 0
-github.com/muety/wakapi/utils/summary.go:83.3,84.17 2 0
-github.com/muety/wakapi/utils/summary.go:79.17,81.4 1 0
-github.com/muety/wakapi/utils/summary.go:84.17,86.4 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:20.91,26.2 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:28.90,31.2 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:33.71,34.71 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:34.71,36.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:39.107,43.16 3 0
-github.com/muety/wakapi/middlewares/authenticate.go:47.2,47.31 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:62.2,63.29 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:43.16,45.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:47.31,48.31 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:53.3,53.44 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:59.3,59.9 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:48.31,51.4 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:53.44,55.4 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:55.9,58.4 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:66.70,67.39 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:72.2,72.14 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:67.39,68.60 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:68.60,70.4 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:75.92,77.16 2 1
-github.com/muety/wakapi/middlewares/authenticate.go:81.2,84.16 4 1
-github.com/muety/wakapi/middlewares/authenticate.go:87.2,87.18 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:77.16,79.3 1 1
-github.com/muety/wakapi/middlewares/authenticate.go:84.16,86.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:90.92,92.16 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:96.2,97.16 2 0
-github.com/muety/wakapi/middlewares/authenticate.go:104.2,104.18 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:92.16,94.3 1 0
-github.com/muety/wakapi/middlewares/authenticate.go:97.16,99.3 1 0
-github.com/muety/wakapi/middlewares/filetype.go:13.83,14.43 1 0
-github.com/muety/wakapi/middlewares/filetype.go:14.43,19.3 1 0
-github.com/muety/wakapi/middlewares/filetype.go:22.84,24.34 2 0
-github.com/muety/wakapi/middlewares/filetype.go:31.2,31.27 1 0
-github.com/muety/wakapi/middlewares/filetype.go:24.34,25.50 1 0
-github.com/muety/wakapi/middlewares/filetype.go:25.50,29.4 3 0
-github.com/muety/wakapi/middlewares/logging.go:17.79,18.43 1 0
-github.com/muety/wakapi/middlewares/logging.go:18.43,23.3 1 0
-github.com/muety/wakapi/middlewares/logging.go:26.80,44.2 6 0
-github.com/muety/wakapi/middlewares/logging.go:46.41,48.14 2 0
-github.com/muety/wakapi/middlewares/logging.go:51.2,51.14 1 0
-github.com/muety/wakapi/middlewares/logging.go:54.2,54.11 1 0
-github.com/muety/wakapi/middlewares/logging.go:48.14,50.3 1 0
-github.com/muety/wakapi/middlewares/logging.go:51.14,53.3 1 0
-github.com/muety/wakapi/middlewares/logging.go:85.52,87.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:99.45,100.20 1 0
-github.com/muety/wakapi/middlewares/logging.go:100.20,104.3 3 0
-github.com/muety/wakapi/middlewares/logging.go:106.54,109.18 3 0
-github.com/muety/wakapi/middlewares/logging.go:116.2,117.15 2 0
-github.com/muety/wakapi/middlewares/logging.go:109.18,112.17 2 0
-github.com/muety/wakapi/middlewares/logging.go:112.17,114.4 1 0
-github.com/muety/wakapi/middlewares/logging.go:119.42,120.20 1 0
-github.com/muety/wakapi/middlewares/logging.go:120.20,122.3 1 0
-github.com/muety/wakapi/middlewares/logging.go:124.36,126.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:127.42,129.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:130.40,132.2 1 0
-github.com/muety/wakapi/middlewares/logging.go:133.52,135.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:17.141,23.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:25.72,27.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:29.80,31.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:33.76,35.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:37.111,39.16 2 0
-github.com/muety/wakapi/services/heartbeat.go:42.2,42.43 1 0
-github.com/muety/wakapi/services/heartbeat.go:39.16,41.3 1 0
-github.com/muety/wakapi/services/heartbeat.go:45.116,47.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:49.78,51.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:53.62,55.2 1 0
-github.com/muety/wakapi/services/heartbeat.go:57.116,59.16 2 0
-github.com/muety/wakapi/services/heartbeat.go:63.2,63.28 1 0
-github.com/muety/wakapi/services/heartbeat.go:67.2,67.24 1 0
-github.com/muety/wakapi/services/heartbeat.go:59.16,61.3 1 0
-github.com/muety/wakapi/services/heartbeat.go:63.28,65.3 1 0
+github.com/muety/wakapi/utils/strings.go:8.34,10.2 1 0
+github.com/muety/wakapi/utils/strings.go:12.77,13.29 1 0
+github.com/muety/wakapi/utils/strings.go:18.2,18.19 1 0
+github.com/muety/wakapi/utils/strings.go:13.29,14.18 1 0
+github.com/muety/wakapi/utils/strings.go:14.18,16.4 1 0
+github.com/muety/wakapi/services/key_value.go:14.89,19.2 1 0
+github.com/muety/wakapi/services/key_value.go:21.83,23.2 1 0
+github.com/muety/wakapi/services/key_value.go:25.78,27.16 2 0
+github.com/muety/wakapi/services/key_value.go:33.2,33.11 1 0
+github.com/muety/wakapi/services/key_value.go:27.16,32.3 1 0
+github.com/muety/wakapi/services/key_value.go:36.72,38.2 1 0
+github.com/muety/wakapi/services/key_value.go:40.60,42.2 1 0
+github.com/muety/wakapi/services/language_mapping.go:18.118,24.2 1 0
+github.com/muety/wakapi/services/language_mapping.go:26.86,28.2 1 0
+github.com/muety/wakapi/services/language_mapping.go:30.96,31.53 1 0
+github.com/muety/wakapi/services/language_mapping.go:35.2,36.16 2 0
+github.com/muety/wakapi/services/language_mapping.go:39.2,40.22 2 0
+github.com/muety/wakapi/services/language_mapping.go:31.53,33.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:36.16,38.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:43.92,46.16 3 0
+github.com/muety/wakapi/services/language_mapping.go:50.2,50.33 1 0
+github.com/muety/wakapi/services/language_mapping.go:53.2,53.22 1 0
+github.com/muety/wakapi/services/language_mapping.go:46.16,48.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:50.33,52.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:56.109,58.16 2 0
+github.com/muety/wakapi/services/language_mapping.go:62.2,63.20 2 0
+github.com/muety/wakapi/services/language_mapping.go:58.16,60.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:66.82,67.26 1 0
+github.com/muety/wakapi/services/language_mapping.go:70.2,72.12 3 0
+github.com/muety/wakapi/services/language_mapping.go:67.26,69.3 1 0
+github.com/muety/wakapi/services/language_mapping.go:75.74,78.2 1 0
 github.com/muety/wakapi/services/misc.go:23.126,30.2 1 0
 github.com/muety/wakapi/services/misc.go:42.50,44.48 1 0
 github.com/muety/wakapi/services/misc.go:48.2,50.19 3 0
@ -374,9 +395,9 @@ github.com/muety/wakapi/services/misc.go:66.56,67.27 1 0
 github.com/muety/wakapi/services/misc.go:67.27,72.4 1 0
 github.com/muety/wakapi/services/misc.go:73.8,75.3 1 0
 github.com/muety/wakapi/services/misc.go:80.116,81.24 1 0
-github.com/muety/wakapi/services/misc.go:81.24,82.144 1 0
+github.com/muety/wakapi/services/misc.go:81.24,82.151 1 0
 github.com/muety/wakapi/services/misc.go:91.3,91.48 1 0
-github.com/muety/wakapi/services/misc.go:82.144,84.4 1 0
+github.com/muety/wakapi/services/misc.go:82.151,84.4 1 0
 github.com/muety/wakapi/services/misc.go:84.9,90.4 2 0
 github.com/muety/wakapi/services/misc.go:91.48,94.4 2 0
 github.com/muety/wakapi/services/misc.go:98.86,101.30 3 0
@ -396,60 +417,25 @@ github.com/muety/wakapi/services/user.go:46.2,47.16 2 0
 github.com/muety/wakapi/services/user.go:51.2,52.15 2 0
 github.com/muety/wakapi/services/user.go:42.37,44.3 1 0
 github.com/muety/wakapi/services/user.go:47.16,49.3 1 0
-github.com/muety/wakapi/services/user.go:55.58,57.2 1 0
-github.com/muety/wakapi/services/user.go:59.88,66.93 2 0
-github.com/muety/wakapi/services/user.go:72.2,72.38 1 0
-github.com/muety/wakapi/services/user.go:66.93,68.3 1 0
-github.com/muety/wakapi/services/user.go:68.8,70.3 1 0
-github.com/muety/wakapi/services/user.go:75.73,78.2 2 0
-github.com/muety/wakapi/services/user.go:80.78,84.2 3 0
-github.com/muety/wakapi/services/user.go:86.99,89.2 2 0
-github.com/muety/wakapi/services/user.go:91.106,94.96 3 0
-github.com/muety/wakapi/services/user.go:99.2,99.68 1 0
-github.com/muety/wakapi/services/user.go:94.96,96.3 1 0
-github.com/muety/wakapi/services/user.go:96.8,98.3 1 0
-github.com/muety/wakapi/services/user.go:102.57,105.2 2 0
-github.com/muety/wakapi/services/user.go:107.38,109.2 1 0
-github.com/muety/wakapi/services/aggregation.go:24.142,31.2 1 0
-github.com/muety/wakapi/services/aggregation.go:40.43,42.37 1 0
-github.com/muety/wakapi/services/aggregation.go:46.2,48.19 3 0
-github.com/muety/wakapi/services/aggregation.go:42.37,44.3 1 0
-github.com/muety/wakapi/services/aggregation.go:51.67,55.40 3 0
-github.com/muety/wakapi/services/aggregation.go:59.2,59.50 1 0
-github.com/muety/wakapi/services/aggregation.go:64.2,64.60 1 0
-github.com/muety/wakapi/services/aggregation.go:70.2,70.35 1 0
-github.com/muety/wakapi/services/aggregation.go:55.40,57.3 1 0
-github.com/muety/wakapi/services/aggregation.go:59.50,61.3 1 0
-github.com/muety/wakapi/services/aggregation.go:64.60,68.3 3 0
-github.com/muety/wakapi/services/aggregation.go:73.109,74.24 1 0
-github.com/muety/wakapi/services/aggregation.go:74.24,75.111 1 0
-github.com/muety/wakapi/services/aggregation.go:75.111,77.4 1 0
-github.com/muety/wakapi/services/aggregation.go:77.9,80.4 2 0
-github.com/muety/wakapi/services/aggregation.go:84.80,85.33 1 0
-github.com/muety/wakapi/services/aggregation.go:85.33,86.60 1 0
-github.com/muety/wakapi/services/aggregation.go:86.60,88.4 1 0
-github.com/muety/wakapi/services/aggregation.go:92.100,96.59 3 0
-github.com/muety/wakapi/services/aggregation.go:111.2,112.16 2 0
-github.com/muety/wakapi/services/aggregation.go:118.2,119.16 2 0
-github.com/muety/wakapi/services/aggregation.go:125.2,126.44 2 0
-github.com/muety/wakapi/services/aggregation.go:131.2,131.41 1 0
-github.com/muety/wakapi/services/aggregation.go:145.2,145.12 1 0
-github.com/muety/wakapi/services/aggregation.go:96.59,99.3 2 0
-github.com/muety/wakapi/services/aggregation.go:99.8,99.47 1 0
-github.com/muety/wakapi/services/aggregation.go:99.47,101.30 2 0
-github.com/muety/wakapi/services/aggregation.go:101.30,102.43 1 0
-github.com/muety/wakapi/services/aggregation.go:102.43,104.5 1 0
-github.com/muety/wakapi/services/aggregation.go:106.8,108.3 1 0
-github.com/muety/wakapi/services/aggregation.go:112.16,115.3 2 0
-github.com/muety/wakapi/services/aggregation.go:119.16,122.3 2 0
-github.com/muety/wakapi/services/aggregation.go:126.44,128.3 1 0
-github.com/muety/wakapi/services/aggregation.go:131.41,132.21 1 0
-github.com/muety/wakapi/services/aggregation.go:132.21,136.4 1 0
-github.com/muety/wakapi/services/aggregation.go:136.9,136.62 1 0
-github.com/muety/wakapi/services/aggregation.go:136.62,140.4 1 0
-github.com/muety/wakapi/services/aggregation.go:148.83,163.41 5 0
-github.com/muety/wakapi/services/aggregation.go:163.41,173.3 3 0
-github.com/muety/wakapi/services/aggregation.go:176.34,179.2 2 0
+github.com/muety/wakapi/services/user.go:55.76,57.2 1 0
+github.com/muety/wakapi/services/user.go:59.86,61.2 1 0
+github.com/muety/wakapi/services/user.go:63.58,65.2 1 0
+github.com/muety/wakapi/services/user.go:67.61,70.2 2 0
+github.com/muety/wakapi/services/user.go:72.48,74.2 1 0
+github.com/muety/wakapi/services/user.go:76.102,85.93 2 0
+github.com/muety/wakapi/services/user.go:91.2,91.38 1 0
+github.com/muety/wakapi/services/user.go:85.93,87.3 1 0
+github.com/muety/wakapi/services/user.go:87.8,89.3 1 0
+github.com/muety/wakapi/services/user.go:94.73,97.2 2 0
+github.com/muety/wakapi/services/user.go:99.78,103.2 3 0
+github.com/muety/wakapi/services/user.go:105.99,108.2 2 0
+github.com/muety/wakapi/services/user.go:110.106,113.96 3 0
+github.com/muety/wakapi/services/user.go:118.2,118.68 1 0
+github.com/muety/wakapi/services/user.go:113.96,115.3 1 0
+github.com/muety/wakapi/services/user.go:115.8,117.3 1 0
+github.com/muety/wakapi/services/user.go:121.85,123.2 1 0
+github.com/muety/wakapi/services/user.go:125.57,128.2 2 0
+github.com/muety/wakapi/services/user.go:130.38,132.2 1 0
 github.com/muety/wakapi/services/alias.go:17.77,22.2 1 1
 github.com/muety/wakapi/services/alias.go:26.60,27.43 1 1
 github.com/muety/wakapi/services/alias.go:30.2,30.14 1 1
@ -485,39 +471,33 @@ github.com/muety/wakapi/services/alias.go:95.21,97.4 1 0
 github.com/muety/wakapi/services/alias.go:104.31,106.3 1 0
 github.com/muety/wakapi/services/alias.go:111.52,112.51 1 0
 github.com/muety/wakapi/services/alias.go:112.51,114.3 1 0
-github.com/muety/wakapi/services/key_value.go:14.89,19.2 1 0
-github.com/muety/wakapi/services/key_value.go:21.83,23.2 1 0
-github.com/muety/wakapi/services/key_value.go:25.78,27.16 2 0
-github.com/muety/wakapi/services/key_value.go:33.2,33.11 1 0
-github.com/muety/wakapi/services/key_value.go:27.16,32.3 1 0
-github.com/muety/wakapi/services/key_value.go:36.72,38.2 1 0
-github.com/muety/wakapi/services/key_value.go:40.60,42.2 1 0
-github.com/muety/wakapi/services/language_mapping.go:18.118,24.2 1 0
-github.com/muety/wakapi/services/language_mapping.go:26.86,28.2 1 0
-github.com/muety/wakapi/services/language_mapping.go:30.96,31.53 1 0
-github.com/muety/wakapi/services/language_mapping.go:35.2,36.16 2 0
-github.com/muety/wakapi/services/language_mapping.go:39.2,40.22 2 0
-github.com/muety/wakapi/services/language_mapping.go:31.53,33.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:36.16,38.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:43.92,46.16 3 0
-github.com/muety/wakapi/services/language_mapping.go:50.2,50.33 1 0
-github.com/muety/wakapi/services/language_mapping.go:53.2,53.22 1 0
-github.com/muety/wakapi/services/language_mapping.go:46.16,48.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:50.33,52.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:56.109,58.16 2 0
-github.com/muety/wakapi/services/language_mapping.go:62.2,63.20 2 0
-github.com/muety/wakapi/services/language_mapping.go:58.16,60.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:66.82,67.26 1 0
-github.com/muety/wakapi/services/language_mapping.go:70.2,72.12 3 0
-github.com/muety/wakapi/services/language_mapping.go:67.26,69.3 1 0
-github.com/muety/wakapi/services/language_mapping.go:75.74,78.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:17.141,23.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:25.72,27.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:29.80,34.32 3 0
+github.com/muety/wakapi/services/heartbeat.go:41.2,41.55 1 0
+github.com/muety/wakapi/services/heartbeat.go:34.32,35.36 1 0
+github.com/muety/wakapi/services/heartbeat.go:35.36,38.4 2 0
+github.com/muety/wakapi/services/heartbeat.go:44.53,46.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:48.76,50.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:52.96,54.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:56.111,58.16 2 0
+github.com/muety/wakapi/services/heartbeat.go:61.2,61.43 1 0
+github.com/muety/wakapi/services/heartbeat.go:58.16,60.3 1 0
+github.com/muety/wakapi/services/heartbeat.go:64.116,66.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:68.78,70.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:72.62,74.2 1 0
+github.com/muety/wakapi/services/heartbeat.go:76.116,78.16 2 0
+github.com/muety/wakapi/services/heartbeat.go:82.2,82.28 1 0
+github.com/muety/wakapi/services/heartbeat.go:86.2,86.24 1 0
+github.com/muety/wakapi/services/heartbeat.go:78.16,80.3 1 0
+github.com/muety/wakapi/services/heartbeat.go:82.28,84.3 1 0
 github.com/muety/wakapi/services/summary.go:27.149,35.2 1 1
-github.com/muety/wakapi/services/summary.go:39.120,42.52 2 1
+github.com/muety/wakapi/services/summary.go:39.136,42.66 2 1
 github.com/muety/wakapi/services/summary.go:47.2,47.44 1 1
 github.com/muety/wakapi/services/summary.go:53.2,53.65 1 1
 github.com/muety/wakapi/services/summary.go:58.2,59.16 2 1
 github.com/muety/wakapi/services/summary.go:64.2,66.30 3 1
-github.com/muety/wakapi/services/summary.go:42.52,44.3 1 0
+github.com/muety/wakapi/services/summary.go:42.66,44.3 1 0
 github.com/muety/wakapi/services/summary.go:47.44,50.3 2 1
 github.com/muety/wakapi/services/summary.go:53.65,55.3 1 0
 github.com/muety/wakapi/services/summary.go:59.16,61.3 1 0
@ -588,15 +568,134 @@ github.com/muety/wakapi/services/summary.go:288.43,290.3 1 1
 github.com/muety/wakapi/services/summary.go:295.116,296.25 1 1
 github.com/muety/wakapi/services/summary.go:300.2,303.44 2 1
 github.com/muety/wakapi/services/summary.go:308.2,308.40 1 1
-github.com/muety/wakapi/services/summary.go:324.2,324.54 1 1
-github.com/muety/wakapi/services/summary.go:328.2,328.18 1 1
+github.com/muety/wakapi/services/summary.go:333.2,333.54 1 1
+github.com/muety/wakapi/services/summary.go:337.2,337.18 1 1
 github.com/muety/wakapi/services/summary.go:296.25,298.3 1 0
 github.com/muety/wakapi/services/summary.go:303.44,305.3 1 1
 github.com/muety/wakapi/services/summary.go:308.40,310.19 2 1
-github.com/muety/wakapi/services/summary.go:315.3,318.22 3 0
+github.com/muety/wakapi/services/summary.go:317.3,322.34 3 1
+github.com/muety/wakapi/services/summary.go:327.3,327.22 1 1
 github.com/muety/wakapi/services/summary.go:310.19,311.12 1 1
-github.com/muety/wakapi/services/summary.go:318.22,320.4 1 0
-github.com/muety/wakapi/services/summary.go:324.54,326.3 1 1
-github.com/muety/wakapi/services/summary.go:331.59,333.25 2 1
-github.com/muety/wakapi/services/summary.go:336.2,336.32 1 1
-github.com/muety/wakapi/services/summary.go:333.25,335.3 1 1
+github.com/muety/wakapi/services/summary.go:322.34,324.4 1 1
+github.com/muety/wakapi/services/summary.go:327.22,329.4 1 1
+github.com/muety/wakapi/services/summary.go:333.54,335.3 1 1
+github.com/muety/wakapi/services/summary.go:340.59,342.25 2 1
+github.com/muety/wakapi/services/summary.go:345.2,345.32 1 1
+github.com/muety/wakapi/services/summary.go:342.25,344.3 1 1
+github.com/muety/wakapi/services/aggregation.go:24.142,31.2 1 0
+github.com/muety/wakapi/services/aggregation.go:40.43,42.37 1 0
+github.com/muety/wakapi/services/aggregation.go:46.2,48.19 3 0
+github.com/muety/wakapi/services/aggregation.go:42.37,44.3 1 0
+github.com/muety/wakapi/services/aggregation.go:51.67,55.40 3 0
+github.com/muety/wakapi/services/aggregation.go:59.2,59.50 1 0
+github.com/muety/wakapi/services/aggregation.go:64.2,64.60 1 0
+github.com/muety/wakapi/services/aggregation.go:70.2,70.35 1 0
+github.com/muety/wakapi/services/aggregation.go:55.40,57.3 1 0
+github.com/muety/wakapi/services/aggregation.go:59.50,61.3 1 0
+github.com/muety/wakapi/services/aggregation.go:64.60,68.3 3 0
+github.com/muety/wakapi/services/aggregation.go:73.109,74.24 1 0
+github.com/muety/wakapi/services/aggregation.go:74.24,75.111 1 0
+github.com/muety/wakapi/services/aggregation.go:75.111,77.4 1 0
+github.com/muety/wakapi/services/aggregation.go:77.9,80.4 2 0
+github.com/muety/wakapi/services/aggregation.go:84.80,85.33 1 0
+github.com/muety/wakapi/services/aggregation.go:85.33,86.60 1 0
+github.com/muety/wakapi/services/aggregation.go:86.60,88.4 1 0
+github.com/muety/wakapi/services/aggregation.go:92.100,96.59 3 0
+github.com/muety/wakapi/services/aggregation.go:111.2,112.16 2 0
+github.com/muety/wakapi/services/aggregation.go:118.2,119.16 2 0
+github.com/muety/wakapi/services/aggregation.go:125.2,126.44 2 0
+github.com/muety/wakapi/services/aggregation.go:131.2,131.41 1 0
+github.com/muety/wakapi/services/aggregation.go:145.2,145.12 1 0
+github.com/muety/wakapi/services/aggregation.go:96.59,99.3 2 0
+github.com/muety/wakapi/services/aggregation.go:99.8,99.47 1 0
+github.com/muety/wakapi/services/aggregation.go:99.47,101.30 2 0
+github.com/muety/wakapi/services/aggregation.go:101.30,102.43 1 0
+github.com/muety/wakapi/services/aggregation.go:102.43,104.5 1 0
+github.com/muety/wakapi/services/aggregation.go:106.8,108.3 1 0
+github.com/muety/wakapi/services/aggregation.go:112.16,115.3 2 0
+github.com/muety/wakapi/services/aggregation.go:119.16,122.3 2 0
+github.com/muety/wakapi/services/aggregation.go:126.44,128.3 1 0
+github.com/muety/wakapi/services/aggregation.go:131.41,132.21 1 0
+github.com/muety/wakapi/services/aggregation.go:132.21,136.4 1 0
+github.com/muety/wakapi/services/aggregation.go:136.9,136.62 1 0
+github.com/muety/wakapi/services/aggregation.go:136.62,140.4 1 0
+github.com/muety/wakapi/services/aggregation.go:148.83,163.41 5 0
+github.com/muety/wakapi/services/aggregation.go:163.41,173.3 3 0
+github.com/muety/wakapi/services/aggregation.go:176.34,179.2 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:19.91,25.2 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:27.90,30.2 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:32.90,35.2 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:37.71,38.71 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:38.71,40.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:43.107,47.16 3 0
+github.com/muety/wakapi/middlewares/authenticate.go:51.2,51.31 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:67.2,68.12 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:47.16,49.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:51.31,52.31 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:57.3,57.29 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:64.3,64.9 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:52.31,55.4 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:57.29,60.4 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:60.9,63.4 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:71.70,72.39 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:77.2,77.14 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:72.39,73.60 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:73.60,75.4 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:80.92,82.16 2 1
+github.com/muety/wakapi/middlewares/authenticate.go:86.2,89.16 4 1
+github.com/muety/wakapi/middlewares/authenticate.go:92.2,92.18 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:82.16,84.3 1 1
+github.com/muety/wakapi/middlewares/authenticate.go:89.16,91.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:95.92,97.16 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:101.2,102.16 2 0
+github.com/muety/wakapi/middlewares/authenticate.go:109.2,109.18 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:97.16,99.3 1 0
+github.com/muety/wakapi/middlewares/authenticate.go:102.16,104.3 1 0
+github.com/muety/wakapi/middlewares/filetype.go:13.83,14.43 1 0
+github.com/muety/wakapi/middlewares/filetype.go:14.43,19.3 1 0
+github.com/muety/wakapi/middlewares/filetype.go:22.84,24.34 2 0
+github.com/muety/wakapi/middlewares/filetype.go:31.2,31.27 1 0
+github.com/muety/wakapi/middlewares/filetype.go:24.34,25.50 1 0
+github.com/muety/wakapi/middlewares/filetype.go:25.50,29.4 3 0
+github.com/muety/wakapi/middlewares/logging.go:20.102,21.43 1 0
+github.com/muety/wakapi/middlewares/logging.go:21.43,27.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:30.80,39.44 7 0
+github.com/muety/wakapi/middlewares/logging.go:45.2,54.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:39.44,40.38 1 0
+github.com/muety/wakapi/middlewares/logging.go:40.38,42.4 1 0
+github.com/muety/wakapi/middlewares/logging.go:57.41,59.14 2 0
+github.com/muety/wakapi/middlewares/logging.go:62.2,62.14 1 0
+github.com/muety/wakapi/middlewares/logging.go:65.2,65.11 1 0
+github.com/muety/wakapi/middlewares/logging.go:59.14,61.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:62.14,64.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:68.41,69.42 1 0
+github.com/muety/wakapi/middlewares/logging.go:72.2,72.12 1 0
+github.com/muety/wakapi/middlewares/logging.go:69.42,71.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:103.52,105.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:117.45,118.20 1 0
+github.com/muety/wakapi/middlewares/logging.go:118.20,122.3 3 0
+github.com/muety/wakapi/middlewares/logging.go:124.54,127.18 3 0
+github.com/muety/wakapi/middlewares/logging.go:134.2,135.15 2 0
+github.com/muety/wakapi/middlewares/logging.go:127.18,130.17 2 0
+github.com/muety/wakapi/middlewares/logging.go:130.17,132.4 1 0
+github.com/muety/wakapi/middlewares/logging.go:137.42,138.20 1 0
+github.com/muety/wakapi/middlewares/logging.go:138.20,140.3 1 0
+github.com/muety/wakapi/middlewares/logging.go:142.36,144.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:145.42,147.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:148.40,150.2 1 0
+github.com/muety/wakapi/middlewares/logging.go:151.52,153.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:15.62,17.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:19.58,21.2 1 0
+github.com/muety/wakapi/middlewares/principal.go:42.71,43.43 1 0
+github.com/muety/wakapi/middlewares/principal.go:43.43,45.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:48.81,51.2 2 0
+github.com/muety/wakapi/middlewares/principal.go:53.55,54.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:54.52,56.3 1 0
+github.com/muety/wakapi/middlewares/principal.go:59.49,60.52 1 0
+github.com/muety/wakapi/middlewares/principal.go:63.2,63.12 1 0
+github.com/muety/wakapi/middlewares/principal.go:60.52,62.3 1 0
+github.com/muety/wakapi/middlewares/sentry.go:14.60,15.43 1 0
+github.com/muety/wakapi/middlewares/sentry.go:15.43,19.3 1 0
+github.com/muety/wakapi/middlewares/sentry.go:22.78,25.54 3 0
+github.com/muety/wakapi/middlewares/sentry.go:25.54,26.43 1 0
+github.com/muety/wakapi/middlewares/sentry.go:26.43,28.4 1 0
--- a/data/colors.json
+++ b/data/colors.json
@ -210,6 +210,7 @@
    "Stan": "#b2011d",
    "Standard ML": "#dc566d",
    "SuperCollider": "#46390b",
+    "Svelte": "#ff3e00",
    "Swift": "#ffac45",
    "SystemVerilog": "#DAE1C2",
    "Tcl": "#e4cc98",
--- a/data/data.go
+++ b/data/data.go
@ -0,0 +1,6 @@
+package data
+
+import _ "embed"
+
+//go:embed colors.json
+var ColorsFile []byte
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -7,10 +7,11 @@ services:
      - 3000:3000
    restart: always
    environment:
+      # See README.md and config.default.yml for all config options
      WAKAPI_DB_TYPE: "postgres"
      WAKAPI_DB_NAME: "wakapi"
      WAKAPI_DB_USER: "wakapi"
-      WAKAPI_DB_PASSWORD: "CHANGE_ME!!!"
+      WAKAPI_DB_PASSWORD: "choose-a-password"
      WAKAPI_DB_HOST: "db"
      WAKAPI_DB_PORT: "5432"
      ENVIRONMENT: "prod"
@ -19,5 +20,5 @@ services:
    image: postgres:12.3
    environment:
      POSTGRES_USER: "wakapi"
-      POSTGRES_PASSWORD: "CHANGE_ME!!!"
+      POSTGRES_PASSWORD: "choose-a-password"
      POSTGRES_DB: "wakapi"
--- a/docs/advanced_setup.md
+++ b/docs/advanced_setup.md
@ -1,47 +0,0 @@
-# Advanced Setup
-This page contains instructions for additional setup options, none of which are mandatory.
-
-## Optional: Client-side proxy
-Most Wakatime plugins work in a way that, for every heartbeat to send, the plugin calls your local [wakatime-cli](https://github.com/wakatime/wakatime) (a small Python program that is automatically installed when installing a Wakatime plugin) with a few command-line arguments, which is then run as a new process. Inside that process, a heartbeat request is forged and sent to the backend API – Wakapi in this case.
-
-While this is convenient for plugin developers, as they do not have to deal with sending HTTP requests, etc., it comes with a minor drawback. Because the CLI process shuts down after each request, its TCP connection is closed as well. Accordingly, **TCP connections cannot be re-used** and every single heartbeat request is inevitably preceded by the `SYN` + `SYN ACK` + `ACK` sequence for establishing a new TCP connection as well as a handshake for establishing a new TLS session.
-
-While this certainly does not hurt, it is still a bit of overhead. You can avoid that by setting up a local reverse proxy on your machine, that keeps running as a daemon and can therefore keep a continuous connection.
-
-### Option 1: [tinyproxy](https://tinyproxy.github.io) forward proxy (`Linux`, `Mac` only)
-In this example we use _tinyproxy_ as a small, easy-to-install proxy server, written in C, that runs on your local machine.
-1. Install [tinyproxy](https://tinyproxy.github.io)
-   * Fedora / RHEL: `dnf install tinyproxy`
-   * Debian / Ubuntu: `apt install tinyproxy`
-   * MacOS: Install from [MacPorts](https://ports.macports.org/port/tinyproxy/summary)
-1. Enable and start it
-   * Linux: `sudo systemctl start tinyproxy && sudo systemctl enable tinyproxy`
-   * Mac: Not sure, sorry ¯\_(ツ)_/¯
-1. Update `~/.wakatime.cfg`
-   * Set `proxy = http://localhost:8888`
-1. Done
-   * All Wakapi requests are passed through tinyproxy now, which keeps a TCP connection with the server open for some time
-
-### Option 2: [Caddy](https://caddyserver.com) reverse proxy (`Win`, `Linux`, `Mac`)
-In this example, we misuse Caddy, which is a web server and reverse proxy, to fulfil the above scenario. 
-
-1. [Install Caddy](https://caddyserver.com/) 
-    * When installing manually, don't forget to set up a systemd service to start Caddy on system startup
-1. Create a Caddyfile
-    ```
-    # /etc/caddy/Caddyfile
-   
-    http://localhost:8070 {
-        reverse_proxy * {
-            to https://wakapi.dev  # <-- substitute your own Wakapi host here
-            header_up Host {http.reverse_proxy.upstream.host}
-            header_down -Server
-        }
-    }
-    ```
-1. Restart Caddy
-1. Verify that you can access [`http://localhost:8070/api/health`](http://localhost:8070/api/health)
-1. Update `~/.wakatime.cfg`
-    * Set `api_url = http://localhost:8070/api/heartbeat`
-1. Done
-   * All Wakapi requests are passed through Caddy now, which keeps a TCP connection with the server open for some time
--- a/go.mod
+++ b/go.mod
@ -1,10 +1,13 @@
 module github.com/muety/wakapi

-go 1.13
+go 1.16

 require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
+	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21
+	github.com/emersion/go-smtp v0.15.0
 	github.com/emvi/logbuch v1.1.1
+	github.com/getsentry/sentry-go v0.10.0
 	github.com/go-co-op/gocron v0.3.3
 	github.com/go-openapi/spec v0.20.2 // indirect
 	github.com/gorilla/handlers v1.4.2
@ -13,11 +16,9 @@ require (
 	github.com/gorilla/securecookie v1.1.1
 	github.com/jinzhu/configor v1.2.0
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/markbates/pkger v0.17.1
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.1
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc
 	github.com/satori/go.uuid v1.2.0
 	github.com/stretchr/testify v1.6.1
 	github.com/swaggo/swag v1.7.0
--- a/go.sum
+++ b/go.sum
@ -1,189 +1,113 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
+github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
+github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
+github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A=
-github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
-github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
+github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
+github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 h1:OJyUGMJTzHTd1XQp98QTaHernxMYzRaOasRir9hUlFQ=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
+github.com/emersion/go-smtp v0.15.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
 github.com/emvi/logbuch v1.1.1 h1:poBGNbHy/nB95oNoqLKAaJoBrcKxTO0W9DhMijKEkkU=
 github.com/emvi/logbuch v1.1.1/go.mod h1:J2Wgbr3BuSc1JO+D2MBVh6q3WPVSK5GzktwWz8pvkKw=
-github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
-github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
+github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
+github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
+github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
+github.com/getsentry/sentry-go v0.10.0 h1:6gwY+66NHKqyZrdi6O2jGdo7wGdo9b3B69E01NFgT5g=
+github.com/getsentry/sentry-go v0.10.0/go.mod h1:kELm/9iCblqUYh+ZRML7PNdCvEuw24wBvJPYyi86cws=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-co-op/gocron v0.3.3 h1:QnarcMZWWKrEP25uCbtDiLsnnGw+PhCjL3wNITdWJOs=
 github.com/go-co-op/gocron v0.3.3/go.mod h1:Y9PWlYqDChf2Nbgg7kfS+ZsXHDTZbMZYPEQ0MILqH+M=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/go-openapi/jsonpointer v0.19.3 h1:gihV7YNZK1iK6Tgwwsxo2rJbD1GTbdm72325Bq8FI3w=
+github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.4 h1:3Vw+rh13uq2JFNxgnMTGE1rnoieU9FmyE1gvnyylsYg=
 github.com/go-openapi/jsonreference v0.19.4/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
 github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM=
 github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
-github.com/go-openapi/spec v0.19.14 h1:r4fbYFo6N4ZelmSX8G6p+cv/hZRXzcuqQIADGT1iNKM=
 github.com/go-openapi/spec v0.19.14/go.mod h1:gwrgJS15eCUgjLpMjBJmbZezCsw88LmgeEip0M63doA=
 github.com/go-openapi/spec v0.20.2 h1:pFPUZsiIbZ20kLUcuCGeuQWG735fPMxW7wHF9BWlnQU=
 github.com/go-openapi/spec v0.20.2/go.mod h1:RW6Xcbs6LOyWLU/mXGdzn2Qc+3aj+ASfI7rvSZh1Vls=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.11 h1:RFTu/dlFySpyVvJDfp/7674JY4SDglYWKztbiIGFpmc=
 github.com/go-openapi/swag v0.19.11/go.mod h1:Uc0gKkdR+ojzsEpjh39QChyu92vPgIr72POcgHMAgSY=
 github.com/go-openapi/swag v0.19.13 h1:233UVgMy1DlmCYYfOiFpta6e2urloh+sEs5id6lyzog=
 github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-redis/redis v6.15.5+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8=
-github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
-github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
-github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
-github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg=
-github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
-github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
-github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
-github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
-github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
-github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg=
+github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
+github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
 github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
-github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
 github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
 github.com/gorilla/schema v1.1.0 h1:CamqUDOFUBqzrvxuz2vEwo8+SUdwsluFh7IlzJh30LY=
 github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE=
-github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
+github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
+github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
+github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
+github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
+github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
@ -242,189 +166,110 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
+github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
+github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
+github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
+github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
-github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
-github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e h1:hB2xlXdHp/pmPZq0y3QnmWAArdw9PqbmotexnWx/FU8=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno=
-github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-oci8 v0.0.7/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI=
-github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
+github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
+github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/hashstructure/v2 v2.0.1 h1:L60q1+q7cXE4JeEJJKMnh2brFIe3rZxCihYAB61ypAY=
 github.com/mitchellh/hashstructure/v2 v2.0.1/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
-github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
-github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
-github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
-github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
-github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
-github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
-github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac=
-github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
-github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
-github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.4.0 h1:LUa41nrWTQNGhzdsZ5lTnkwbNjj6rXTdazA1cSdjkOY=
-github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
-github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc h1:+2DdDcxVYlarHjYcZTt8dZ4Ec8cXZirzL5ko0mkKPjU=
-github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg=
-github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
-github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw=
-github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
@ -437,155 +282,108 @@ github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/swaggo/swag v1.7.0 h1:5bCA/MTLQoIqDXXyHfOpMeDvL9j68OY/udlK4pQoo4E=
 github.com/swaggo/swag v1.7.0/go.mod h1:BdPIL73gvS9NBsdi7M1JOxLvlbfvNRaBP8m6WT6Aajo=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
+github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
+github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
+github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
-github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
-go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 h1:003p0dJM77cxMSyCPFphvZf/Y5/NXf5fzg6ufd1/Oew=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 h1:myAQVi0cGEoqQVR5POX+8RR2mrocKqNN1hmeMqhX27k=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c h1:VwygUrnw9jn88c4u8GD3rZQbqrP/tgas88tPUbBxQrk=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200103221440-774c71fcf114 h1:DnSr2mCsxyCE6ZgIkmcWUQY2R5cH/6wL7eIxEmQOMSE=
-golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e h1:t96dS3DO8DGjawSLJL/HIdz8CycAd2v07XxqB3UPTi0=
 golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0 h1:po9/4sTYwZU9lPhi1tOrb4hCv3qrhiQ77LZfGa2OjwY=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
@ -593,55 +391,29 @@ golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
-gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw=
-gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
+gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
+gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
-gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
+gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@ -655,9 +427,4 @@ gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.20.11 h1:jYHQ0LLUViV85V8dM1TP9VBBkfzKTnuTXDjYObkI6yc=
 gorm.io/gorm v1.20.11/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
--- a/main.go
+++ b/main.go
@ -1,23 +1,25 @@
 package main

-//go:generate $GOPATH/bin/pkger
-
 import (
-	"github.com/emvi/logbuch"
-	"github.com/gorilla/handlers"
-	"github.com/markbates/pkger"
-	conf "github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/migrations"
-	"github.com/muety/wakapi/repositories"
-	"github.com/muety/wakapi/routes/api"
-	"github.com/muety/wakapi/utils"
-	"gorm.io/gorm/logger"
+	"embed"
+	sentryhttp "github.com/getsentry/sentry-go/http"
+	"io/fs"
 	"log"
 	"net/http"
 	"os"
 	"strconv"
 	"time"

+	"github.com/emvi/logbuch"
+	"github.com/gorilla/handlers"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/migrations"
+	"github.com/muety/wakapi/repositories"
+	"github.com/muety/wakapi/routes/api"
+	"github.com/muety/wakapi/services/mail"
+	"github.com/muety/wakapi/utils"
+	"gorm.io/gorm/logger"
+
 	"github.com/gorilla/mux"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/routes"
@ -30,6 +32,14 @@ import (
 	"gorm.io/gorm"
 )

+// Embed version.txt
+//go:embed version.txt
+var version string
+
+// Embed static files
+//go:embed static
+var staticFiles embed.FS
+
 var (
 	db     *gorm.DB
 	config *conf.Config
@ -51,6 +61,7 @@ var (
 	languageMappingService services.ILanguageMappingService
 	summaryService         services.ISummaryService
 	aggregationService     services.IAggregationService
+	mailService            services.IMailService
 	keyValueService        services.IKeyValueService
 	miscService            services.IMiscService
 )
@ -78,7 +89,7 @@ var (

 // @BasePath /api
 func main() {
-	config = conf.Load()
+	config = conf.Load(version)

 	// Set log level
 	if config.IsDev() {
@ -117,9 +128,7 @@ func main() {
 	defer sqlDb.Close()

 	// Migrate database schema
-	migrations.RunPreMigrations(db, config)
-	runDatabaseMigrations()
-	migrations.RunCustomPostMigrations(db, config)
+	migrations.Run(db, config)

 	// Repositories
 	aliasRepository = repositories.NewAliasRepository(db)
@ -136,6 +145,7 @@ func main() {
 	heartbeatService = services.NewHeartbeatService(heartbeatRepository, languageMappingService)
 	summaryService = services.NewSummaryService(summaryRepository, heartbeatService, aliasService)
 	aggregationService = services.NewAggregationService(userService, summaryService, heartbeatService)
+	mailService = mail.NewMailService()
 	keyValueService = services.NewKeyValueService(keyValueRepository)
 	miscService = services.NewMiscService(userService, summaryService, keyValueService)

@ -149,6 +159,7 @@ func main() {
 	healthApiHandler := api.NewHealthApiHandler(db)
 	heartbeatApiHandler := api.NewHeartbeatApiHandler(userService, heartbeatService, languageMappingService)
 	summaryApiHandler := api.NewSummaryApiHandler(userService, summaryService)
+	metricsHandler := api.NewMetricsHandler(userService, summaryService, heartbeatService, keyValueService)

 	// Compat Handlers
 	wakatimeV1AllHandler := wtV1Routes.NewAllTimeHandler(userService, summaryService)
@ -158,25 +169,24 @@ func main() {

 	// MVC Handlers
 	summaryHandler := routes.NewSummaryHandler(summaryService, userService)
-	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, keyValueService)
+	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, keyValueService, mailService)
 	homeHandler := routes.NewHomeHandler(keyValueService)
-	loginHandler := routes.NewLoginHandler(userService)
+	loginHandler := routes.NewLoginHandler(userService, mailService)
 	imprintHandler := routes.NewImprintHandler(keyValueService)

 	// Setup Routers
 	router := mux.NewRouter()
 	rootRouter := router.PathPrefix("/").Subrouter()
-	apiRouter := router.PathPrefix("/api").Subrouter()
+	apiRouter := router.PathPrefix("/api").Subrouter().StrictSlash(true)

 	// Globally used middlewares
-	recoveryMiddleware := handlers.RecoveryHandler()
-	loggingMiddleware := middlewares.NewLoggingMiddleware(
-		log.New(os.Stdout, "", log.LstdFlags),
-		[]string{"/assets"},
-	)
-
-	// Router configs
-	router.Use(loggingMiddleware, recoveryMiddleware)
+	router.Use(middlewares.NewPrincipalMiddleware())
+	router.Use(middlewares.NewLoggingMiddleware(logbuch.Info, []string{"/assets"}))
+	router.Use(handlers.RecoveryHandler())
+	if config.Sentry.Dsn != "" {
+		router.Use(sentryhttp.New(sentryhttp.Options{Repanic: true}).Handle)
+	}
+	rootRouter.Use(middlewares.NewSecurityMiddleware())

 	// Route registrations
 	homeHandler.RegisterRoutes(rootRouter)
@ -189,13 +199,18 @@ func main() {
 	summaryApiHandler.RegisterRoutes(apiRouter)
 	healthApiHandler.RegisterRoutes(apiRouter)
 	heartbeatApiHandler.RegisterRoutes(apiRouter)
+	metricsHandler.RegisterRoutes(apiRouter)
 	wakatimeV1AllHandler.RegisterRoutes(apiRouter)
 	wakatimeV1SummariesHandler.RegisterRoutes(apiRouter)
 	wakatimeV1StatsHandler.RegisterRoutes(apiRouter)
 	shieldV1BadgeHandler.RegisterRoutes(apiRouter)

 	// Static Routes
-	fileServer := http.FileServer(utils.NeuteredFileSystem{Fs: pkger.Dir("/static")})
+	// https://github.com/golang/go/issues/43431
+	embeddedStatic, _ := fs.Sub(staticFiles, "static")
+	static := conf.ChooseFS("static", embeddedStatic)
+	fileServer := http.FileServer(utils.NeuteredFileSystem{Fs: http.FS(static)})
+	router.PathPrefix("/contribute.json").Handler(fileServer)
 	router.PathPrefix("/assets").Handler(fileServer)
 	router.PathPrefix("/swagger-ui").Handler(fileServer)
 	router.PathPrefix("/docs").Handler(
@ -269,9 +284,3 @@ func listen(handler http.Handler) {

 	<-make(chan interface{}, 1)
 }
-
-func runDatabaseMigrations() {
-	if err := config.GetMigrationFunc(config.Db.Dialect)(db); err != nil {
-		logbuch.Fatal(err.Error())
-	}
-}
--- a/middlewares/authenticate.go
+++ b/middlewares/authenticate.go
@ -1,8 +1,6 @@
 package middlewares

 import (
-	"context"
-	"fmt"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/services"
@ -15,6 +13,7 @@ type AuthenticateMiddleware struct {
 	config           *conf.Config
 	userSrvc         services.IUserService
 	optionalForPaths []string
+	redirectTarget   string // optional
 }

 func NewAuthenticateMiddleware(userService services.IUserService) *AuthenticateMiddleware {
@ -30,6 +29,11 @@ func (m *AuthenticateMiddleware) WithOptionalFor(paths []string) *AuthenticateMi
 	return m
 }

+func (m *AuthenticateMiddleware) WithRedirectTarget(path string) *AuthenticateMiddleware {
+	m.redirectTarget = path
+	return m
+}
+
 func (m *AuthenticateMiddleware) Handler(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		m.ServeHTTP(w, r, h.ServeHTTP)
@ -50,17 +54,18 @@ func (m *AuthenticateMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			return
 		}

-		if strings.HasPrefix(r.URL.Path, "/api") {
+		if m.redirectTarget == "" {
 			w.WriteHeader(http.StatusUnauthorized)
+			w.Write([]byte(conf.ErrUnauthorized))
 		} else {
 			http.SetCookie(w, m.config.GetClearCookie(models.AuthCookieKey, "/"))
-			http.Redirect(w, r, fmt.Sprintf("%s/?error=unauthorized", m.config.Server.BasePath), http.StatusFound)
+			http.Redirect(w, r, m.redirectTarget, http.StatusFound)
 		}
 		return
 	}

-	ctx := context.WithValue(r.Context(), models.UserKey, user)
-	next(w, r.WithContext(ctx))
+	SetPrincipal(r, user)
+	next(w, r)
 }

 func (m *AuthenticateMiddleware) isOptional(requestPath string) bool {
--- a/middlewares/custom/wakatime.go
+++ b/middlewares/custom/wakatime.go
@ -6,7 +6,7 @@ import (
 	"fmt"
 	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/middlewares"
 	"io"
 	"io/ioutil"
 	"net/http"
@ -39,7 +39,7 @@ func (m *WakatimeRelayMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reque
 		return
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user == nil || user.WakatimeApiKey == "" {
 		return
 	}
--- a/middlewares/logging.go
+++ b/middlewares/logging.go
@ -4,23 +4,24 @@ package middlewares

 import (
 	"io"
-	"log"
 	"net/http"
 	"strings"
 	"time"
 )

+type logFunc func(string, ...interface{})
+
 type LoggingMiddleware struct {
 	handler         http.Handler
-	output          *log.Logger
+	logFunc         logFunc
 	excludePrefixes []string
 }

-func NewLoggingMiddleware(output *log.Logger, excludePrefixes []string) func(http.Handler) http.Handler {
+func NewLoggingMiddleware(logFunc logFunc, excludePrefixes []string) func(http.Handler) http.Handler {
 	return func(h http.Handler) http.Handler {
 		return &LoggingMiddleware{
 			handler:         h,
-			output:          output,
+			logFunc:         logFunc,
 			excludePrefixes: excludePrefixes,
 		}
 	}
@ -41,15 +42,15 @@ func (lg *LoggingMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}
 	}

-	lg.output.Printf(
-		"%v status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s\n",
-		time.Now().Format(time.RFC3339Nano),
+	lg.logFunc(
+		"[request] status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s, user=%s",
 		ww.Status(),
 		r.Method,
 		r.URL.String(),
 		duration,
 		ww.BytesWritten(),
 		readUserIP(r),
+		readUserID(r),
 	)
 }

@ -64,6 +65,13 @@ func readUserIP(r *http.Request) string {
 	return ip
 }

+func readUserID(r *http.Request) string {
+	if user := GetPrincipal(r); user != nil {
+		return user.ID
+	}
+	return "-"
+}
+
 // The below writer-wrapping code has been lifted from
 // https://github.com/zenazn/goji/blob/master/web/middleware/logger.go - because
 // it does exactly what is needed, and it's unlikely to change in any
--- a/middlewares/principal.go
+++ b/middlewares/principal.go
@ -0,0 +1,64 @@
+package middlewares
+
+import (
+	"context"
+	"github.com/muety/wakapi/models"
+	"net/http"
+)
+
+const keyPrincipal = "principal"
+
+type PrincipalContainer struct {
+	principal *models.User
+}
+
+func (c *PrincipalContainer) SetPrincipal(user *models.User) {
+	c.principal = user
+}
+
+func (c *PrincipalContainer) GetPrincipal() *models.User {
+	return c.principal
+}
+
+// This middleware is a bit of a dirty workaround to the fact that a http.Request's context
+// does not allow to pass values from an inner to an outer middleware. Calling WithContext() on a
+// request shallow-copies the whole request itself and therefore, in a chain of handler1(handler2()),
+// handler 1 will not have access to values handler 2 writes to its context. In addition, Context.WithValue
+// returns a new context with the old context as a parent.
+//
+// As a concrete example, SentryMiddleware as well as LoggingMiddleware should be quite the outer layers,
+// while AuthenticationMiddleware is on the very inside of the chain. However, we still want sentry or the
+// logger to have access to the user object populated by the auth. middleware, if present.
+//
+// This middleware shall be included as the outermost layers and it injects a stateful container that  does
+// nothing but conditionally hold a reference to an authenticated user object.
+//
+// Other reference: https://stackoverflow.com/questions/55972869/send-errors-to-sentry-with-golang-and-mux
+
+type PrincipalMiddleware struct {
+	handler http.Handler
+}
+
+func NewPrincipalMiddleware() func(handler http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return &PrincipalMiddleware{handler: h}
+	}
+}
+
+func (p *PrincipalMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctx := context.WithValue(r.Context(), keyPrincipal, &PrincipalContainer{})
+	p.handler.ServeHTTP(w, r.WithContext(ctx))
+}
+
+func SetPrincipal(r *http.Request, user *models.User) {
+	if p := r.Context().Value(keyPrincipal); p != nil {
+		p.(*PrincipalContainer).SetPrincipal(user)
+	}
+}
+
+func GetPrincipal(r *http.Request) *models.User {
+	if p := r.Context().Value(keyPrincipal); p != nil {
+		return p.(*PrincipalContainer).GetPrincipal()
+	}
+	return nil
+}
--- a/middlewares/security.go
+++ b/middlewares/security.go
@ -0,0 +1,32 @@
+package middlewares
+
+import (
+	"net/http"
+)
+
+var securityHeaders = map[string]string{
+	"Cross-Origin-Opener-Policy": "same-origin",
+	"Content-Security-Policy":    "default-src 'self' 'unsafe-inline'; img-src 'self' https: data:; form-action 'self'; block-all-mixed-content;",
+	"X-Frame-Options":            "DENY",
+	"X-Content-Type-Options":     "nosniff",
+}
+
+// SecurityMiddleware is a handler to add some basic security headers to responses
+type SecurityMiddleware struct {
+	handler http.Handler
+}
+
+func NewSecurityMiddleware() func(http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return &SecurityMiddleware{h}
+	}
+}
+
+func (f *SecurityMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	for k, v := range securityHeaders {
+		if w.Header().Get(k) == "" {
+			w.Header().Set(k, v)
+		}
+	}
+	f.handler.ServeHTTP(w, r)
+}
--- a/migrations/00000000_apply_fixtures.go
+++ b/migrations/00000000_apply_fixtures.go
@ -1,17 +0,0 @@
-package migrations
-
-import (
-	"github.com/muety/wakapi/config"
-	"gorm.io/gorm"
-)
-
-func init() {
-	f := migrationFunc{
-		name: "000-apply_fixtures",
-		f: func(db *gorm.DB, cfg *config.Config) error {
-			return cfg.GetFixturesFunc(cfg.Db.Dialect)(db)
-		},
-	}
-
-	registerPostMigration(f)
-}
--- a/migrations/20210206_drop_badges_column_add_sharing_flags.go
+++ b/migrations/20210206_drop_badges_column_add_sharing_flags.go
@ -14,7 +14,7 @@ func init() {
 			migrator := db.Migrator()

 			if !migrator.HasColumn(&models.User{}, "badges_enabled") {
-				// empty database, nothing to migrate
+				// empty database or already migrated, nothing to migrate
 				return nil
 			}

@ -37,11 +37,15 @@ func init() {
 				return err
 			}

+			if cfg.Db.Dialect == config.SQLDialectSqlite {
+				logbuch.Info("not attempting to drop column 'badges_enabled' on sqlite")
+				return nil
+			}
+
 			if err := migrator.DropColumn(&models.User{}, "badges_enabled"); err != nil {
 				return err
-			} else {
-				logbuch.Info("dropped column 'badges_enabled' after substituting it by sharing indicators")
 			}
+			logbuch.Info("dropped column 'badges_enabled' after substituting it by sharing indicators")

 			return nil
 		},
--- a/migrations/20210213_add_has_data_field.go
+++ b/migrations/20210213_add_has_data_field.go
@ -0,0 +1,41 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210213-add_has_data_field"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
+				return nil
+			}
+
+			if err := db.Exec("UPDATE users SET has_data = TRUE WHERE TRUE").Error; err != nil {
+				return err
+			}
+
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}
--- a/migrations/20210221_add_created_date_column.go
+++ b/migrations/20210221_add_created_date_column.go
@ -0,0 +1,41 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210221-add_created_date_column"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
+				return nil
+			}
+
+			if err := db.Exec("UPDATE heartbeats SET created_at = time WHERE TRUE").Error; err != nil {
+				return err
+			}
+
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}
--- a/migrations/20210411_add_imprint_content.go
+++ b/migrations/20210411_add_imprint_content.go
@ -0,0 +1,47 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
+)
+
+func init() {
+	const name = "20210411-add_imprint_content"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
+				return nil
+			}
+
+			imprintKv := &models.KeyStringValue{Key: "imprint", Value: "no content here"}
+			if err := db.
+				Clauses(clause.OnConflict{UpdateAll: false, DoNothing: true}).
+				Where(condition, imprintKv.Key).
+				Assign(imprintKv).
+				Create(imprintKv).Error; err != nil {
+				return err
+			}
+
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}
--- a/migrations/20210411_drop_migrations_table.go
+++ b/migrations/20210411_drop_migrations_table.go
@ -0,0 +1,22 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210411-drop_migrations_table"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if err := db.Migrator().DropTable("gorp_migrations"); err != nil {
+				logbuch.Info("dropped table 'gorp_migrations'")
+			}
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}
--- a/migrations/fixtures/1_imprint_content.sql
+++ b/migrations/fixtures/1_imprint_content.sql
@ -1,8 +0,0 @@
-- +migrate Up
-- SQL in section 'Up' is executed when this migration is applied
-insert into key_string_values ("key", "value") values ('imprint', 'no content here');
-
-- +migrate Down
-- SQL section 'Down' is executed when this migration is rolled back
-SET SQL_MODE=ANSI_QUOTES;
-delete from key_string_values where key = 'imprint';
--- a/migrations/migrations.go
+++ b/migrations/migrations.go
@ -28,9 +28,17 @@ func registerPostMigration(f migrationFunc) {
 	postMigrations = append(postMigrations, f)
 }

-// NOTE: Currently, migrations themselves keep track
-// of whether they have run, yet or not, because some
-// simply run on every start.
+func Run(db *gorm.DB, cfg *config.Config) {
+	RunPreMigrations(db, cfg)
+	RunSchemaMigrations(db, cfg)
+	RunPostMigrations(db, cfg)
+}
+
+func RunSchemaMigrations(db *gorm.DB, cfg *config.Config) {
+	if err := cfg.GetMigrationFunc(cfg.Db.Dialect)(db); err != nil {
+		logbuch.Fatal(err.Error())
+	}
+}

 func RunPreMigrations(db *gorm.DB, cfg *config.Config) {
 	sort.Sort(preMigrations)
@ -43,7 +51,7 @@ func RunPreMigrations(db *gorm.DB, cfg *config.Config) {
 	}
 }

-func RunCustomPostMigrations(db *gorm.DB, cfg *config.Config) {
+func RunPostMigrations(db *gorm.DB, cfg *config.Config) {
 	sort.Sort(postMigrations)

 	for _, m := range postMigrations {
--- a/mocks/heartbeat_service.go
+++ b/mocks/heartbeat_service.go
@ -20,11 +20,21 @@ func (m *HeartbeatServiceMock) InsertBatch(heartbeats []*models.Heartbeat) error
 	return args.Error(0)
 }

+func (m *HeartbeatServiceMock) Count() (int64, error) {
+	args := m.Called()
+	return int64(args.Int(0)), args.Error(1)
+}
+
 func (m *HeartbeatServiceMock) CountByUser(user *models.User) (int64, error) {
 	args := m.Called(user)
 	return args.Get(0).(int64), args.Error(0)
 }

+func (m *HeartbeatServiceMock) CountByUsers(users []*models.User) ([]*models.CountByUser, error) {
+	args := m.Called(users)
+	return args.Get(0).([]*models.CountByUser), args.Error(0)
+}
+
 func (m *HeartbeatServiceMock) GetAllWithin(time time.Time, time2 time.Time, user *models.User) ([]*models.Heartbeat, error) {
 	args := m.Called(time, time2, user)
 	return args.Get(0).([]*models.Heartbeat), args.Error(1)
--- a/mocks/user_service.go
+++ b/mocks/user_service.go
@ -19,13 +19,33 @@ func (m *UserServiceMock) GetUserByKey(s string) (*models.User, error) {
 	return args.Get(0).(*models.User), args.Error(1)
 }

+func (m *UserServiceMock) GetUserByEmail(s string) (*models.User, error) {
+	args := m.Called(s)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
+func (m *UserServiceMock) GetUserByResetToken(s string) (*models.User, error) {
+	args := m.Called(s)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
 func (m *UserServiceMock) GetAll() ([]*models.User, error) {
 	args := m.Called()
 	return args.Get(0).([]*models.User), args.Error(1)
 }

-func (m *UserServiceMock) CreateOrGet(signup *models.Signup) (*models.User, bool, error) {
-	args := m.Called(signup)
+func (m *UserServiceMock) GetActive() ([]*models.User, error) {
+	args := m.Called()
+	return args.Get(0).([]*models.User), args.Error(1)
+}
+
+func (m *UserServiceMock) Count() (int64, error) {
+	args := m.Called()
+	return int64(args.Int(0)), args.Error(1)
+}
+
+func (m *UserServiceMock) CreateOrGet(signup *models.Signup, isAdmin bool) (*models.User, bool, error) {
+	args := m.Called(signup, isAdmin)
 	return args.Get(0).(*models.User), args.Bool(1), args.Error(2)
 }

@ -59,6 +79,11 @@ func (m *UserServiceMock) MigrateMd5Password(user *models.User, login *models.Lo
 	return args.Get(0).(*models.User), args.Error(1)
 }

+func (m *UserServiceMock) GenerateResetToken(user *models.User) (*models.User, error) {
+	args := m.Called(user)
+	return args.Get(0).(*models.User), args.Error(1)
+}
+
 func (m *UserServiceMock) FlushCache() {
 	m.Called()
 }
--- a/models/heartbeat.go
+++ b/models/heartbeat.go
@ -4,29 +4,29 @@ import (
 	"fmt"
 	"github.com/emvi/logbuch"
 	"github.com/mitchellh/hashstructure/v2"
-	"regexp"
+	"strings"
 	"time"
 )

 type Heartbeat struct {
-	ID              uint           `gorm:"primary_key" hash:"ignore"`
-	User            *User          `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" hash:"ignore"`
-	UserID          string         `json:"-" gorm:"not null; index:idx_time_user"`
-	Entity          string         `json:"entity" gorm:"not null; index:idx_entity"`
-	Type            string         `json:"type"`
-	Category        string         `json:"category"`
-	Project         string         `json:"project"`
-	Branch          string         `json:"branch"`
-	Language        string         `json:"language" gorm:"index:idx_language"`
-	IsWrite         bool           `json:"is_write"`
-	Editor          string         `json:"editor" hash:"ignore"`           // ignored because editor might be parsed differently by wakatime
-	OperatingSystem string         `json:"operating_system" hash:"ignore"` // ignored because os might be parsed differently by wakatime
-	Machine         string         `json:"machine" hash:"ignore"`          // ignored because wakatime api doesn't return machines currently
-	Time            CustomTime     `json:"time" gorm:"type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time,idx_time_user" swaggertype:"primitive,number"`
-	Hash            string         `json:"-" gorm:"type:varchar(17); uniqueIndex"`
-	Origin          string         `json:"-" hash:"ignore"`
-	OriginId        string         `json:"-" hash:"ignore"`
-	languageRegex   *regexp.Regexp `hash:"ignore"`
+	ID              uint       `gorm:"primary_key" hash:"ignore"`
+	User            *User      `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" hash:"ignore"`
+	UserID          string     `json:"-" gorm:"not null; index:idx_time_user"`
+	Entity          string     `json:"entity" gorm:"not null; index:idx_entity"`
+	Type            string     `json:"type"`
+	Category        string     `json:"category"`
+	Project         string     `json:"project"`
+	Branch          string     `json:"branch"`
+	Language        string     `json:"language" gorm:"index:idx_language"`
+	IsWrite         bool       `json:"is_write"`
+	Editor          string     `json:"editor" hash:"ignore"`           // ignored because editor might be parsed differently by wakatime
+	OperatingSystem string     `json:"operating_system" hash:"ignore"` // ignored because os might be parsed differently by wakatime
+	Machine         string     `json:"machine" hash:"ignore"`          // ignored because wakatime api doesn't return machines currently
+	Time            CustomTime `json:"time" gorm:"type:timestamp; index:idx_time,idx_time_user" swaggertype:"primitive,number"`
+	Hash            string     `json:"-" gorm:"type:varchar(17); uniqueIndex"`
+	Origin          string     `json:"-" hash:"ignore"`
+	OriginId        string     `json:"-" hash:"ignore"`
+	CreatedAt       CustomTime `json:"created_at" gorm:"type:timestamp" swaggertype:"primitive,number" hash:"ignore"` // https://gorm.io/docs/conventions.html#CreatedAt
 }

 func (h *Heartbeat) Valid() bool {
@ -34,18 +34,13 @@ func (h *Heartbeat) Valid() bool {
 }

 func (h *Heartbeat) Augment(languageMappings map[string]string) {
-	if h.languageRegex == nil {
-		h.languageRegex = regexp.MustCompile(`^.+\.(.+)$`)
+	maxPrec := -1 // precision / mapping complexity -> more concrete ones shall take precedence
+	for ending, value := range languageMappings {
+		if ok, prec := strings.HasSuffix(h.Entity, "."+ending), strings.Count(ending, "."); ok && prec > maxPrec {
+			h.Language = value
+			maxPrec = prec
+		}
 	}
-	groups := h.languageRegex.FindAllStringSubmatch(h.Entity, -1)
-	if len(groups) == 0 || len(groups[0]) != 2 {
-		return
-	}
-	ending := groups[0][1]
-	if _, ok := languageMappings[ending]; !ok {
-		return
-	}
-	h.Language, _ = languageMappings[ending]
 }

 func (h *Heartbeat) GetKey(t uint8) (key string) {
--- a/models/heartbeat_test.go
+++ b/models/heartbeat_test.go
@ -26,17 +26,30 @@ func TestHeartbeat_Valid_MissingUser(t *testing.T) {

 func TestHeartbeat_Augment(t *testing.T) {
 	testMappings := map[string]string{
-		"py": "Python3",
+		"py":        "Python3",
+		"foo":       "Foo Script",
+		"php":       "PHP 8",
+		"blade.php": "Blade",
 	}

-	sut := &Heartbeat{
+	sut1, sut2, sut3 := &Heartbeat{
 		Entity:   "~/dev/file.py",
 		Language: "Python",
+	}, &Heartbeat{
+		Entity:   "~/dev/file.blade.php",
+		Language: "unknown",
+	}, &Heartbeat{
+		Entity:   "~/dev/file.php",
+		Language: "PHP",
 	}

-	sut.Augment(testMappings)
+	sut1.Augment(testMappings)
+	sut2.Augment(testMappings)
+	sut3.Augment(testMappings)

-	assert.Equal(t, "Python3", sut.Language)
+	assert.Equal(t, "Python3", sut1.Language)
+	assert.Equal(t, "Blade", sut2.Language)
+	assert.Equal(t, "PHP 8", sut3.Language)
 }

 func TestHeartbeat_GetKey(t *testing.T) {
--- a/models/mail.go
+++ b/models/mail.go
@ -0,0 +1,45 @@
+package models
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Mail struct {
+	From    MailAddress
+	To      MailAddresses
+	Subject string
+	Body    string
+	Type    string
+}
+
+func (m *Mail) WithText(text string) *Mail {
+	m.Body = text
+	m.Type = "text/plain; charset=UTF-8"
+	return m
+}
+
+func (m *Mail) WithHTML(html string) *Mail {
+	m.Body = html
+	m.Type = "text/html; charset=UTF-8"
+	return m
+}
+
+func (m *Mail) String() string {
+	return fmt.Sprintf("To: %s\r\n"+
+		"From: %s\r\n"+
+		"Subject: %s\r\n"+
+		"Content-Type: %s\r\n"+
+		"\r\n"+
+		"%s\r\n",
+		strings.Join(m.To.RawStrings(), ", "),
+		m.From.String(),
+		m.Subject,
+		m.Type,
+		m.Body,
+	)
+}
+
+func (m *Mail) Reader() *strings.Reader {
+	return strings.NewReader(m.String())
+}
--- a/models/mail_address.go
+++ b/models/mail_address.go
@ -0,0 +1,66 @@
+package models
+
+import "regexp"
+
+const (
+	MailPattern      = "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+"
+	EmailAddrPattern = ".*\\s<(" + MailPattern + ")>|(" + MailPattern + ")"
+)
+
+var (
+	mailRegex      *regexp.Regexp
+	emailAddrRegex *regexp.Regexp
+)
+
+func init() {
+	mailRegex = regexp.MustCompile(MailPattern)
+	emailAddrRegex = regexp.MustCompile(EmailAddrPattern)
+}
+
+type MailAddress string
+
+type MailAddresses []MailAddress
+
+func (m MailAddress) String() string {
+	return string(m)
+}
+
+func (m MailAddress) Raw() string {
+	match := emailAddrRegex.FindStringSubmatch(string(m))
+	if len(match) == 3 {
+		if match[2] != "" {
+			return match[2]
+		}
+		return match[1]
+	}
+	return ""
+}
+
+func (m MailAddress) Valid() bool {
+	return emailAddrRegex.Match([]byte(m))
+}
+
+func (m MailAddresses) Strings() []string {
+	out := make([]string, len(m))
+	for i, s := range m {
+		out[i] = s.String()
+	}
+	return out
+}
+
+func (m MailAddresses) RawStrings() []string {
+	out := make([]string, len(m))
+	for i, s := range m {
+		out[i] = s.Raw()
+	}
+	return out
+}
+
+func (m MailAddresses) AllValid() bool {
+	for _, a := range m {
+		if !a.Valid() {
+			return false
+		}
+	}
+	return true
+}
--- a/models/mail_address_test.go
+++ b/models/mail_address_test.go
@ -0,0 +1,88 @@
+package models
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestMailAddress_SingleRaw(t *testing.T) {
+	tests := []struct {
+		in  string
+		out string
+	}{
+		{
+			"john.doe@example.org",
+			"john.doe@example.org",
+		},
+		{
+			"John Doe <john.doe@example.org>",
+			"john.doe@example.org",
+		},
+		{
+			"invalid",
+			"",
+		},
+	}
+
+	for _, test := range tests {
+		out := MailAddress(test.in).Raw()
+		assert.Equal(t, test.out, out)
+	}
+}
+
+func TestMailAddress_AllRaw(t *testing.T) {
+	tests := []struct {
+		in  []string
+		out []string
+	}{
+		{
+			[]string{"john.doe@example.org", "foo@bar.com"},
+			[]string{"john.doe@example.org", "foo@bar.com"},
+		},
+		{
+			[]string{"John Doe <john.doe@example.org>", "foo@bar.com"},
+			[]string{"john.doe@example.org", "foo@bar.com"},
+		},
+		{
+			[]string{"john.doe@example.org", "invalid"},
+			[]string{"john.doe@example.org", ""},
+		},
+	}
+
+	for _, test := range tests {
+		out := castAddresses(test.in).RawStrings()
+		assert.EqualValues(t, test.out, out)
+	}
+}
+
+func TestMailAddress_AllValid(t *testing.T) {
+	tests := []struct {
+		in  []string
+		out bool
+	}{
+		{
+			[]string{"john.doe@example.org", "foo@bar.com"},
+			true,
+		},
+		{
+			[]string{"John Doe <john.doe@example.org>", "ínvalid"},
+			false,
+		},
+		{
+			[]string{"", "invalid"},
+			false,
+		},
+	}
+
+	for _, test := range tests {
+		out := castAddresses(test.in).AllValid()
+		assert.EqualValues(t, test.out, out)
+	}
+}
+
+func castAddresses(addresses []string) (m MailAddresses) {
+	for _, a := range addresses {
+		m = append(m, MailAddress(a))
+	}
+	return m
+}
--- a/models/metrics/counter_metric.go
+++ b/models/metrics/counter_metric.go
@ -0,0 +1,22 @@
+package metrics
+
+import "fmt"
+
+type CounterMetric struct {
+	Name   string
+	Value  int
+	Desc   string
+	Labels Labels
+}
+
+func (c CounterMetric) Key() string {
+	return c.Name
+}
+
+func (c CounterMetric) Print() string {
+	return fmt.Sprintf("%s%s %d", c.Name, c.Labels.Print(), c.Value)
+}
+
+func (c CounterMetric) Header() string {
+	return fmt.Sprintf("# HELP %s %s\n# TYPE %s counter", c.Name, c.Desc, c.Name)
+}
--- a/models/metrics/label.go
+++ b/models/metrics/label.go
@ -0,0 +1,28 @@
+package metrics
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Labels []Label
+
+type Label struct {
+	Key   string
+	Value string
+}
+
+func (l Labels) Print() string {
+	printedLabels := make([]string, len(l))
+	for i, e := range l {
+		printedLabels[i] = e.Print()
+	}
+	if len(l) == 0 {
+		return ""
+	}
+	return fmt.Sprintf("{%s}", strings.Join(printedLabels, ","))
+}
+
+func (l Label) Print() string {
+	return fmt.Sprintf("%s=\"%s\"", l.Key, l.Value)
+}
--- a/models/metrics/metric.go
+++ b/models/metrics/metric.go
@ -0,0 +1,43 @@
+package metrics
+
+import (
+	"fmt"
+	"strings"
+)
+
+// Hand-crafted Prometheus metrics
+// Since we're only using very simple counters in this application,
+// we don't actually need the official client SDK as a dependency
+
+type Metrics []Metric
+
+func (m Metrics) Print() (output string) {
+	printedMetrics := make(map[string]bool)
+	for _, m := range m {
+		if _, ok := printedMetrics[m.Key()]; !ok {
+			output += fmt.Sprintf("%s\n", m.Header())
+			printedMetrics[m.Key()] = true
+		}
+		output += fmt.Sprintf("%s\n", m.Print())
+	}
+
+	return output
+}
+
+func (m Metrics) Len() int {
+	return len(m)
+}
+
+func (m Metrics) Less(i, j int) bool {
+	return strings.Compare(m[i].Key(), m[j].Key()) < 0
+}
+
+func (m Metrics) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}
+
+type Metric interface {
+	Key() string
+	Header() string
+	Print() string
+}
--- a/models/summary.go
+++ b/models/summary.go
@ -35,7 +35,7 @@ type SummaryItem struct {
 	ID        uint          `json:"-" gorm:"primary_key"`
 	Summary   *Summary      `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	SummaryID uint          `json:"-"`
-	Type      uint8         `json:"-"`
+	Type      uint8         `json:"-" gorm:"index:idx_type"`
 	Key       string        `json:"key"`
 	Total     time.Duration `json:"total" swaggertype:"primitive,integer"`
 }
@ -47,6 +47,8 @@ type SummaryItemContainer struct {

 type SummaryViewModel struct {
 	*Summary
+	*SummaryParams
+	User           *User
 	LanguageColors map[string]string
 	EditorColors   map[string]string
 	OSColors       map[string]string
@ -92,6 +94,10 @@ func (s *Summary) MappedItems() map[uint8]*SummaryItems {
 	}
 }

+func (s *Summary) ItemsByType(summaryType uint8) *SummaryItems {
+	return s.MappedItems()[summaryType]
+}
+
 /* Augments the summary in a way that at least one item is present for every type.
 If a summary has zero items for a given type, but one or more for any of the other types,
 the total summary duration can be derived from those and inserted as a dummy-item with key "unknown"
--- a/models/user.go
+++ b/models/user.go
@ -1,8 +1,15 @@
 package models

+import "regexp"
+
+func init() {
+	mailRegex = regexp.MustCompile(MailPattern)
+}
+
 type User struct {
 	ID               string     `json:"id" gorm:"primary_key"`
 	ApiKey           string     `json:"api_key" gorm:"unique"`
+	Email            string     `json:"email" gorm:"index:idx_user_email; size:255"`
 	Password         string     `json:"-"`
 	CreatedAt        CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
 	LastLoggedInAt   CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
@ -12,7 +19,10 @@ type User struct {
 	ShareProjects    bool       `json:"-" gorm:"default:false; type:bool"`
 	ShareOSs         bool       `json:"-" gorm:"default:false; type:bool; column:share_oss"`
 	ShareMachines    bool       `json:"-" gorm:"default:false; type:bool"`
+	IsAdmin          bool       `json:"-" gorm:"default:false; type:bool"`
+	HasData          bool       `json:"-" gorm:"default:false; type:bool"`
 	WakatimeApiKey   string     `json:"-"`
+	ResetToken       string     `json:"-"`
 }

 type Login struct {
@ -22,36 +32,70 @@ type Login struct {

 type Signup struct {
 	Username       string `schema:"username"`
+	Email          string `schema:"email"`
 	Password       string `schema:"password"`
 	PasswordRepeat string `schema:"password_repeat"`
 }

+type SetPasswordRequest struct {
+	Password       string `schema:"password"`
+	PasswordRepeat string `schema:"password_repeat"`
+	Token          string `schema:"token"`
+}
+
+type ResetPasswordRequest struct {
+	Email string `schema:"email"`
+}
+
 type CredentialsReset struct {
 	PasswordOld    string `schema:"password_old"`
 	PasswordNew    string `schema:"password_new"`
 	PasswordRepeat string `schema:"password_repeat"`
 }

+type UserDataUpdate struct {
+	Email string `schema:"email"`
+}
+
 type TimeByUser struct {
 	User string
 	Time CustomTime
 }

+type CountByUser struct {
+	User  string
+	Count int64
+}
+
 func (c *CredentialsReset) IsValid() bool {
-	return validatePassword(c.PasswordNew) &&
+	return ValidatePassword(c.PasswordNew) &&
 		c.PasswordNew == c.PasswordRepeat
 }

+func (c *SetPasswordRequest) IsValid() bool {
+	return ValidatePassword(c.Password) &&
+		c.Password == c.PasswordRepeat
+}
+
 func (s *Signup) IsValid() bool {
-	return validateUsername(s.Username) &&
-		validatePassword(s.Password) &&
+	return ValidateUsername(s.Username) &&
+		ValidateEmail(s.Email) &&
+		ValidatePassword(s.Password) &&
 		s.Password == s.PasswordRepeat
 }

-func validateUsername(username string) bool {
+func (r *UserDataUpdate) IsValid() bool {
+	return ValidateEmail(r.Email)
+}
+
+func ValidateUsername(username string) bool {
 	return len(username) >= 1 && username != "current"
 }

-func validatePassword(password string) bool {
+func ValidatePassword(password string) bool {
 	return len(password) >= 6
 }
+
+func ValidateEmail(email string) bool {
+	return email == "" || mailRegex.Match([]byte(email))
+}
--- a/models/view/login.go
+++ b/models/view/login.go
@ -1,8 +1,14 @@
 package view

 type LoginViewModel struct {
-	Success string
-	Error   string
+	Success    string
+	Error      string
+	TotalUsers int
+}
+
+type SetPasswordViewModel struct {
+	LoginViewModel
+	Token string
 }

 func (s *LoginViewModel) WithSuccess(m string) *LoginViewModel {
--- a/postman/Wakapi.postman_collection.json
+++ b/postman/Wakapi.postman_collection.json
@ -0,0 +1,346 @@
+{
+	"info": {
+		"_postman_id": "3dcc346d-a9a8-4699-8a52-459eb978b382",
+		"name": "Wakapi",
+		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+	},
+	"item": [
+		{
+			"name": "Misc",
+			"item": [
+				{
+					"name": "Get health",
+					"request": {
+						"method": "GET",
+						"header": [],
+						"url": {
+							"raw": "{{BASE_URL}}/api/health",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"health"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get metrics",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/metrics",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"metrics"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Heartbeats",
+			"item": [
+				{
+					"name": "Create heartbeat",
+					"request": {
+						"method": "POST",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							},
+							{
+								"key": "X-Machine-Name",
+								"value": "devmachine",
+								"type": "text"
+							},
+							{
+								"key": "User-Agent",
+								"value": "wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0",
+								"type": "text"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": "[{\n    \"entity\": \"/home/user1/dev/proejct1/main.go\",\n    \"project\": \"Project 1\",\n    \"language\": \"Go\",\n    \"is_write\": true,\n    \"type\": \"file\",\n    \"category\": null,\n    \"branch\": null,\n    \"time\": 1616680499.113417\n}]",
+							"options": {
+								"raw": {
+									"language": "json"
+								}
+							}
+						},
+						"url": {
+							"raw": "{{BASE_URL}}/api/heartbeat",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"heartbeat"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Summary",
+			"item": [
+				{
+					"name": "Get summary",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/summary?interval=last_7_days",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"summary"
+							],
+							"query": [
+								{
+									"key": "interval",
+									"value": "last_7_days"
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "Shields",
+			"item": [
+				{
+					"name": "Get Shields data",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/shields/v1/n1try/interval:today/language:Go",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"shields",
+								"v1",
+								"n1try",
+								"interval:today",
+								"language:Go"
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		},
+		{
+			"name": "WakaTime",
+			"item": [
+				{
+					"name": "Get all time",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/all_time_since_today",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"all_time_since_today"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get stats",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/stats",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"stats"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get stats with range",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/stats/last_7_days",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"stats",
+								"last_7_days"
+							]
+						}
+					},
+					"response": []
+				},
+				{
+					"name": "Get summaries",
+					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Basic {{TOKEN}}",
+								"type": "text"
+							}
+						],
+						"url": {
+							"raw": "{{BASE_URL}}/api/compat/wakatime/v1/users/current/summaries?start=2020-03-01T15:04:05Z&end=2020-03-31T15:04:05Z",
+							"host": [
+								"{{BASE_URL}}"
+							],
+							"path": [
+								"api",
+								"compat",
+								"wakatime",
+								"v1",
+								"users",
+								"current",
+								"summaries"
+							],
+							"query": [
+								{
+									"key": "start",
+									"value": "2020-03-01T15:04:05Z"
+								},
+								{
+									"key": "end",
+									"value": "2020-03-31T15:04:05Z"
+								}
+							]
+						}
+					},
+					"response": []
+				}
+			]
+		}
+	],
+	"event": [
+		{
+			"listen": "prerequest",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					"const apiKey = pm.variables.get('API_KEY')",
+					"",
+					"if (!apiKey) {",
+					"    throw new Error('no api key given')",
+					"}",
+					"",
+					"const token = base64encode(apiKey)",
+					"pm.variables.set('TOKEN', token)",
+					"",
+					"function base64encode(str) {",
+					"    return Buffer.from(str, 'utf-8').toString('base64')",
+					"}"
+				]
+			}
+		},
+		{
+			"listen": "test",
+			"script": {
+				"type": "text/javascript",
+				"exec": [
+					""
+				]
+			}
+		}
+	],
+	"variable": [
+		{
+			"key": "BASE_URL",
+			"value": "http://localhost:3000"
+		},
+		{
+			"key": "API_KEY",
+			"value": ""
+		}
+	]
+}
--- a/repositories/heartbeart.go
+++ b/repositories/heartbeart.go
@ -26,17 +26,6 @@ func (r *HeartbeatRepository) InsertBatch(heartbeats []*models.Heartbeat) error
 	return nil
 }

-func (r *HeartbeatRepository) CountByUser(user *models.User) (int64, error) {
-	var count int64
-	if err := r.db.
-		Model(&models.Heartbeat{}).
-		Where(&models.Heartbeat{UserID: user.ID}).
-		Count(&count).Error; err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
 func (r *HeartbeatRepository) GetLatestByOriginAndUser(origin string, user *models.User) (*models.Heartbeat, error) {
 	var heartbeat models.Heartbeat
 	if err := r.db.
@ -75,6 +64,57 @@ func (r *HeartbeatRepository) GetFirstByUsers() ([]*models.TimeByUser, error) {
 	return result, nil
 }

+func (r *HeartbeatRepository) GetLastByUsers() ([]*models.TimeByUser, error) {
+	var result []*models.TimeByUser
+	r.db.Model(&models.User{}).
+		Select("users.id as user, max(time) as time").
+		Joins("left join heartbeats on users.id = heartbeats.user_id").
+		Group("user").
+		Scan(&result)
+	return result, nil
+}
+
+func (r *HeartbeatRepository) Count() (int64, error) {
+	var count int64
+	if err := r.db.
+		Model(&models.Heartbeat{}).
+		Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func (r *HeartbeatRepository) CountByUser(user *models.User) (int64, error) {
+	var count int64
+	if err := r.db.
+		Model(&models.Heartbeat{}).
+		Where(&models.Heartbeat{UserID: user.ID}).
+		Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
+func (r *HeartbeatRepository) CountByUsers(users []*models.User) ([]*models.CountByUser, error) {
+	var counts []*models.CountByUser
+
+	userIds := make([]string, len(users))
+	for i, u := range users {
+		userIds[i] = u.ID
+	}
+
+	if err := r.db.
+		Model(&models.User{}).
+		Select("users.id as user, count(heartbeats.id) as count").
+		Joins("left join heartbeats on users.id = heartbeats.user_id").
+		Where("user_id in ?", userIds).
+		Group("user").
+		Find(&counts).Error; err != nil {
+		return counts, err
+	}
+	return counts, nil
+}
+
 func (r *HeartbeatRepository) DeleteBefore(t time.Time) error {
 	if err := r.db.
 		Where("time <= ?", t).
--- a/repositories/key_value.go
+++ b/repositories/key_value.go
@ -2,7 +2,6 @@ package repositories

 import (
 	"errors"
-	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
@ -40,10 +39,6 @@ func (r *KeyValueRepository) PutString(kv *models.KeyStringValue) error {
 		return err
 	}

-	if result.RowsAffected != 1 {
-		logbuch.Warn("did not insert key '%s', maybe just updated?", kv.Key)
-	}
-
 	return nil
 }

--- a/repositories/repositories.go
+++ b/repositories/repositories.go
@ -17,10 +17,13 @@ type IAliasRepository interface {

 type IHeartbeatRepository interface {
 	InsertBatch([]*models.Heartbeat) error
-	CountByUser(*models.User) (int64, error)
 	GetAllWithin(time.Time, time.Time, *models.User) ([]*models.Heartbeat, error)
 	GetFirstByUsers() ([]*models.TimeByUser, error)
+	GetLastByUsers() ([]*models.TimeByUser, error)
 	GetLatestByOriginAndUser(string, *models.User) (*models.Heartbeat, error)
+	Count() (int64, error)
+	CountByUser(*models.User) (int64, error)
+	CountByUsers([]*models.User) ([]*models.CountByUser, error)
 	DeleteBefore(time.Time) error
 }

@ -46,8 +49,14 @@ type ISummaryRepository interface {

 type IUserRepository interface {
 	GetById(string) (*models.User, error)
+	GetByIds([]string) ([]*models.User, error)
 	GetByApiKey(string) (*models.User, error)
+	GetByEmail(string) (*models.User, error)
+	GetByResetToken(string) (*models.User, error)
 	GetAll() ([]*models.User, error)
+	GetByLoggedInAfter(time.Time) ([]*models.User, error)
+	GetByLastActiveAfter(time.Time) ([]*models.User, error)
+	Count() (int64, error)
 	InsertOrGet(*models.User) (*models.User, bool, error)
 	Update(*models.User) (*models.User, error)
 	UpdateField(*models.User, string, interface{}) (*models.User, error)
--- a/repositories/user.go
+++ b/repositories/user.go
@ -4,6 +4,7 @@ import (
 	"errors"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
+	"time"
 )

 type UserRepository struct {
@ -22,6 +23,17 @@ func (r *UserRepository) GetById(userId string) (*models.User, error) {
 	return u, nil
 }

+func (r *UserRepository) GetByIds(userIds []string) ([]*models.User, error) {
+	var users []*models.User
+	if err := r.db.
+		Model(&models.User{}).
+		Where("id in ?", userIds).
+		Find(&users).Error; err != nil {
+		return nil, err
+	}
+	return users, nil
+}
+
 func (r *UserRepository) GetByApiKey(key string) (*models.User, error) {
 	u := &models.User{}
 	if err := r.db.Where(&models.User{ApiKey: key}).First(u).Error; err != nil {
@ -30,6 +42,28 @@ func (r *UserRepository) GetByApiKey(key string) (*models.User, error) {
 	return u, nil
 }

+func (r *UserRepository) GetByResetToken(resetToken string) (*models.User, error) {
+	if resetToken == "" {
+		return nil, errors.New("invalid input")
+	}
+	u := &models.User{}
+	if err := r.db.Where(&models.User{ResetToken: resetToken}).First(u).Error; err != nil {
+		return u, err
+	}
+	return u, nil
+}
+
+func (r *UserRepository) GetByEmail(email string) (*models.User, error) {
+	if email == "" {
+		return nil, errors.New("invalid input")
+	}
+	u := &models.User{}
+	if err := r.db.Where(&models.User{Email: email}).First(u).Error; err != nil {
+		return u, err
+	}
+	return u, nil
+}
+
 func (r *UserRepository) GetAll() ([]*models.User, error) {
 	var users []*models.User
 	if err := r.db.
@ -40,6 +74,46 @@ func (r *UserRepository) GetAll() ([]*models.User, error) {
 	return users, nil
 }

+func (r *UserRepository) GetByLoggedInAfter(t time.Time) ([]*models.User, error) {
+	var users []*models.User
+	if err := r.db.
+		Where("last_logged_in_at >= ?", t).
+		Find(&users).Error; err != nil {
+		return nil, err
+	}
+	return users, nil
+}
+
+// Returns a list of user ids, whose last heartbeat is not older than t
+// NOTE: Only ID field will be populated
+func (r *UserRepository) GetByLastActiveAfter(t time.Time) ([]*models.User, error) {
+	subQuery1 := r.db.Model(&models.User{}).
+		Select("users.id as user, max(time) as time").
+		Joins("left join heartbeats on users.id = heartbeats.user_id").
+		Group("user")
+
+	var userIds []string
+	if err := r.db.
+		Select("user as id").
+		Table("(?) as q", subQuery1).
+		Where("time >= ?", t).
+		Scan(&userIds).Error; err != nil {
+		return nil, err
+	}
+
+	return r.GetByIds(userIds)
+}
+
+func (r *UserRepository) Count() (int64, error) {
+	var count int64
+	if err := r.db.
+		Model(&models.User{}).
+		Count(&count).Error; err != nil {
+		return 0, err
+	}
+	return count, nil
+}
+
 func (r *UserRepository) InsertOrGet(user *models.User) (*models.User, bool, error) {
 	result := r.db.FirstOrCreate(user, &models.User{ID: user.ID})
 	if err := result.Error; err != nil {
@ -57,6 +131,7 @@ func (r *UserRepository) Update(user *models.User) (*models.User, error) {
 	updateMap := map[string]interface{}{
 		"api_key":             user.ApiKey,
 		"password":            user.Password,
+		"email":               user.Email,
 		"last_logged_in_at":   user.LastLoggedInAt,
 		"share_data_max_days": user.ShareDataMaxDays,
 		"share_editors":       user.ShareEditors,
@ -65,6 +140,8 @@ func (r *UserRepository) Update(user *models.User) (*models.User, error) {
 		"share_projects":      user.ShareProjects,
 		"share_machines":      user.ShareMachines,
 		"wakatime_api_key":    user.WakatimeApiKey,
+		"has_data":            user.HasData,
+		"reset_token":         user.ResetToken,
 	}

 	result := r.db.Model(user).Updates(updateMap)
--- a/routes/api/heartbeat.go
+++ b/routes/api/heartbeat.go
@ -2,7 +2,6 @@ package api

 import (
 	"encoding/json"
-	"github.com/emvi/logbuch"
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
@ -53,7 +52,7 @@ func (h *HeartbeatApiHandler) RegisterRoutes(router *mux.Router) {
 // @Router /heartbeat [post]
 func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) {
 	var heartbeats []*models.Heartbeat
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	opSys, editor, _ := utils.ParseUserAgent(r.Header.Get("User-Agent"))
 	machineName := r.Header.Get("X-Machine-Name")

@ -73,7 +72,7 @@ func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) {

 		if !hb.Valid() {
 			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte("Invalid heartbeat object."))
+			w.Write([]byte("invalid heartbeat object"))
 			return
 		}

@ -82,10 +81,21 @@ func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) {

 	if err := h.heartbeatSrvc.InsertBatch(heartbeats); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
-		logbuch.Error(err.Error())
+		w.Write([]byte(conf.ErrInternalServerError))
+		conf.Log().Request(r).Error("failed to batch-insert heartbeats – %v", err)
 		return
 	}

+	if !user.HasData {
+		user.HasData = true
+		if _, err := h.userSrvc.Update(user); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(conf.ErrInternalServerError))
+			conf.Log().Request(r).Error("failed to update user – %v", err)
+			return
+		}
+	}
+
 	utils.RespondJSON(w, http.StatusCreated, constructSuccessResponse(len(heartbeats)))
 }

--- a/routes/api/metrics.go
+++ b/routes/api/metrics.go
@ -0,0 +1,273 @@
+package api
+
+import (
+	"errors"
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/mux"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
+	"github.com/muety/wakapi/models"
+	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
+	mm "github.com/muety/wakapi/models/metrics"
+	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+	"sort"
+	"time"
+)
+
+const (
+	MetricsPrefix = "wakatime"
+
+	DescHeartbeats       = "Total number of tracked heartbeats."
+	DescAllTime          = "Total seconds (all time)."
+	DescTotal            = "Total seconds."
+	DescEditors          = "Total seconds for each editor."
+	DescProjects         = "Total seconds for each project."
+	DescLanguages        = "Total seconds for each language."
+	DescOperatingSystems = "Total seconds for each operating system."
+	DescMachines         = "Total seconds for each machine."
+
+	DescAdminTotalTime       = "Total seconds (all users, all time)."
+	DescAdminTotalHeartbeats = "Total number of tracked heartbeats (all users, all time)"
+	DescAdminUserHeartbeats  = "Total number of tracked heartbeats by user (all time)."
+	DescAdminTotalUsers      = "Total number of registered users."
+	DescAdminActiveUsers     = "Number of active users."
+)
+
+type MetricsHandler struct {
+	config        *conf.Config
+	userSrvc      services.IUserService
+	summarySrvc   services.ISummaryService
+	heartbeatSrvc services.IHeartbeatService
+	keyValueSrvc  services.IKeyValueService
+}
+
+func NewMetricsHandler(userService services.IUserService, summaryService services.ISummaryService, heartbeatService services.IHeartbeatService, keyValueService services.IKeyValueService) *MetricsHandler {
+	return &MetricsHandler{
+		userSrvc:      userService,
+		summarySrvc:   summaryService,
+		heartbeatSrvc: heartbeatService,
+		keyValueSrvc:  keyValueService,
+		config:        conf.Get(),
+	}
+}
+
+func (h *MetricsHandler) RegisterRoutes(router *mux.Router) {
+	if !h.config.Security.ExposeMetrics {
+		return
+	}
+
+	logbuch.Info("exposing prometheus metrics under /api/metrics")
+
+	r := router.PathPrefix("/metrics").Subrouter()
+	r.Use(
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+	)
+	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+}
+
+func (h *MetricsHandler) Get(w http.ResponseWriter, r *http.Request) {
+	reqUser := middlewares.GetPrincipal(r)
+	if reqUser == nil {
+		w.WriteHeader(http.StatusUnauthorized)
+		w.Write([]byte(conf.ErrUnauthorized))
+		return
+	}
+
+	var metrics mm.Metrics
+
+	if userMetrics, err := h.getUserMetrics(reqUser); err != nil {
+		conf.Log().Request(r).Error("%v", err)
+		w.WriteHeader(http.StatusInternalServerError)
+		w.Write([]byte(conf.ErrInternalServerError))
+		return
+	} else {
+		for _, m := range *userMetrics {
+			metrics = append(metrics, m)
+		}
+	}
+
+	if reqUser.IsAdmin {
+		if adminMetrics, err := h.getAdminMetrics(reqUser); err != nil {
+			conf.Log().Request(r).Error("%v", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(conf.ErrInternalServerError))
+			return
+		} else {
+			for _, m := range *adminMetrics {
+				metrics = append(metrics, m)
+			}
+		}
+	}
+
+	sort.Sort(metrics)
+
+	w.Header().Set("content-type", "text/plain; charset=utf-8")
+	w.Write([]byte(metrics.Print()))
+}
+
+func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error) {
+	var metrics mm.Metrics
+
+	summaryAllTime, err := h.summarySrvc.Aliased(time.Time{}, time.Now(), user, h.summarySrvc.Retrieve, false)
+	if err != nil {
+		logbuch.Error("failed to retrieve all time summary for user '%s' for metric", user.ID)
+		return nil, err
+	}
+
+	from, to := utils.MustResolveIntervalRaw("today")
+
+	summaryToday, err := h.summarySrvc.Aliased(from, to, user, h.summarySrvc.Retrieve, false)
+	if err != nil {
+		logbuch.Error("failed to retrieve today's summary for user '%s' for metric", user.ID)
+		return nil, err
+	}
+
+	heartbeatCount, err := h.heartbeatSrvc.CountByUser(user)
+	if err != nil {
+		logbuch.Error("failed to count heartbeats for user '%s' for metric", user.ID)
+		return nil, err
+	}
+
+	// User Metrics
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_cumulative_seconds_total",
+		Desc:   DescAllTime,
+		Value:  int(v1.NewAllTimeFrom(summaryAllTime, &models.Filters{}).Data.TotalSeconds),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_seconds_total",
+		Desc:   DescTotal,
+		Value:  int(summaryToday.TotalTime().Seconds()),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_heartbeats_total",
+		Desc:   DescHeartbeats,
+		Value:  int(heartbeatCount),
+		Labels: []mm.Label{},
+	})
+
+	for _, p := range summaryToday.Projects {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_project_seconds_total",
+			Desc:   DescProjects,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryProject, p.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: p.Key}},
+		})
+	}
+
+	for _, l := range summaryToday.Languages {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_language_seconds_total",
+			Desc:   DescLanguages,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryLanguage, l.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: l.Key}},
+		})
+	}
+
+	for _, e := range summaryToday.Editors {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_editor_seconds_total",
+			Desc:   DescEditors,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryEditor, e.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: e.Key}},
+		})
+	}
+
+	for _, o := range summaryToday.OperatingSystems {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_operating_system_seconds_total",
+			Desc:   DescOperatingSystems,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryOS, o.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: o.Key}},
+		})
+	}
+
+	for _, m := range summaryToday.Machines {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_machine_seconds_total",
+			Desc:   DescMachines,
+			Value:  int(summaryToday.TotalTimeByKey(models.SummaryMachine, m.Key).Seconds()),
+			Labels: []mm.Label{{Key: "name", Value: m.Key}},
+		})
+	}
+
+	return &metrics, nil
+}
+
+func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error) {
+	var metrics mm.Metrics
+
+	if !user.IsAdmin {
+		return nil, errors.New("unauthorized")
+	}
+
+	var totalSeconds int
+	if t, err := h.keyValueSrvc.GetString(conf.KeyLatestTotalTime); err == nil && t != nil && t.Value != "" {
+		if d, err := time.ParseDuration(t.Value); err == nil {
+			totalSeconds = int(d.Seconds())
+		}
+	}
+
+	totalUsers, _ := h.userSrvc.Count()
+	totalHeartbeats, _ := h.heartbeatSrvc.Count()
+
+	activeUsers, err := h.userSrvc.GetActive()
+	if err != nil {
+		logbuch.Error("failed to retrieve active users for metric – %v", err)
+		return nil, err
+	}
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_seconds_total",
+		Desc:   DescAdminTotalTime,
+		Value:  totalSeconds,
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_heartbeats_total",
+		Desc:   DescAdminTotalHeartbeats,
+		Value:  int(totalHeartbeats),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_users_total",
+		Desc:   DescAdminTotalUsers,
+		Value:  int(totalUsers),
+		Labels: []mm.Label{},
+	})
+
+	metrics = append(metrics, &mm.CounterMetric{
+		Name:   MetricsPrefix + "_admin_users_active_total",
+		Desc:   DescAdminActiveUsers,
+		Value:  len(activeUsers),
+		Labels: []mm.Label{},
+	})
+
+	// Count per-user heartbeats
+
+	userCounts, err := h.heartbeatSrvc.CountByUsers(activeUsers)
+	if err != nil {
+		logbuch.Error("failed to count heartbeats for active users", err.Error())
+		return nil, err
+	}
+
+	for _, uc := range userCounts {
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_admin_user_heartbeats_total",
+			Desc:   DescAdminUserHeartbeats,
+			Value:  int(uc.Count),
+			Labels: []mm.Label{{Key: "user", Value: uc.User}},
+		})
+	}
+
+	return &metrics, nil
+}
--- a/routes/compat/shields/v1/badge.go
+++ b/routes/compat/shields/v1/badge.go
@ -1,15 +1,16 @@
 package v1

 import (
+	"fmt"
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/shields/v1"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
+	"github.com/patrickmn/go-cache"
 	"net/http"
 	"regexp"
-	"strings"
 	"time"
 )

@ -22,12 +23,14 @@ type BadgeHandler struct {
 	config      *conf.Config
 	userSrvc    services.IUserService
 	summarySrvc services.ISummaryService
+	cache       *cache.Cache
 }

 func NewBadgeHandler(summaryService services.ISummaryService, userService services.IUserService) *BadgeHandler {
 	return &BadgeHandler{
 		summarySrvc: summaryService,
 		userSrvc:    userService,
+		cache:       cache.New(time.Hour, time.Hour),
 		config:      conf.Get(),
 	}
 }
@ -52,11 +55,6 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	intervalReg := regexp.MustCompile(intervalPattern)
 	entityFilterReg := regexp.MustCompile(entityFilterPattern)

-	if userAgent := r.Header.Get("user-agent"); !strings.HasPrefix(userAgent, "Shields.io/") && !h.config.IsDev() {
-		w.WriteHeader(http.StatusForbidden)
-		return
-	}
-
 	var filterEntity, filterKey string
 	if groups := entityFilterReg.FindStringSubmatch(r.URL.Path); len(groups) > 2 {
 		filterEntity, filterKey = groups[1], groups[2]
@ -101,6 +99,12 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 		filters = &models.Filters{}
 	}

+	cacheKey := fmt.Sprintf("%s_%v_%s_%s", user.ID, *interval, filterEntity, filterKey)
+	if cacheResult, ok := h.cache.Get(cacheKey); ok {
+		utils.RespondJSON(w, http.StatusOK, cacheResult.(*v1.BadgeData))
+		return
+	}
+
 	summary, err, status := h.loadUserSummary(user, interval)
 	if err != nil {
 		w.WriteHeader(status)
@ -109,6 +113,7 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	}

 	vm := v1.NewBadgeDataFrom(summary, filters)
+	h.cache.SetDefault(cacheKey, vm)
 	utils.RespondJSON(w, http.StatusOK, vm)
 }

@ -129,7 +134,7 @@ func (h *BadgeHandler) loadUserSummary(user *models.User, interval *models.Inter
 		retrieveSummary = h.summarySrvc.Summarize
 	}

-	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/routes/compat/wakatime/v1/all_time.go
+++ b/routes/compat/wakatime/v1/all_time.go
@ -49,7 +49,7 @@ func (h *AllTimeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	values, _ := url.ParseQuery(r.URL.RawQuery)

 	requestedUser := vars["user"]
-	authorizedUser := r.Context().Value(models.UserKey).(*models.User)
+	authorizedUser := middlewares.GetPrincipal(r)

 	if requestedUser != authorizedUser.ID && requestedUser != "current" {
 		w.WriteHeader(http.StatusForbidden)
@ -80,7 +80,7 @@ func (h *AllTimeHandler) loadUserSummary(user *models.User) (*models.Summary, er
 		retrieveSummary = h.summarySrvc.Summarize
 	}

-	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := h.summarySrvc.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/routes/compat/wakatime/v1/stats.go
+++ b/routes/compat/wakatime/v1/stats.go
@ -45,10 +45,7 @@ func (h *StatsHandler) Get(w http.ResponseWriter, r *http.Request) {
 	var vars = mux.Vars(r)
 	var authorizedUser, requestedUser *models.User

-	if u := r.Context().Value(models.UserKey); u != nil {
-		authorizedUser = u.(*models.User)
-	}
-
+	authorizedUser = middlewares.GetPrincipal(r)
 	if authorizedUser != nil && vars["user"] == "current" {
 		vars["user"] = authorizedUser.ID
 	}
@ -117,7 +114,7 @@ func (h *StatsHandler) loadUserSummary(user *models.User, start, end time.Time)
 		Recompute: false,
 	}

-	summary, err := h.summarySrvc.Aliased(overallParams.From, overallParams.To, user, h.summarySrvc.Retrieve)
+	summary, err := h.summarySrvc.Aliased(overallParams.From, overallParams.To, user, h.summarySrvc.Retrieve, false)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/routes/compat/wakatime/v1/summaries.go
+++ b/routes/compat/wakatime/v1/summaries.go
@ -56,7 +56,7 @@ func (h *SummariesHandler) RegisterRoutes(router *mux.Router) {
 func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	requestedUser := vars["user"]
-	authorizedUser := r.Context().Value(models.UserKey).(*models.User)
+	authorizedUser := middlewares.GetPrincipal(r)

 	if requestedUser != authorizedUser.ID && requestedUser != "current" {
 		w.WriteHeader(http.StatusForbidden)
@ -80,7 +80,7 @@ func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
 }

 func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary, error, int) {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	params := r.URL.Query()
 	rangeParam, startParam, endParam := params.Get("range"), params.Get("start"), params.Get("end")

@ -121,7 +121,7 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
 	summaries := make([]*models.Summary, len(intervals))

 	for i, interval := range intervals {
-		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve)
+		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve, false)
 		if err != nil {
 			return nil, err, http.StatusInternalServerError
 		}
--- a/routes/home.go
+++ b/routes/home.go
@ -20,6 +20,7 @@ type HomeHandler struct {

 var loginDecoder = schema.NewDecoder()
 var signupDecoder = schema.NewDecoder()
+var resetPasswordDecoder = schema.NewDecoder()

 func NewHomeHandler(keyValueService services.IKeyValueService) *HomeHandler {
 	return &HomeHandler{
--- a/routes/login.go
+++ b/routes/login.go
@ -2,6 +2,7 @@ package routes

 import (
 	"fmt"
+	"github.com/emvi/logbuch"
 	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
@ -9,18 +10,21 @@ import (
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
 	"net/http"
+	"net/url"
 	"time"
 )

 type LoginHandler struct {
 	config   *conf.Config
 	userSrvc services.IUserService
+	mailSrvc services.IMailService
 }

-func NewLoginHandler(userService services.IUserService) *LoginHandler {
+func NewLoginHandler(userService services.IUserService, mailService services.IMailService) *LoginHandler {
 	return &LoginHandler{
 		config:   conf.Get(),
 		userSrvc: userService,
+		mailSrvc: mailService,
 	}
 }

@ -30,6 +34,10 @@ func (h *LoginHandler) RegisterRoutes(router *mux.Router) {
 	router.Path("/logout").Methods(http.MethodPost).HandlerFunc(h.PostLogout)
 	router.Path("/signup").Methods(http.MethodGet).HandlerFunc(h.GetSignup)
 	router.Path("/signup").Methods(http.MethodPost).HandlerFunc(h.PostSignup)
+	router.Path("/set-password").Methods(http.MethodGet).HandlerFunc(h.GetSetPassword)
+	router.Path("/set-password").Methods(http.MethodPost).HandlerFunc(h.PostSetPassword)
+	router.Path("/reset-password").Methods(http.MethodGet).HandlerFunc(h.GetResetPassword)
+	router.Path("/reset-password").Methods(http.MethodPost).HandlerFunc(h.PostResetPassword)
 }

 func (h *LoginHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@ -150,7 +158,9 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	_, created, err := h.userSrvc.CreateOrGet(&signup)
+	numUsers, _ := h.userSrvc.Count()
+
+	_, created, err := h.userSrvc.CreateOrGet(&signup, numUsers == 0)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("failed to create new user"))
@ -165,9 +175,134 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "account created successfully"), http.StatusFound)
 }

+func (h *LoginHandler) GetResetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+	templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r))
+}
+
+func (h *LoginHandler) GetSetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	values, _ := url.ParseQuery(r.URL.RawQuery)
+	token := values.Get("token")
+	if token == "" {
+		w.WriteHeader(http.StatusUnauthorized)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid or missing token"))
+		return
+	}
+
+	vm := &view.SetPasswordViewModel{
+		LoginViewModel: *h.buildViewModel(r),
+		Token:          token,
+	}
+
+	templates[conf.SetPasswordTemplate].Execute(w, vm)
+}
+
+func (h *LoginHandler) PostSetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	var setRequest models.SetPasswordRequest
+	if err := r.ParseForm(); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+	if err := signupDecoder.Decode(&setRequest, r.PostForm); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+
+	user, err := h.userSrvc.GetUserByResetToken(setRequest.Token)
+	if err != nil {
+		w.WriteHeader(http.StatusUnauthorized)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid token"))
+		return
+	}
+
+	if !setRequest.IsValid() {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid parameters"))
+		return
+	}
+
+	user.Password = setRequest.Password
+	user.ResetToken = ""
+	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to set new password"))
+		return
+	} else {
+		user.Password = hash
+	}
+
+	if _, err := h.userSrvc.Update(user); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to save new password"))
+		return
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("%s/login?success=%s", h.config.Server.BasePath, "password updated successfully"), http.StatusFound)
+}
+
+func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	if !h.config.Mail.Enabled {
+		w.WriteHeader(http.StatusNotImplemented)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("mailing is disabled on this server"))
+		return
+	}
+
+	var resetRequest models.ResetPasswordRequest
+	if err := r.ParseForm(); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+	if err := resetPasswordDecoder.Decode(&resetRequest, r.PostForm); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		return
+	}
+
+	if user, err := h.userSrvc.GetUserByEmail(resetRequest.Email); user != nil && err == nil {
+		if u, err := h.userSrvc.GenerateResetToken(user); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to generate password reset token"))
+			return
+		} else {
+			go func(user *models.User) {
+				link := fmt.Sprintf("%s/set-password?token=%s", h.config.Server.GetPublicUrl(), user.ResetToken)
+				if err := h.mailSrvc.SendPasswordReset(user, link); err != nil {
+					conf.Log().Request(r).Error("failed to send password reset mail to %s – %v", user.ID, err)
+				} else {
+					logbuch.Info("sent password reset mail to %s", user.ID)
+				}
+			}(u)
+		}
+	} else {
+		conf.Log().Request(r).Warn("password reset requested for unregistered address '%s'", resetRequest.Email)
+	}
+
+	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "an e-mail was sent to you in case your e-mail address was registered"), http.StatusFound)
+}
+
 func (h *LoginHandler) buildViewModel(r *http.Request) *view.LoginViewModel {
+	numUsers, _ := h.userSrvc.Count()
+
 	return &view.LoginViewModel{
-		Success: r.URL.Query().Get("success"),
-		Error:   r.URL.Query().Get("error"),
+		Success:    r.URL.Query().Get("success"),
+		Error:      r.URL.Query().Get("error"),
+		TotalUsers: int(numUsers),
 	}
 }
--- a/routes/routes.go
+++ b/routes/routes.go
@ -2,15 +2,17 @@ package routes

 import (
 	"fmt"
-	"github.com/markbates/pkger"
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"github.com/muety/wakapi/utils"
 	"html/template"
+	"io/fs"
 	"io/ioutil"
 	"net/http"
 	"path"
 	"strings"
+
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/utils"
+	"github.com/muety/wakapi/views"
 )

 func Init() {
@ -22,17 +24,23 @@ type action func(w http.ResponseWriter, r *http.Request) (int, string, string)
 var templates map[string]*template.Template

 func loadTemplates() {
-	const tplPath = "/views"
 	tpls := template.New("").Funcs(template.FuncMap{
-		"json":        utils.Json,
-		"date":        utils.FormatDateHuman,
-		"title":       strings.Title,
-		"join":        strings.Join,
-		"add":         utils.Add,
-		"capitalize":  utils.Capitalize,
-		"toRunes":     utils.ToRunes,
-		"entityTypes": models.SummaryTypes,
-		"typeName":    typeName,
+		"json":           utils.Json,
+		"date":           utils.FormatDateHuman,
+		"simpledate":     utils.FormatDate,
+		"simpledatetime": utils.FormatDateTime,
+		"floordate":      utils.FloorDate,
+		"ceildate":       utils.CeilDate,
+		"title":          strings.Title,
+		"join":           strings.Join,
+		"add":            utils.Add,
+		"capitalize":     utils.Capitalize,
+		"toRunes":        utils.ToRunes,
+		"entityTypes":    models.SummaryTypes,
+		"typeName":       typeName,
+		"isDev": func() bool {
+			return config.Get().IsDev()
+		},
 		"getBasePath": func() string {
 			return config.Get().Server.BasePath
 		},
@ -48,12 +56,10 @@ func loadTemplates() {
 	})
 	templates = make(map[string]*template.Template)

-	dir, err := pkger.Open(tplPath)
-	if err != nil {
-		panic(err)
-	}
-	defer dir.Close()
-	files, err := dir.Readdir(0)
+	// Use local file system when in 'dev' environment, go embed file system otherwise
+	templateFs := config.ChooseFS("views", views.TemplateFiles)
+
+	files, err := fs.ReadDir(templateFs, ".")
 	if err != nil {
 		panic(err)
 	}
@ -64,7 +70,7 @@ func loadTemplates() {
 			continue
 		}

-		templateFile, err := pkger.Open(fmt.Sprintf("%s/%s", tplPath, tplName))
+		templateFile, err := templateFs.Open(tplName)
 		if err != nil {
 			panic(err)
 		}
@ -102,3 +108,7 @@ func typeName(t uint8) string {
 	}
 	return "unknown"
 }
+
+func defaultErrorRedirectTarget() string {
+	return fmt.Sprintf("%s/?error=unauthorized", config.Get().Server.BasePath)
+}
--- a/routes/settings.go
+++ b/routes/settings.go
@ -27,6 +27,7 @@ type SettingsHandler struct {
 	aggregationSrvc     services.IAggregationService
 	languageMappingSrvc services.ILanguageMappingService
 	keyValueSrvc        services.IKeyValueService
+	mailSrvc            services.IMailService
 	httpClient          *http.Client
 }

@ -40,6 +41,7 @@ func NewSettingsHandler(
 	aggregationService services.IAggregationService,
 	languageMappingService services.ILanguageMappingService,
 	keyValueService services.IKeyValueService,
+	mailService services.IMailService,
 ) *SettingsHandler {
 	return &SettingsHandler{
 		config:              conf.Get(),
@ -50,6 +52,7 @@ func NewSettingsHandler(
 		userSrvc:            userService,
 		heartbeatSrvc:       heartbeatService,
 		keyValueSrvc:        keyValueService,
+		mailSrvc:            mailService,
 		httpClient:          &http.Client{Timeout: 10 * time.Second},
 	}
 }
@ -57,7 +60,7 @@ func NewSettingsHandler(
 func (h *SettingsHandler) RegisterRoutes(router *mux.Router) {
 	r := router.PathPrefix("/settings").Subrouter()
 	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).WithRedirectTarget(defaultErrorRedirectTarget()).Handler,
 	)
 	r.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
 	r.Methods(http.MethodPost).HandlerFunc(h.PostIndex)
@ -117,6 +120,8 @@ func (h *SettingsHandler) dispatchAction(action string) action {
 	switch action {
 	case "change_password":
 		return h.actionChangePassword
+	case "update_user":
+		return h.actionUpdateUser
 	case "reset_apikey":
 		return h.actionResetApiKey
 	case "delete_alias":
@ -141,12 +146,40 @@ func (h *SettingsHandler) dispatchAction(action string) action {
 	return nil
 }

+func (h *SettingsHandler) actionUpdateUser(w http.ResponseWriter, r *http.Request) (int, string, string) {
+	if h.config.IsDev() {
+		loadTemplates()
+	}
+
+	user := middlewares.GetPrincipal(r)
+
+	var payload models.UserDataUpdate
+	if err := r.ParseForm(); err != nil {
+		return http.StatusBadRequest, "", "missing parameters"
+	}
+	if err := credentialsDecoder.Decode(&payload, r.PostForm); err != nil {
+		return http.StatusBadRequest, "", "missing parameters"
+	}
+
+	if !payload.IsValid() {
+		return http.StatusBadRequest, "", "invalid parameters"
+	}
+
+	user.Email = payload.Email
+
+	if _, err := h.userSrvc.Update(user); err != nil {
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
+	}
+
+	return http.StatusOK, "user updated successfully", ""
+}
+
 func (h *SettingsHandler) actionChangePassword(w http.ResponseWriter, r *http.Request) (int, string, string) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)

 	var credentials models.CredentialsReset
 	if err := r.ParseForm(); err != nil {
@ -166,13 +199,13 @@ func (h *SettingsHandler) actionChangePassword(w http.ResponseWriter, r *http.Re

 	user.Password = credentials.PasswordNew
 	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
-		return http.StatusInternalServerError, "", "internal server error"
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	} else {
 		user.Password = hash
 	}

 	if _, err := h.userSrvc.Update(user); err != nil {
-		return http.StatusInternalServerError, "", "internal server error"
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	}

 	login := &models.Login{
@ -181,7 +214,7 @@ func (h *SettingsHandler) actionChangePassword(w http.ResponseWriter, r *http.Re
 	}
 	encoded, err := h.config.Security.SecureCookie.Encode(models.AuthCookieKey, login.Username)
 	if err != nil {
-		return http.StatusInternalServerError, "", "internal server error"
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	}

 	http.SetCookie(w, h.config.CreateCookie(models.AuthCookieKey, encoded, "/"))
@ -193,9 +226,9 @@ func (h *SettingsHandler) actionResetApiKey(w http.ResponseWriter, r *http.Reque
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if _, err := h.userSrvc.ResetApiKey(user); err != nil {
-		return http.StatusInternalServerError, "", "internal server error"
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	}

 	msg := fmt.Sprintf("your new api key is: %s", user.ApiKey)
@ -208,7 +241,7 @@ func (h *SettingsHandler) actionUpdateSharing(w http.ResponseWriter, r *http.Req
 	}

 	var err error
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)

 	defer h.userSrvc.FlushCache()

@ -235,7 +268,7 @@ func (h *SettingsHandler) actionDeleteAlias(w http.ResponseWriter, r *http.Reque
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	aliasKey := r.PostFormValue("key")
 	aliasType, err := strconv.Atoi(r.PostFormValue("type"))
 	if err != nil {
@ -255,7 +288,7 @@ func (h *SettingsHandler) actionAddAlias(w http.ResponseWriter, r *http.Request)
 	if h.config.IsDev() {
 		loadTemplates()
 	}
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	aliasKey := r.PostFormValue("key")
 	aliasValue := r.PostFormValue("value")
 	aliasType, err := strconv.Atoi(r.PostFormValue("type"))
@ -283,19 +316,20 @@ func (h *SettingsHandler) actionDeleteLanguageMapping(w http.ResponseWriter, r *
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	id, err := strconv.Atoi(r.PostFormValue("mapping_id"))
 	if err != nil {
 		return http.StatusInternalServerError, "", "could not delete mapping"
 	}

-	if mapping, err := h.languageMappingSrvc.GetById(uint(id)); err != nil || mapping == nil {
+	mapping, err := h.languageMappingSrvc.GetById(uint(id))
+	if err != nil || mapping == nil {
 		return http.StatusNotFound, "", "mapping not found"
 	} else if mapping.UserID != user.ID {
 		return http.StatusForbidden, "", "not allowed to delete mapping"
 	}

-	if err := h.languageMappingSrvc.Delete(&models.LanguageMapping{ID: uint(id)}); err != nil {
+	if err := h.languageMappingSrvc.Delete(mapping); err != nil {
 		return http.StatusInternalServerError, "", "could not delete mapping"
 	}

@ -306,7 +340,7 @@ func (h *SettingsHandler) actionAddLanguageMapping(w http.ResponseWriter, r *htt
 	if h.config.IsDev() {
 		loadTemplates()
 	}
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	extension := r.PostFormValue("extension")
 	language := r.PostFormValue("language")

@ -332,7 +366,7 @@ func (h *SettingsHandler) actionSetWakatimeApiKey(w http.ResponseWriter, r *http
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	apiKey := r.PostFormValue("api_key")

 	// Healthcheck, if a new API key is set, i.e. the feature is activated
@ -341,7 +375,7 @@ func (h *SettingsHandler) actionSetWakatimeApiKey(w http.ResponseWriter, r *http
 	}

 	if _, err := h.userSrvc.SetWakatimeApiKey(user, apiKey); err != nil {
-		return http.StatusInternalServerError, "", "internal server error"
+		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	}

 	return http.StatusOK, "Wakatime API Key updated successfully", ""
@ -352,7 +386,7 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user.WakatimeApiKey == "" {
 		return http.StatusForbidden, "", "not connected to wakatime"
 	}
@ -370,6 +404,7 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 	}

 	go func(user *models.User) {
+		start := time.Now()
 		importer := imports.NewWakatimeHeartbeatImporter(user.WakatimeApiKey)

 		countBefore, err := h.heartbeatSrvc.CountByUser(user)
@ -388,23 +423,38 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 		count := 0
 		batch := make([]*models.Heartbeat, 0)

+		insert := func(batch []*models.Heartbeat) {
+			if err := h.heartbeatSrvc.InsertBatch(batch); err != nil {
+				logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err)
+			}
+		}
+
 		for hb := range stream {
 			count++
 			batch = append(batch, hb)

 			if len(batch) == h.config.App.ImportBatchSize {
-				if err := h.heartbeatSrvc.InsertBatch(batch); err != nil {
-					logbuch.Warn("failed to insert imported heartbeat, already existing? – %v", err)
-				}
-
+				insert(batch)
 				batch = make([]*models.Heartbeat, 0)
 			}
 		}

+		if len(batch) > 0 {
+			insert(batch)
+		}
+
 		countAfter, _ := h.heartbeatSrvc.CountByUser(user)
 		logbuch.Info("downloaded %d heartbeats for user '%s' (%d actually imported)", count, user.ID, countAfter-countBefore)

 		h.regenerateSummaries(user)
+
+		if user.Email != "" {
+			if err := h.mailSrvc.SendImportNotification(user, time.Now().Sub(start), int(countAfter-countBefore)); err != nil {
+				conf.Log().Request(r).Error("failed to send import notification mail to %s – %v", user.ID, err)
+			} else {
+				logbuch.Info("sent import notification mail to %s", user.ID)
+			}
+		}
 	}(user)

 	h.keyValueSrvc.PutString(&models.KeyStringValue{
@ -412,7 +462,7 @@ func (h *SettingsHandler) actionImportWaktime(w http.ResponseWriter, r *http.Req
 		Value: time.Now().Format(time.RFC822),
 	})

-	return http.StatusAccepted, "ImportAll started. This may take a few minutes.", ""
+	return http.StatusAccepted, "Import started. This will take several minutes. Please check back later.", ""
 }

 func (h *SettingsHandler) actionRegenerateSummaries(w http.ResponseWriter, r *http.Request) (int, string, string) {
@ -420,13 +470,13 @@ func (h *SettingsHandler) actionRegenerateSummaries(w http.ResponseWriter, r *ht
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	go func(user *models.User) {
+		if err := h.regenerateSummaries(user); err != nil {
+			conf.Log().Request(r).Error("failed to regenerate summaries for user '%s' – %v", user.ID, err)
+		}
+	}(middlewares.GetPrincipal(r))

-	if err := h.regenerateSummaries(user); err != nil {
-		return http.StatusInternalServerError, "", "failed to regenerate summaries"
-	}
-
-	return http.StatusOK, "summaries are being regenerated – this may take a few seconds", ""
+	return http.StatusAccepted, "summaries are being regenerated – this may take a up to a couple of minutes, please come back later", ""
 }

 func (h *SettingsHandler) actionDeleteUser(w http.ResponseWriter, r *http.Request) (int, string, string) {
@ -434,12 +484,12 @@ func (h *SettingsHandler) actionDeleteUser(w http.ResponseWriter, r *http.Reques
 		loadTemplates()
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	go func(user *models.User) {
 		logbuch.Info("deleting user '%s' shortly", user.ID)
 		time.Sleep(5 * time.Minute)
 		if err := h.userSrvc.Delete(user); err != nil {
-			logbuch.Error("failed to delete user '%s' – %v", user.ID, err)
+			conf.Log().Request(r).Error("failed to delete user '%s' – %v", user.ID, err)
 		} else {
 			logbuch.Info("successfully deleted user '%s'", user.ID)
 		}
@ -493,7 +543,7 @@ func (h *SettingsHandler) regenerateSummaries(user *models.User) error {
 }

 func (h *SettingsHandler) buildViewModel(r *http.Request) *view.SettingsViewModel {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	mappings, _ := h.languageMappingSrvc.GetByUser(user.ID)
 	aliases, _ := h.aliasSrvc.GetByUser(user.ID)
 	aliasMap := make(map[string][]*models.Alias)
--- a/routes/summary.go
+++ b/routes/summary.go
@ -29,7 +29,7 @@ func NewSummaryHandler(summaryService services.ISummaryService, userService serv
 func (h *SummaryHandler) RegisterRoutes(router *mux.Router) {
 	r := router.PathPrefix("/summary").Subrouter()
 	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+		middlewares.NewAuthenticateMiddleware(h.userSrvc).WithRedirectTarget(defaultErrorRedirectTarget()).Handler,
 	)
 	r.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
 }
@ -46,6 +46,7 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		r.URL.RawQuery = q.Encode()
 	}

+	summaryParams, _ := utils.ParseSummaryParams(r)
 	summary, err, status := su.LoadUserSummary(h.summarySrvc, r)
 	if err != nil {
 		w.WriteHeader(status)
@ -53,7 +54,7 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user == nil {
 		w.WriteHeader(http.StatusUnauthorized)
 		templates[conf.SummaryTemplate].Execute(w, h.buildViewModel(r).WithError("unauthorized"))
@ -62,6 +63,8 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {

 	vm := models.SummaryViewModel{
 		Summary:        summary,
+		SummaryParams:  summaryParams,
+		User:           user,
 		LanguageColors: utils.FilterColors(h.config.App.GetLanguageColors(), summary.Languages),
 		EditorColors:   utils.FilterColors(h.config.App.GetEditorColors(), summary.Editors),
 		OSColors:       utils.FilterColors(h.config.App.GetOSColors(), summary.OperatingSystems),
--- a/routes/utils/summary_utils.go
+++ b/routes/utils/summary_utils.go
@ -18,7 +18,7 @@ func LoadUserSummary(ss services.ISummaryService, r *http.Request) (*models.Summ
 		retrieveSummary = ss.Summarize
 	}

-	summary, err := ss.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary)
+	summary, err := ss.Aliased(summaryParams.From, summaryParams.To, summaryParams.User, retrieveSummary, summaryParams.Recompute)
 	if err != nil {
 		return nil, err, http.StatusInternalServerError
 	}
--- a/scripts/bundle_icons.js
+++ b/scripts/bundle_icons.js
@ -0,0 +1,80 @@
+#!/usr/bin/env node
+
+'use strict'
+
+// Usage:
+// yarn add -D @iconify/json-tools @iconify/json
+// node bundle_icons.js
+// https://iconify.design/docs/icon-bundles/
+
+const fs = require('fs')
+const path = require('path')
+const { Collection } = require('@iconify/json-tools')
+
+let icons = [
+    'fxemoji:key',
+    'fxemoji:rocket',
+    'fxemoji:satelliteantenna',
+    'fxemoji:lockandkey',
+    'fxemoji:clipboard',
+    'flat-color-icons:donate',
+    'flat-color-icons:clock',
+    'codicon:github-inverted',
+    'ant-design:check-square-filled',
+    'emojione-v1:white-heavy-check-mark',
+    'emojione-v1:alarm-clock',
+    'emojione-v1:warning',
+    'emojione-v1:backhand-index-pointing-right',
+    'twemoji:light-bulb',
+    'noto:play-button',
+    'noto:stop-button',
+    'noto:lock',
+    'twemoji:gear',
+    'eva:corner-right-down-fill',
+    'bi:heart-fill',
+]
+
+const output = path.normalize(path.join(__dirname, '../static/assets/icons.js'))
+const pretty = false
+
+// Sort icons by collections: filtered[prefix][array of icons]
+let filtered = {}
+icons.forEach(icon => {
+    let parts = icon.split(':'),
+        prefix
+
+    if (parts.length > 1) {
+        prefix = parts.shift()
+        icon = parts.join(':')
+    } else {
+        parts = icon.split('-')
+        prefix = parts.shift()
+        icon = parts.join('-')
+    }
+    if (filtered[prefix] === void 0) {
+        filtered[prefix] = []
+    }
+    if (filtered[prefix].indexOf(icon) === -1) {
+        filtered[prefix].push(icon)
+    }
+})
+
+// Parse each collection
+let code = ''
+Object.keys(filtered).forEach(prefix => {
+    let collection = new Collection()
+    if (!collection.loadIconifyCollection(prefix)) {
+        console.error('Error loading collection', prefix)
+        return
+    }
+
+    code += collection.scriptify({
+        icons: filtered[prefix],
+        optimize: true,
+        pretty: pretty
+    })
+})
+
+// Save code
+fs.writeFileSync(output, code, 'utf8')
+console.log('Saved bundle to', output, ' (' + code.length + ' bytes)')
--- a/scripts/push_sample_data.py
+++ b/scripts/push_sample_data.py
@ -1,113 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import base64
-import random
-import string
-import sys
-from datetime import datetime, timedelta
-from typing import List, Union
-
-import requests
-from tqdm import tqdm
-
-MACHINE = "devmachine"
-UA = 'wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0'
-LANGUAGES = {
-    'Go': 'go',
-    'Java': 'java',
-    'JavaScript': 'js',
-    'Python': 'py'
-}
-
-
-class Heartbeat:
-    def __init__(
-            self,
-            entity: str,
-            project: str,
-            language: str,
-            time: float,
-            is_write: bool = True,
-            branch: str = 'master',
-            type: str = 'file'
-    ):
-        self.entity: str = entity
-        self.project: str = project
-        self.language: str = language
-        self.time: float = time
-        self.is_write: bool = is_write
-        self.branch: str = branch
-        self.type: str = type
-        self.category: Union[str, None] = None
-
-
-def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[Heartbeat]:
-    data: List[Heartbeat] = []
-    now: datetime = datetime.today()
-    projects: List[str] = [randomword(random.randint(5, 10)) for _ in range(n_projects)]
-    languages: List[str] = list(LANGUAGES.keys())
-
-    for _ in range(n):
-        p: str = random.choice(projects)
-        l: str = random.choice(languages)
-        f: str = randomword(random.randint(2, 8))
-        delta: timedelta = timedelta(
-            hours=random.randint(0, n_past_hours - 1),
-            minutes=random.randint(0, 59),
-            seconds=random.randint(0, 59),
-            milliseconds=random.randint(0, 999),
-            microseconds=random.randint(0, 999)
-        )
-
-        data.append(Heartbeat(
-            entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
-            project=p,
-            language=l,
-            time=(now - delta).timestamp()
-        ))
-
-    return data
-
-
-def post_data_sync(data: List[Heartbeat], url: str, api_key: str):
-    encoded_key: str = str(base64.b64encode(api_key.encode('utf-8')), 'utf-8')
-
-    for h in tqdm(data):
-        r = requests.post(url, json=[h.__dict__], headers={
-            'User-Agent': UA,
-            'Authorization': f'Basic {encoded_key}',
-            'X-Machine-Name': MACHINE,
-        })
-        if r.status_code != 201:
-            print(r.text)
-            sys.exit(1)
-
-
-def randomword(length: int) -> str:
-    letters = string.ascii_lowercase
-    return ''.join(random.choice(letters) for _ in range(length))
-
-
-def parse_arguments():
-    parser = argparse.ArgumentParser(description='Wakapi test data insertion script.')
-    parser.add_argument('-n', type=int, default=20, help='total number of random heartbeats to generate and insert')
-    parser.add_argument('-u', '--url', type=str, default='http://localhost:3000/api/heartbeat',
-                        help='url of your api\'s heartbeats endpoint')
-    parser.add_argument('-k', '--apikey', type=str, required=True,
-                        help='your api key (to get one, go to the web interface, create a new user, log in and copy the key)')
-    parser.add_argument('-p', '--projects', type=int, default=5, help='number of different fake projects to generate')
-    parser.add_argument('-o', '--offset', type=int, default=24,
-                        help='negative time offset in hours from now for to be used as an interval within which to generate heartbeats for')
-    parser.add_argument('-s', '--seed', type=int, default=2020,
-                        help='a seed for initializing the pseudo-random number generator')
-    return parser.parse_args()
-
-
-if __name__ == '__main__':
-    args = parse_arguments()
-
-    random.seed(args.seed)
-
-    data: List[Heartbeat] = generate_data(args.n, args.projects, args.offset)
-    post_data_sync(data, args.url, args.apikey)
--- a/scripts/sample_data.py
+++ b/scripts/sample_data.py
@ -0,0 +1,274 @@
+#!/usr/bin/python3
+
+import argparse
+import base64
+import random
+import string
+import sys
+from datetime import datetime, timedelta
+from typing import List, Union, Callable
+
+import requests
+from tqdm import tqdm
+
+MACHINE = "devmachine"
+UA = 'wakatime/13.0.7 (Linux-4.15.0-91-generic-x86_64-with-glibc2.4) Python3.8.0.final.0 generator/1.42.1 generator-wakatime/4.0.0'
+LANGUAGES = {
+    'Go': 'go',
+    'Java': 'java',
+    'JavaScript': 'js',
+    'Python': 'py',
+    # https://github.com/muety/wakapi/issues/172
+    'PHP': 'php',
+    'Blade': 'blade.php'
+}
+
+
+class Heartbeat:
+    def __init__(
+            self,
+            entity: str,
+            project: str,
+            language: str,
+            time: float,
+            is_write: bool = True,
+            branch: str = 'master',
+            type: str = 'file'
+    ):
+        self.entity: str = entity
+        self.project: str = project
+        self.language: str = language
+        self.time: float = time
+        self.is_write: bool = is_write
+        self.branch: str = branch
+        self.type: str = type
+        self.category: Union[str, None] = None
+
+
+class ConfigParams:
+    def __init__(self):
+        self.api_url = ''
+        self.api_key = ''
+        self.n = 0
+        self.n_projects = 0
+        self.offset = 0
+        self.seed = 0
+
+
+def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[Heartbeat]:
+    data: List[Heartbeat] = []
+    now: datetime = datetime.today()
+    projects: List[str] = [randomword(random.randint(5, 10)) for _ in range(n_projects)]
+    languages: List[str] = list(LANGUAGES.keys())
+
+    for _ in range(n):
+        p: str = random.choice(projects)
+        l: str = random.choice(languages)
+        f: str = randomword(random.randint(2, 8))
+        delta: timedelta = timedelta(
+            hours=random.randint(0, n_past_hours - 1),
+            minutes=random.randint(0, 59),
+            seconds=random.randint(0, 59),
+            milliseconds=random.randint(0, 999),
+            microseconds=random.randint(0, 999)
+        )
+
+        data.append(Heartbeat(
+            entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
+            project=p,
+            language=l,
+            time=(now - delta).timestamp()
+        ))
+
+    return data
+
+
+def post_data_sync(data: List[Heartbeat], url: str, api_key: str):
+    encoded_key: str = str(base64.b64encode(api_key.encode('utf-8')), 'utf-8')
+
+    for h in data:
+        r = requests.post(url, json=[h.__dict__], headers={
+            'User-Agent': UA,
+            'Authorization': f'Basic {encoded_key}',
+            'X-Machine-Name': MACHINE,
+        })
+        if r.status_code != 201:
+            print(r.text)
+            sys.exit(1)
+
+
+def make_gui(callback: Callable[[ConfigParams, Callable[[int], None]], None]) -> ('QApplication', 'QWidget'):
+    from PyQt5.QtCore import Qt
+    from PyQt5.QtWidgets import QApplication, QWidget, QFormLayout, QHBoxLayout, QVBoxLayout, QGroupBox, QLabel, \
+        QLineEdit, QSpinBox, QProgressBar, QPushButton
+
+    # Main app
+    app = QApplication([])
+
+    window = QWidget()
+    window.setWindowTitle('Wakapi Sample Data Generator')
+    window.setFixedSize(window.sizeHint())
+    window.setMinimumWidth(350)
+
+    container_layout = QVBoxLayout()
+
+    # Top Controls
+    form_layout_1 = QFormLayout()
+
+    url_input_label = QLabel('URL:')
+    url_input = QLineEdit()
+    url_input.setPlaceholderText('Wakatime API Url')
+    url_input.setText('http://localhost:3000/api')
+
+    api_key_input_label = QLabel('API Key:')
+    api_key_input = QLineEdit()
+    api_key_input.setPlaceholderText(f'{"x"*8}-{"x"*4}-{"x"*4}-{"x"*4}-{"x"*12}')
+
+    form_layout_1.addRow(url_input_label, url_input)
+    form_layout_1.addRow(api_key_input_label, api_key_input)
+
+    # Middle controls
+    form_layout_2 = QFormLayout()
+    params_container = QGroupBox('Parameters')
+    params_container.setLayout(form_layout_2)
+
+    heartbeats_input_label = QLabel('# Heartbeats')
+    heartbeats_input = QSpinBox()
+    heartbeats_input.setMaximum(2147483647)
+    heartbeats_input.setValue(100)
+
+    projects_input_label = QLabel('# Projects:')
+    projects_input = QSpinBox()
+    projects_input.setMinimum(1)
+    projects_input.setValue(5)
+
+    offset_input_label = QLabel('Time Offset (hrs):')
+    offset_input = QSpinBox()
+    offset_input.setMinimum(-2147483647)
+    offset_input.setMaximum(0)
+    offset_input.setValue(-12)
+
+    seed_input_label = QLabel('Random Seed:')
+    seed_input = QSpinBox()
+    seed_input.setMaximum(2147483647)
+    seed_input.setValue(1337)
+
+    form_layout_2.addRow(heartbeats_input_label, heartbeats_input)
+    form_layout_2.addRow(projects_input_label, projects_input)
+    form_layout_2.addRow(offset_input_label, offset_input)
+    form_layout_2.addRow(seed_input_label, seed_input)
+
+    # Bottom controls
+    bottom_layout = QHBoxLayout()
+
+    start_button = QPushButton('Generate')
+    progress_bar = QProgressBar()
+
+    bottom_layout.addWidget(progress_bar)
+    bottom_layout.addWidget(start_button)
+
+    # Wiring up
+    container_layout.addLayout(form_layout_1)
+    container_layout.addWidget(params_container)
+    container_layout.addLayout(bottom_layout)
+    container_layout.setStretch(1, 1)
+
+    window.setLayout(container_layout)
+
+    # Done dialog
+    done_dialog = QWidget()
+    done_dialog.setWindowTitle('Done')
+    done_ok_button = QPushButton('Ok')
+    done_layout = QVBoxLayout()
+    done_layout.addWidget(QLabel('Done!'), alignment=Qt.AlignCenter)
+    done_layout.addWidget(done_ok_button, alignment=Qt.AlignCenter)
+    done_dialog.setFixedSize(done_dialog.sizeHint())
+    done_ok_button.clicked.connect(done_dialog.close)
+    done_dialog.setLayout(done_layout)
+
+    # Logic
+    def parse_params() -> ConfigParams:
+        params = ConfigParams()
+        params.api_url = url_input.text()
+        params.api_key = api_key_input.text()
+        params.n = heartbeats_input.value()
+        params.n_projects = projects_input.value()
+        params.offset = offset_input.value()
+        params.seed = seed_input.value()
+        return params
+
+    def update_progress(inc=1):
+        current = progress_bar.value()
+        updated = current + inc
+        if updated == progress_bar.maximum() - 1:
+            progress_bar.setValue(0)
+            start_button.setEnabled(True)
+            done_dialog.show()
+            return
+        progress_bar.setValue(updated)
+
+    def call_back():
+        params = parse_params()
+        progress_bar.setMaximum(params.n)
+        start_button.setEnabled(False)
+        callback(params, update_progress)
+
+    start_button.clicked.connect(call_back)
+
+    return app, window
+
+
+def parse_arguments():
+    parser = argparse.ArgumentParser(description='Wakapi test data insertion script.')
+    parser.add_argument('--headless', default=False, help='do not show a gui', action='store_true')
+    parser.add_argument('-n', type=int, default=20, help='total number of random heartbeats to generate and insert')
+    parser.add_argument('-u', '--url', type=str, default='http://localhost:3000/api',
+                        help='url of your api\'s heartbeats endpoint')
+    parser.add_argument('-k', '--apikey', type=str,
+                        help='your api key (to get one, go to the web interface, create a new user, log in and copy the key)')
+    parser.add_argument('-p', '--projects', type=int, default=5, help='number of different fake projects to generate')
+    parser.add_argument('-o', '--offset', type=int, default=24,
+                        help='negative time offset in hours from now for to be used as an interval within which to generate heartbeats for')
+    parser.add_argument('-s', '--seed', type=int, default=2020,
+                        help='a seed for initializing the pseudo-random number generator')
+    return parser.parse_args()
+
+
+def args_to_params(parsed_args: argparse.Namespace) -> (ConfigParams, bool):
+    params = ConfigParams()
+    params.n = parsed_args.n
+    params.n_projects = parsed_args.projects
+    params.offset = parsed_args.offset
+    params.seed = parsed_args.seed
+    params.api_url = parsed_args.url
+    params.api_key = parsed_args.apikey
+    return params, not parsed_args.headless
+
+
+def randomword(length: int) -> str:
+    letters = string.ascii_lowercase + 'äöü💩'  # test utf8 and utf8mb4 characters as well
+    return ''.join(random.choice(letters) for _ in range(length))
+
+
+def run(params: ConfigParams, update_progress: Callable[[int], None]):
+    random.seed(params.seed)
+    data: List[Heartbeat] = generate_data(
+        params.n,
+        params.n_projects,
+        params.offset * -1 if params.offset < 0 else params.offset
+    )
+
+    for d in data:
+        post_data_sync([d], f'{params.api_url}/heartbeats', params.api_key)
+        update_progress(1)
+
+
+if __name__ == '__main__':
+    params, show_gui = args_to_params(parse_arguments())
+    if show_gui:
+        app, window = make_gui(callback=run)
+        window.show()
+        app.exec()
+    else:
+        pbar = tqdm(total=params.n)
+        run(params, pbar.update)
--- a/services/aggregation.go
+++ b/services/aggregation.go
@ -73,7 +73,7 @@ func (srv *AggregationService) Run(userIds map[string]bool) error {
 func (srv *AggregationService) summaryWorker(jobs <-chan *AggregationJob, summaries chan<- *models.Summary) {
 	for job := range jobs {
 		if summary, err := srv.summaryService.Summarize(job.From, job.To, &models.User{ID: job.UserID}); err != nil {
-			logbuch.Error("failed to generate summary (%v, %v, %s) – %v", job.From, job.To, job.UserID, err)
+			config.Log().Error("failed to generate summary (%v, %v, %s) – %v", job.From, job.To, job.UserID, err)
 		} else {
 			logbuch.Info("successfully generated summary (%v, %v, %s)", job.From, job.To, job.UserID)
 			summaries <- summary
@ -84,7 +84,7 @@ func (srv *AggregationService) summaryWorker(jobs <-chan *AggregationJob, summar
 func (srv *AggregationService) persistWorker(summaries <-chan *models.Summary) {
 	for summary := range summaries {
 		if err := srv.summaryService.Insert(summary); err != nil {
-			logbuch.Error("failed to save summary (%v, %v, %s) – %v", summary.UserID, summary.FromTime, summary.ToTime, err)
+			config.Log().Error("failed to save summary (%v, %v, %s) – %v", summary.UserID, summary.FromTime, summary.ToTime, err)
 		}
 	}
 }
@ -94,7 +94,7 @@ func (srv *AggregationService) trigger(jobs chan<- *AggregationJob, userIds map[

 	var users []*models.User
 	if allUsers, err := srv.userService.GetAll(); err != nil {
-		logbuch.Error(err.Error())
+		config.Log().Error(err.Error())
 		return err
 	} else if userIds != nil && len(userIds) > 0 {
 		users = make([]*models.User, 0)
@ -110,14 +110,14 @@ func (srv *AggregationService) trigger(jobs chan<- *AggregationJob, userIds map[
 	// Get a map from user ids to the time of their latest summary or nil if none exists yet
 	lastUserSummaryTimes, err := srv.summaryService.GetLatestByUser()
 	if err != nil {
-		logbuch.Error(err.Error())
+		config.Log().Error(err.Error())
 		return err
 	}

 	// Get a map from user ids to the time of their earliest heartbeats or nil if none exists yet
 	firstUserHeartbeatTimes, err := srv.heartbeatService.GetFirstByUsers()
 	if err != nil {
-		logbuch.Error(err.Error())
+		config.Log().Error(err.Error())
 		return err
 	}

@ -149,7 +149,7 @@ func generateUserJobs(userId string, from time.Time, jobs chan<- *AggregationJob
 	var to time.Time

 	// Go to next day of either user's first heartbeat or latest aggregation
-	from.Add(-1 * time.Second)
+	from = from.Add(-1 * time.Second)
 	from = time.Date(
 		from.Year(),
 		from.Month(),
--- a/services/heartbeat.go
+++ b/services/heartbeat.go
@ -27,13 +27,32 @@ func (srv *HeartbeatService) Insert(heartbeat *models.Heartbeat) error {
 }

 func (srv *HeartbeatService) InsertBatch(heartbeats []*models.Heartbeat) error {
-	return srv.repository.InsertBatch(heartbeats)
+	hashes := make(map[string]bool)
+
+	// https://github.com/muety/wakapi/issues/139
+	filteredHeartbeats := make([]*models.Heartbeat, 0, len(heartbeats))
+	for _, hb := range heartbeats {
+		if _, ok := hashes[hb.Hash]; !ok {
+			filteredHeartbeats = append(filteredHeartbeats, hb)
+			hashes[hb.Hash] = true
+		}
+	}
+
+	return srv.repository.InsertBatch(filteredHeartbeats)
+}
+
+func (srv *HeartbeatService) Count() (int64, error) {
+	return srv.repository.Count()
 }

 func (srv *HeartbeatService) CountByUser(user *models.User) (int64, error) {
 	return srv.repository.CountByUser(user)
 }

+func (srv *HeartbeatService) CountByUsers(users []*models.User) ([]*models.CountByUser, error) {
+	return srv.repository.CountByUsers(users)
+}
+
 func (srv *HeartbeatService) GetAllWithin(from, to time.Time, user *models.User) ([]*models.Heartbeat, error) {
 	heartbeats, err := srv.repository.GetAllWithin(from, to, user)
 	if err != nil {
--- a/services/imports/wakatime.go
+++ b/services/imports/wakatime.go
@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
@ -17,7 +18,13 @@ import (
 )

 const OriginWakatime = "wakatime"
-const maxWorkers = 6
+const (
+	// wakatime api permits a max. rate of 10 req / sec
+	// https://github.com/wakatime/wakatime/issues/261
+	// with 5 workers, each sleeping slightly over 1/2 sec after every req., we should stay well below that limit
+	maxWorkers    = 5
+	throttleDelay = 550 * time.Millisecond
+)

 type WakatimeHeartbeatImporter struct {
 	ApiKey string
@ -35,7 +42,7 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time,
 	go func(user *models.User, out chan *models.Heartbeat) {
 		startDate, endDate, err := w.fetchRange()
 		if err != nil {
-			logbuch.Error("failed to fetch date range while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
+			config.Log().Error("failed to fetch date range while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
 			return
 		}

@ -48,13 +55,13 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time,

 		userAgents, err := w.fetchUserAgents()
 		if err != nil {
-			logbuch.Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
+			config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
 			return
 		}

 		machinesNames, err := w.fetchMachineNames()
 		if err != nil {
-			logbuch.Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
+			config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' – %v", user.ID, err)
 			return
 		}

@ -72,11 +79,12 @@ func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time,

 			go func(day time.Time) {
 				defer sem.Release(1)
+				defer time.Sleep(throttleDelay)

-				d := day.Format("2006-01-02")
+				d := day.Format(config.SimpleDateFormat)
 				heartbeats, err := w.fetchHeartbeats(d)
 				if err != nil {
-					logbuch.Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", day, user.ID, err)
+					config.Log().Error("failed to fetch heartbeats for day '%s' and user '%s' – &v", d, user.ID, err)
 				}

 				for _, h := range heartbeats {
@ -113,6 +121,8 @@ func (w *WakatimeHeartbeatImporter) fetchHeartbeats(day string) ([]*wakatime.Hea
 	res, err := httpClient.Do(w.withHeaders(req))
 	if err != nil {
 		return nil, err
+	} else if res.StatusCode >= 400 {
+		return nil, errors.New(fmt.Sprintf("got status %d from wakatime api", res.StatusCode))
 	}

 	var heartbeatsData wakatime.HeartbeatsViewModel
@ -144,12 +154,12 @@ func (w *WakatimeHeartbeatImporter) fetchRange() (time.Time, time.Time, error) {
 		return notime, notime, err
 	}

-	startDate, err := time.Parse("2006-01-02", allTimeData.Data.Range.StartDate)
+	startDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.StartDate)
 	if err != nil {
 		return notime, notime, err
 	}

-	endDate, err := time.Parse("2006-01-02", allTimeData.Data.Range.EndDate)
+	endDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.EndDate)
 	if err != nil {
 		return notime, notime, err
 	}
--- a/services/mail/mail.go
+++ b/services/mail/mail.go
@ -0,0 +1,81 @@
+package mail
+
+import (
+	"bytes"
+	"fmt"
+	"io/ioutil"
+	"text/template"
+
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/views"
+)
+
+const (
+	tplNamePasswordReset      = "reset_password"
+	tplNameImportNotification = "import_finished"
+	subjectPasswordReset      = "Wakapi – Password Reset"
+	subjectImportNotification = "Wakapi – Data Import Finished"
+)
+
+type PasswordResetTplData struct {
+	ResetLink string
+}
+
+type ImportNotificationTplData struct {
+	PublicUrl     string
+	Duration      string
+	NumHeartbeats int
+}
+
+// Factory
+func NewMailService() services.IMailService {
+	config := conf.Get()
+	if config.Mail.Enabled {
+		if config.Mail.Provider == conf.MailProviderMailWhale {
+			return NewMailWhaleService(config.Mail.MailWhale, config.Server.PublicUrl)
+		} else if config.Mail.Provider == conf.MailProviderSmtp {
+			return NewSMTPMailService(config.Mail.Smtp, config.Server.PublicUrl)
+		}
+	}
+	return &NoopMailService{}
+}
+
+func getPasswordResetTemplate(data PasswordResetTplData) (*bytes.Buffer, error) {
+	tpl, err := loadTemplate(tplNamePasswordReset)
+	if err != nil {
+		return nil, err
+	}
+	var rendered bytes.Buffer
+	if err := tpl.Execute(&rendered, data); err != nil {
+		return nil, err
+	}
+	return &rendered, nil
+}
+
+func getImportNotificationTemplate(data ImportNotificationTplData) (*bytes.Buffer, error) {
+	tpl, err := loadTemplate(tplNameImportNotification)
+	if err != nil {
+		return nil, err
+	}
+	var rendered bytes.Buffer
+	if err := tpl.Execute(&rendered, data); err != nil {
+		return nil, err
+	}
+	return &rendered, nil
+}
+
+func loadTemplate(tplName string) (*template.Template, error) {
+	tplFile, err := views.TemplateFiles.Open(fmt.Sprintf("mail/%s.tpl.html", tplName))
+	if err != nil {
+		return nil, err
+	}
+	defer tplFile.Close()
+
+	tplData, err := ioutil.ReadAll(tplFile)
+	if err != nil {
+		return nil, err
+	}
+
+	return template.New(tplName).Parse(string(tplData))
+}
--- a/services/mail/mailwhale.go
+++ b/services/mail/mailwhale.go
@ -0,0 +1,92 @@
+package mail
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"fmt"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"net/http"
+	"time"
+)
+
+type MailWhaleMailService struct {
+	publicUrl  string
+	config     conf.MailwhaleMailConfig
+	httpClient *http.Client
+}
+
+type MailWhaleSendRequest struct {
+	To           []string          `json:"to"`
+	Subject      string            `json:"subject"`
+	Text         string            `json:"text"`
+	Html         string            `json:"html"`
+	TemplateId   string            `json:"template_id"`
+	TemplateVars map[string]string `json:"template_vars"`
+}
+
+func NewMailWhaleService(config conf.MailwhaleMailConfig, publicUrl string) *MailWhaleMailService {
+	return &MailWhaleMailService{
+		publicUrl: publicUrl,
+		config:    config,
+		httpClient: &http.Client{
+			Timeout: 10 * time.Second,
+		},
+	}
+}
+
+func (s *MailWhaleMailService) SendPasswordReset(recipient *models.User, resetLink string) error {
+	template, err := getPasswordResetTemplate(PasswordResetTplData{ResetLink: resetLink})
+	if err != nil {
+		return err
+	}
+	return s.send(recipient.Email, subjectPasswordReset, template.String(), true)
+}
+
+func (s *MailWhaleMailService) SendImportNotification(recipient *models.User, duration time.Duration, numHeartbeats int) error {
+	template, err := getImportNotificationTemplate(ImportNotificationTplData{
+		PublicUrl:     s.publicUrl,
+		Duration:      fmt.Sprintf("%.0f seconds", duration.Seconds()),
+		NumHeartbeats: numHeartbeats,
+	})
+	if err != nil {
+		return err
+	}
+	return s.send(recipient.Email, subjectImportNotification, template.String(), true)
+}
+
+func (s *MailWhaleMailService) send(to, subject, body string, isHtml bool) error {
+	if to == "" {
+		return errors.New("not sending mail as recipient mail address seems to be invalid")
+	}
+
+	sendRequest := &MailWhaleSendRequest{
+		To:      []string{to},
+		Subject: subject,
+	}
+	if isHtml {
+		sendRequest.Html = body
+	} else {
+		sendRequest.Text = body
+	}
+	payload, _ := json.Marshal(sendRequest)
+
+	req, err := http.NewRequest(http.MethodPost, fmt.Sprintf("%s/api/mail", s.config.Url), bytes.NewBuffer(payload))
+	if err != nil {
+		return err
+	}
+
+	req.SetBasicAuth(s.config.ClientId, s.config.ClientSecret)
+	req.Header.Set("Content-Type", "application/json")
+
+	res, err := s.httpClient.Do(req)
+	if err != nil {
+		return err
+	}
+	if res.StatusCode >= 400 {
+		return errors.New(fmt.Sprintf("got status %d from mailwhale", res.StatusCode))
+	}
+
+	return nil
+}
--- a/services/mail/noop.go
+++ b/services/mail/noop.go
@ -0,0 +1,19 @@
+package mail
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/models"
+	"time"
+)
+
+type NoopMailService struct{}
+
+func (n *NoopMailService) SendPasswordReset(recipient *models.User, resetLink string) error {
+	logbuch.Info("noop mail service doing nothing instead of sending password reset mail to %s", recipient.ID)
+	return nil
+}
+
+func (n *NoopMailService) SendImportNotification(recipient *models.User, duration time.Duration, numHeartbeats int) error {
+	logbuch.Info("noop mail service doing nothing instead of sending import notification mail to %s", recipient.ID)
+	return nil
+}
--- a/services/mail/smtp.go
+++ b/services/mail/smtp.go
@ -0,0 +1,117 @@
+package mail
+
+import (
+	"errors"
+	"fmt"
+	"github.com/emersion/go-sasl"
+	"github.com/emersion/go-smtp"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"io"
+	"time"
+)
+
+type SMTPMailService struct {
+	publicUrl string
+	config    conf.SMTPMailConfig
+	auth      sasl.Client
+}
+
+func NewSMTPMailService(config conf.SMTPMailConfig, publicUrl string) *SMTPMailService {
+	return &SMTPMailService{
+		publicUrl: publicUrl,
+		config:    config,
+		auth: sasl.NewPlainClient(
+			"",
+			config.Username,
+			config.Password,
+		),
+	}
+}
+
+func (s *SMTPMailService) SendPasswordReset(recipient *models.User, resetLink string) error {
+	template, err := getPasswordResetTemplate(PasswordResetTplData{ResetLink: resetLink})
+	if err != nil {
+		return err
+	}
+
+	mail := &models.Mail{
+		From:    models.MailAddress(s.config.Sender),
+		To:      models.MailAddresses([]models.MailAddress{models.MailAddress(recipient.Email)}),
+		Subject: subjectPasswordReset,
+	}
+	mail.WithHTML(template.String())
+
+	return s.send(s.config.ConnStr(), s.config.TLS, s.auth, mail.From.Raw(), mail.To.RawStrings(), mail.Reader())
+}
+
+func (s *SMTPMailService) SendImportNotification(recipient *models.User, duration time.Duration, numHeartbeats int) error {
+	template, err := getImportNotificationTemplate(ImportNotificationTplData{
+		PublicUrl:     s.publicUrl,
+		Duration:      fmt.Sprintf("%.0f seconds", duration.Seconds()),
+		NumHeartbeats: numHeartbeats,
+	})
+	if err != nil {
+		return err
+	}
+
+	mail := &models.Mail{
+		From:    models.MailAddress(s.config.Sender),
+		To:      models.MailAddresses([]models.MailAddress{models.MailAddress(recipient.Email)}),
+		Subject: subjectImportNotification,
+	}
+	mail.WithHTML(template.String())
+
+	return s.send(s.config.ConnStr(), s.config.TLS, s.auth, mail.From.Raw(), mail.To.RawStrings(), mail.Reader())
+}
+
+func (s *SMTPMailService) send(addr string, tls bool, a sasl.Client, from string, to []string, r io.Reader) error {
+	dial := smtp.Dial
+	if tls {
+		dial = func(addr string) (*smtp.Client, error) {
+			return smtp.DialTLS(addr, nil)
+		}
+	}
+
+	c, err := dial(addr)
+	if err != nil {
+		return err
+	}
+
+	defer c.Close()
+
+	if ok, _ := c.Extension("STARTTLS"); ok {
+		if err = c.StartTLS(nil); err != nil {
+			return err
+		}
+	}
+	if a != nil {
+		if ok, _ := c.Extension("AUTH"); !ok {
+			return errors.New("smtp: server doesn't support AUTH")
+		}
+		if err = c.Auth(a); err != nil {
+			return err
+		}
+	}
+	if err = c.Mail(from, nil); err != nil {
+		return err
+	}
+	for _, addr := range to {
+		if err = c.Rcpt(addr); err != nil {
+			return err
+		}
+	}
+	w, err := c.Data()
+	if err != nil {
+		return err
+	}
+	_, err = io.Copy(w, r)
+	if err != nil {
+		return err
+	}
+	err = w.Close()
+	if err != nil {
+		return err
+	}
+	return c.Quit()
+}
--- a/services/mail/utils.go
+++ b/services/mail/utils.go
@ -0,0 +1 @@
+package mail
--- a/services/misc.go
+++ b/services/misc.go
@ -42,11 +42,11 @@ type CountTotalTimeResult struct {
 func (srv *MiscService) ScheduleCountTotalTime() {
 	// Run once initially
 	if err := srv.runCountTotalTime(); err != nil {
-		logbuch.Error("failed to run CountTotalTimeJob: %v", err)
+		logbuch.Fatal("failed to run CountTotalTimeJob: %v", err)
 	}

 	s := gocron.NewScheduler(time.Local)
-	s.Every(1).Day().At(srv.config.App.CountingTime).Do(srv.runCountTotalTime)
+	s.Every(1).Hour().Do(srv.runCountTotalTime)
 	s.StartBlocking()
 }

@ -79,8 +79,8 @@ func (srv *MiscService) runCountTotalTime() error {

 func (srv *MiscService) countTotalTimeWorker(jobs <-chan *CountTotalTimeJob, results chan<- *CountTotalTimeResult) {
 	for job := range jobs {
-		if result, err := srv.summaryService.Aliased(time.Time{}, time.Now(), &models.User{ID: job.UserID}, srv.summaryService.Retrieve); err != nil {
-			logbuch.Error("failed to count total for user %s: %v", job.UserID, err)
+		if result, err := srv.summaryService.Aliased(time.Time{}, time.Now(), &models.User{ID: job.UserID}, srv.summaryService.Retrieve, false); err != nil {
+			config.Log().Error("failed to count total for user %s: %v", job.UserID, err)
 		} else {
 			logbuch.Info("successfully counted total for user %s", job.UserID)
 			results <- &CountTotalTimeResult{
--- a/services/services.go
+++ b/services/services.go
@ -28,7 +28,9 @@ type IAliasService interface {
 type IHeartbeatService interface {
 	Insert(*models.Heartbeat) error
 	InsertBatch([]*models.Heartbeat) error
+	Count() (int64, error)
 	CountByUser(*models.User) (int64, error)
+	CountByUsers([]*models.User) ([]*models.CountByUser, error)
 	GetAllWithin(time.Time, time.Time, *models.User) ([]*models.Heartbeat, error)
 	GetFirstByUsers() ([]*models.TimeByUser, error)
 	GetLatestByOriginAndUser(string, *models.User) (*models.Heartbeat, error)
@ -51,7 +53,7 @@ type ILanguageMappingService interface {
 }

 type ISummaryService interface {
-	Aliased(time.Time, time.Time, *models.User, SummaryRetriever) (*models.Summary, error)
+	Aliased(time.Time, time.Time, *models.User, SummaryRetriever, bool) (*models.Summary, error)
 	Retrieve(time.Time, time.Time, *models.User) (*models.Summary, error)
 	Summarize(time.Time, time.Time, *models.User) (*models.Summary, error)
 	GetLatestByUser() ([]*models.TimeByUser, error)
@ -62,12 +64,22 @@ type ISummaryService interface {
 type IUserService interface {
 	GetUserById(string) (*models.User, error)
 	GetUserByKey(string) (*models.User, error)
+	GetUserByEmail(string) (*models.User, error)
+	GetUserByResetToken(string) (*models.User, error)
 	GetAll() ([]*models.User, error)
-	CreateOrGet(*models.Signup) (*models.User, bool, error)
+	GetActive() ([]*models.User, error)
+	Count() (int64, error)
+	CreateOrGet(*models.Signup, bool) (*models.User, bool, error)
 	Update(*models.User) (*models.User, error)
 	Delete(*models.User) error
 	ResetApiKey(*models.User) (*models.User, error)
 	SetWakatimeApiKey(*models.User, string) (*models.User, error)
 	MigrateMd5Password(*models.User, *models.Login) (*models.User, error)
+	GenerateResetToken(*models.User) (*models.User, error)
 	FlushCache()
 }
+
+type IMailService interface {
+	SendPasswordReset(*models.User, string) error
+	SendImportNotification(*models.User, time.Duration, int) error
+}
--- a/services/summary.go
+++ b/services/summary.go
@ -36,10 +36,10 @@ func NewSummaryService(summaryRepo repositories.ISummaryRepository, heartbeatSer

 // Public summary generation methods

-func (srv *SummaryService) Aliased(from, to time.Time, user *models.User, f SummaryRetriever) (*models.Summary, error) {
+func (srv *SummaryService) Aliased(from, to time.Time, user *models.User, f SummaryRetriever, skipCache bool) (*models.Summary, error) {
 	// Check cache
 	cacheKey := srv.getHash(from.String(), to.String(), user.ID, "--aliased")
-	if cacheResult, ok := srv.cache.Get(cacheKey); ok {
+	if cacheResult, ok := srv.cache.Get(cacheKey); ok && !skipCache {
 		return cacheResult.(*models.Summary), nil
 	}

@ -312,8 +312,17 @@ func (srv *SummaryService) getMissingIntervals(from, to time.Time, summaries []*
 		}

 		// round to end of day / start of day, assuming that summaries are always generated on a per-day basis
+		// we assume that, if summary for any time range within a day is present, no further heartbeats exist on that day before 'from' and after 'to' time of that summary
+		// this requires that a summary exists for every single day in a year and none is skipped, which shouldn't ever happen
 		td1 := time.Date(t1.Year(), t1.Month(), t1.Day()+1, 0, 0, 0, 0, t1.Location())
 		td2 := time.Date(t2.Year(), t2.Month(), t2.Day(), 0, 0, 0, 0, t2.Location())
+
+		// we always want to jump to beginning of next day
+		// however, if left summary ends already at midnight, we would instead jump to beginning of second-next day -> go back again
+		if td1.Sub(t1) == 24*time.Hour {
+			td1 = td1.Add(-1 * time.Hour)
+		}
+
 		// one or more day missing in between?
 		if td1.Before(td2) {
 			intervals = append(intervals, &models.Interval{summaries[i].ToTime.T(), summaries[i+1].FromTime.T()})
--- a/services/summary_test.go
+++ b/services/summary_test.go
@ -235,6 +235,60 @@ func (suite *SummaryServiceTestSuite) TestSummaryService_Retrieve() {
 	assert.Equal(suite.T(), 150*time.Second+90*time.Minute, result.TotalTime())
 	assert.Equal(suite.T(), 150*time.Second+45*time.Minute, result.TotalTimeByKey(models.SummaryProject, TestProject1))
 	assert.Equal(suite.T(), 45*time.Minute, result.TotalTimeByKey(models.SummaryProject, TestProject2))
+	suite.HeartbeatService.AssertNumberOfCalls(suite.T(), "GetAllWithin", 2+1)
+
+	/* TEST 3 */
+	from = time.Date(suite.TestStartTime.Year(), suite.TestStartTime.Month(), suite.TestStartTime.Day()+1, 0, 0, 0, 0, suite.TestStartTime.Location()) // start of next day
+	to = time.Date(from.Year(), from.Month(), from.Day()+2, 13, 30, 0, 0, from.Location())                                                             // noon of third-next day
+	summaries = []*models.Summary{
+		{
+			ID:       uint(rand.Uint32()),
+			UserID:   TestUserId,
+			FromTime: models.CustomTime(from),
+			ToTime:   models.CustomTime(from.Add(24 * time.Hour)),
+			Projects: []*models.SummaryItem{
+				{
+					Type:  models.SummaryProject,
+					Key:   TestProject1,
+					Total: 45 * time.Minute / time.Second, // hack
+				},
+			},
+			Languages:        []*models.SummaryItem{},
+			Editors:          []*models.SummaryItem{},
+			OperatingSystems: []*models.SummaryItem{},
+			Machines:         []*models.SummaryItem{},
+		},
+		{
+			ID:       uint(rand.Uint32()),
+			UserID:   TestUserId,
+			FromTime: models.CustomTime(to.Add(-2 * time.Hour)),
+			ToTime:   models.CustomTime(to),
+			Projects: []*models.SummaryItem{
+				{
+					Type:  models.SummaryProject,
+					Key:   TestProject2,
+					Total: 45 * time.Minute / time.Second, // hack
+				},
+			},
+			Languages:        []*models.SummaryItem{},
+			Editors:          []*models.SummaryItem{},
+			OperatingSystems: []*models.SummaryItem{},
+			Machines:         []*models.SummaryItem{},
+		},
+	}
+
+	suite.SummaryRepository.On("GetByUserWithin", suite.TestUser, from, to).Return(summaries, nil)
+	suite.HeartbeatService.On("GetAllWithin", summaries[0].ToTime.T(), summaries[1].FromTime.T(), suite.TestUser).Return(filter(summaries[0].ToTime.T(), summaries[1].FromTime.T(), suite.TestHeartbeats), nil)
+
+	result, err = sut.Retrieve(from, to, suite.TestUser)
+
+	assert.Nil(suite.T(), err)
+	assert.NotNil(suite.T(), result)
+	assert.Len(suite.T(), result.Projects, 2)
+	assert.Equal(suite.T(), 90*time.Minute, result.TotalTime())
+	assert.Equal(suite.T(), 45*time.Minute, result.TotalTimeByKey(models.SummaryProject, TestProject1))
+	assert.Equal(suite.T(), 45*time.Minute, result.TotalTimeByKey(models.SummaryProject, TestProject2))
+	suite.HeartbeatService.AssertNumberOfCalls(suite.T(), "GetAllWithin", 2+1+1)
 }

 func (suite *SummaryServiceTestSuite) TestSummaryService_Aliased() {
@ -253,7 +307,7 @@ func (suite *SummaryServiceTestSuite) TestSummaryService_Aliased() {
 	suite.AliasService.On("GetAliasOrDefault", TestUserId, models.SummaryProject, TestProject1).Return(TestProject2, nil)
 	suite.AliasService.On("GetAliasOrDefault", TestUserId, mock.Anything, mock.Anything).Return("", nil)

-	result, err = sut.Aliased(from, to, suite.TestUser, sut.Summarize)
+	result, err = sut.Aliased(from, to, suite.TestUser, sut.Summarize, false)

 	assert.Nil(suite.T(), err)
 	assert.NotNil(suite.T(), result)
--- a/services/user.go
+++ b/services/user.go
@ -52,15 +52,34 @@ func (srv *UserService) GetUserByKey(key string) (*models.User, error) {
 	return u, nil
 }

+func (srv *UserService) GetUserByEmail(email string) (*models.User, error) {
+	return srv.repository.GetByEmail(email)
+}
+
+func (srv *UserService) GetUserByResetToken(resetToken string) (*models.User, error) {
+	return srv.repository.GetByResetToken(resetToken)
+}
+
 func (srv *UserService) GetAll() ([]*models.User, error) {
 	return srv.repository.GetAll()
 }

-func (srv *UserService) CreateOrGet(signup *models.Signup) (*models.User, bool, error) {
+func (srv *UserService) GetActive() ([]*models.User, error) {
+	minDate := time.Now().Add(-24 * time.Hour * time.Duration(srv.Config.App.InactiveDays))
+	return srv.repository.GetByLastActiveAfter(minDate)
+}
+
+func (srv *UserService) Count() (int64, error) {
+	return srv.repository.Count()
+}
+
+func (srv *UserService) CreateOrGet(signup *models.Signup, isAdmin bool) (*models.User, bool, error) {
 	u := &models.User{
 		ID:       signup.Username,
+		Email:    signup.Email,
 		ApiKey:   uuid.NewV4().String(),
 		Password: signup.Password,
+		IsAdmin:  isAdmin,
 	}

 	if hash, err := utils.HashBcrypt(u.Password, srv.Config.Security.PasswordSalt); err != nil {
@ -99,6 +118,10 @@ func (srv *UserService) MigrateMd5Password(user *models.User, login *models.Logi
 	return srv.repository.UpdateField(user, "password", user.Password)
 }

+func (srv *UserService) GenerateResetToken(user *models.User) (*models.User, error) {
+	return srv.repository.UpdateField(user, "reset_token", uuid.NewV4())
+}
+
 func (srv *UserService) Delete(user *models.User) error {
 	srv.cache.Flush()
 	return srv.repository.Delete(user)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@ -1,3 +1,3 @@
-sonar.exclusions=**/*_test.go,.idea/**,.vscode/**,mocks/**
+sonar.exclusions=**/*_test.go,.idea/**,.vscode/**,mocks/**,static/**
 sonar.tests=.
 sonar.go.coverage.reportPaths=coverage/coverage.out
--- a/static/assets/app.css
+++ b/static/assets/app.css
@ -4,4 +4,9 @@ body {

 .bg-gray-850 {
    background-color: #242b3a;
+}
+
+::-webkit-calendar-picker-indicator {
+    filter: invert(1);
+    cursor: pointer;
 }
--- a/static/assets/app.js
+++ b/static/assets/app.js
@ -49,6 +49,13 @@ String.prototype.toHHMMSS = function () {
    return hours + ':' + minutes + ':' + seconds
 }

+String.prototype.toHHMM = function () {
+    const sec_num = parseInt(this, 10)
+    const hours = Math.floor(sec_num / 3600)
+    const minutes = Math.floor((sec_num - (hours * 3600)) / 60)
+    return hours + ':' + minutes
+}
+
 function draw(subselection) {
    function getTooltipOptions(key) {
        return {
@ -105,7 +112,7 @@ function draw(subselection) {
                    xAxes: [{
                        scaleLabel: {
                            display: true,
-                            labelString: 'Minutes'
+                            labelString: 'Seconds'
                        }
                    }]
                },
@ -319,8 +326,9 @@ function equalizeHeights() {
 function getTotal(items) {
    const el = document.getElementById('total-span')
    if (!el) return
-    let total = items.reduce((acc, d) => acc + d.total, 0)
-    el.innerText = total.toString().toHHMMSS()
+    const total = items.reduce((acc, d) => acc + d.total, 0)
+    const formatted = total.toString().toHHMM()
+    el.innerText = `${formatted.split(':')[0]} hours, ${formatted.split(':')[1]} minutes`
 }

 function getRandomColor(seed) {
@ -363,21 +371,6 @@ function copyApiKey(event) {
    event.stopPropagation()
 }

-// https://koddsson.com/posts/emoji-favicon/
-const favicon = document.querySelector('link[rel=icon]')
-if (favicon) {
-    const emoji = favicon.getAttribute('data-emoji')
-    if (emoji) {
-        const canvas = document.createElement('canvas')
-        canvas.height = 64
-        canvas.width = 64
-        const ctx = canvas.getContext('2d')
-        ctx.font = '64px serif'
-        ctx.fillText(emoji, 0, 64)
-        favicon.href = canvas.toDataURL()
-    }
-}
-
 // Click outside
 window.addEventListener('click', function (event) {
    if (event.target.classList.contains('popup')) {
--- a/static/assets/icons.js
+++ b/static/assets/icons.js
--- a/static/assets/images/ghicon.svg
+++ b/static/assets/images/ghicon.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g fill="#eee"><path fill-rule="evenodd" clip-rule="evenodd" d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"/><path d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm-.743-.55M28.93 94.535c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zm-.575-.618M31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm0 0M34.573 101.373c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm0 0M39.073 103.324c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm0 0M44.016 103.685c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm0 0M48.614 102.903c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"/></g></svg>
--- a/static/assets/vendor/iconify.basic.min.js
+++ b/static/assets/vendor/iconify.basic.min.js
--- a/static/assets/vendor/tailwind.css
+++ b/static/assets/vendor/tailwind.css
--- a/static/assets/vendor/tailwind.dist.css
+++ b/static/assets/vendor/tailwind.dist.css
--- a/static/assets/vendor/tailwind.min.css
+++ b/static/assets/vendor/tailwind.min.css
--- a/static/assets/vendor/twemoji.min.js
+++ b/static/assets/vendor/twemoji.min.js
--- a/static/contribute.json
+++ b/static/contribute.json
@ -0,0 +1,25 @@
+{
+  "name": "wakapi",
+  "description": "A minimalist, self-hosted WakaTime-compatible backend for coding statistics",
+  "repository": {
+    "url": "https://github.com/muety/wakapi",
+    "license": "GPL-3.0"
+  },
+  "urls": {
+    "prod": "https://wakapi.dev"
+  },
+  "bugs": {
+    "list": "https://github.com/muety/wakapi/issues",
+    "report": "https://github.com/muety/wakapi/issues/new"
+  },
+  "keywords": [
+    "go",
+    "golang",
+    "html5",
+    "sql",
+    "productivity",
+    "timetracking",
+    "selfhosted",
+    "devtools"
+  ]
+}
--- a/tailwind.config.js
+++ b/tailwind.config.js
@ -0,0 +1,7 @@
+module.exports = {
+    purge: {
+        enabled: true,
+        mode: 'all',
+        content: ['./views/*.tpl.html']
+    }
+}
--- a/utils/auth.go
+++ b/utils/auth.go
@ -36,7 +36,7 @@ func ExtractBasicAuth(r *http.Request) (username, password string, err error) {

 func ExtractBearerAuth(r *http.Request) (key string, err error) {
 	authHeader := strings.Split(r.Header.Get("Authorization"), " ")
-	if len(authHeader) != 2 || authHeader[0] != "Basic" {
+	if len(authHeader) != 2 || (authHeader[0] != "Basic" && authHeader[0] != "Bearer") {
 		return key, errors.New("failed to extract API key")
 	}

--- a/utils/common.go
+++ b/utils/common.go
@ -2,16 +2,25 @@ package utils

 import (
 	"errors"
+	"github.com/muety/wakapi/config"
 	"regexp"
 	"time"
 )

 func ParseDate(date string) (time.Time, error) {
-	return time.Parse("2006-01-02 15:04:05", date)
+	return time.Parse(config.SimpleDateFormat, date)
+}
+
+func ParseDateTime(date string) (time.Time, error) {
+	return time.Parse(config.SimpleDateTimeFormat, date)
 }

 func FormatDate(date time.Time) string {
-	return date.Format("2006-01-02 15:04:05")
+	return date.Format(config.SimpleDateFormat)
+}
+
+func FormatDateTime(date time.Time) string {
+	return date.Format(config.SimpleDateTimeFormat)
 }

 func FormatDateHuman(date time.Time) string {
--- a/utils/date.go
+++ b/utils/date.go
@ -10,7 +10,7 @@ func StartOfToday() time.Time {
 }

 func StartOfDay(date time.Time) time.Time {
-	return time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, date.Location())
+	return FloorDate(date)
 }

 func StartOfWeek() time.Time {
@ -29,6 +29,20 @@ func StartOfYear() time.Time {
 	return time.Date(ref.Year(), time.January, 1, 0, 0, 0, 0, ref.Location())
 }

+// FloorDate rounds date down to the start of the day
+func FloorDate(date time.Time) time.Time {
+	return date.Truncate(24 * time.Hour)
+}
+
+// CeilDate rounds date up to the start of next day if date is not already a start (00:00:00)
+func CeilDate(date time.Time) time.Time {
+	floored := FloorDate(date)
+	if floored == date {
+		return floored
+	}
+	return floored.Add(24 * time.Hour)
+}
+
 func SplitRangeByDays(from time.Time, to time.Time) [][]time.Time {
 	intervals := make([][]time.Time, 0)

--- a/utils/date_test.go
+++ b/utils/date_test.go
@ -0,0 +1,30 @@
+package utils
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestDate_Ceil(t *testing.T) {
+	tests := []struct {
+		in  string
+		out string
+	}{
+		{
+			"02 Jan 06 15:04 MST",
+			"03 Jan 06 00:00 MST",
+		},
+		{
+			"03 Jan 06 00:00 MST",
+			"03 Jan 06 00:00 MST",
+		},
+	}
+
+	for _, test := range tests {
+		inDate, _ := time.Parse(time.RFC822, test.in)
+		outDate, _ := time.Parse(time.RFC822, test.out)
+		out := CeilDate(inDate)
+		assert.Equal(t, outDate, out)
+	}
+}
--- a/utils/http.go
+++ b/utils/http.go
@ -2,7 +2,7 @@ package utils

 import (
 	"encoding/json"
-	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
 	"net/http"
 )

@ -10,6 +10,6 @@ func RespondJSON(w http.ResponseWriter, status int, object interface{}) {
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(status)
 	if err := json.NewEncoder(w).Encode(object); err != nil {
-		logbuch.Error("error while writing json response: %v", err)
+		config.Log().Error("error while writing json response: %v", err)
 	}
 }
--- a/utils/summary.go
+++ b/utils/summary.go
@ -16,6 +16,11 @@ func ParseInterval(interval string) (*models.IntervalKey, error) {
 	return nil, errors.New("not a valid interval")
 }

+func MustResolveIntervalRaw(interval string) (from, to time.Time) {
+	_, from, to = ResolveIntervalRaw(interval)
+	return from, to
+}
+
 func ResolveIntervalRaw(interval string) (err error, from, to time.Time) {
 	parsed, err := ParseInterval(interval)
 	if err != nil {
@ -66,7 +71,7 @@ func ResolveInterval(interval *models.IntervalKey) (err error, from, to time.Tim
 }

 func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := extractUser(r)
 	params := r.URL.Query()

 	var err error
@ -74,15 +79,23 @@ func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {

 	if interval := params.Get("interval"); interval != "" {
 		err, from, to = ResolveIntervalRaw(interval)
+	} else if start := params.Get("start"); start != "" {
+		err, from, to = ResolveIntervalRaw(start)
 	} else {
-		from, err = ParseDate(params.Get("from"))
+		from, err = ParseDateTime(params.Get("from"))
 		if err != nil {
-			return nil, errors.New("missing 'from' parameter")
+			from, err = ParseDate(params.Get("from"))
+			if err != nil {
+				return nil, errors.New("missing 'from' parameter")
+			}
 		}

-		to, err = ParseDate(params.Get("to"))
+		to, err = ParseDateTime(params.Get("to"))
 		if err != nil {
-			return nil, errors.New("missing 'to' parameter")
+			to, err = ParseDate(params.Get("to"))
+			if err != nil {
+				return nil, errors.New("missing 'to' parameter")
+			}
 		}
 	}

@ -95,3 +108,13 @@ func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {
 		Recompute: recompute,
 	}, nil
 }
+
+func extractUser(r *http.Request) *models.User {
+	type principalGetter interface {
+		GetPrincipal() *models.User
+	}
+	if p := r.Context().Value("principal"); p != nil {
+		return p.(principalGetter).GetPrincipal()
+	}
+	return nil
+}
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-1.23.6
+1.26.5
--- a/views/foot.tpl.html
+++ b/views/foot.tpl.html
@ -1,2 +1,4 @@
-<script src="assets/vendor/seedrandom.min.js" integrity="sha384-bFS5CG904xYIgxBcrDF4KFNXuM7KeSGsSvS/QTaDqMTEdbaaxjg2Y2TSU3Ygs7wG" crossorigin="anonymous"></script>
-<script src="assets/vendor/Chart.bundle.min.js" integrity="sha384-mZ3q69BYmd4GxHp59G3RrsaFdWDxVSoqd7oVYuWRm2qiXrduT63lQtlhdD9lKbm3" crossorigin="anonymous"></script>
+<script src="assets/vendor/iconify.basic.min.js"></script>
+<script src="assets/vendor/seedrandom.min.js"></script>
+<script src="assets/vendor/Chart.bundle.min.js"></script>
+<script src="assets/icons.js"></script>
--- a/views/footer.tpl.html
+++ b/views/footer.tpl.html
@ -3,7 +3,7 @@
        v{{ getVersion }} @ {{ getDbType }}
    </div>
    <div>
-        Made with &nbsp; 🤍 &nbsp; by <a href="https://muetsch.io" class="border-b border-green-700">Ferdinand Mütsch</a> as <a
+        Made with &nbsp; <span class="iconify inline" data-icon="bi:heart-fill"></span> &nbsp; by <a href="https://muetsch.io" class="border-b border-green-700">Ferdinand Mütsch</a> as <a
                href="https://github.com/muety/wakapi" class="border-b border-green-700">open-source</a> software
    </div>
    <div>
--- a/views/head.tpl.html
+++ b/views/head.tpl.html
@ -2,11 +2,19 @@
    <title>Wakapi – Coding Statistics</title>
    <base href="{{ getBasePath }}/">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
+    <meta property="og:title" content="Wakapi - Coding Statistics" />
+    <meta property="og:type" content="website" />
+    <meta property="og:description" content="Wakapi is an open-source tool that helps you keep track of the time you have spent coding on different projects in different programming languages and more. Ideal for statistics freaks and anyone else.">
+    <meta property="og:image" content="assets/images/screenshot.png" />
    <link rel="apple-touch-icon" sizes="180x180" href="assets/images/apple-touch-icon.png">
    <link rel="icon" type="image/png" sizes="32x32" href="assets/images/favicon-32x32.png">
    <link rel="icon" type="image/png" sizes="16x16" href="assets/images/favicon-16x16.png">
    <link rel="manifest" href="assets/site.webmanifest">
    <link href="assets/vendor/roboto.css" rel="stylesheet">
-    <link href="assets/vendor/tailwind.min.css" rel="stylesheet">
+    {{ if isDev }}
+    <link href="assets/vendor/tailwind.css" rel="stylesheet">
+    {{ else }}
+    <link href="assets/vendor/tailwind.dist.css" rel="stylesheet">
+    {{ end }}
    <link href="assets/app.css" rel="stylesheet">
 </head>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ferdinand Mütsch	ed35e7b82d	chore: increment version	2021-04-16 19:17:30 +02:00
Ferdinand Mütsch	b672859021	fix: rebuild tailwind	2021-04-16 17:09:23 +02:00
Ferdinand Mütsch	d3713017e3	fix: include icon library to fix missing emojis on some platforms (resolve #119 )	2021-04-16 17:07:11 +02:00
Ferdinand Mütsch	dca736752e	refactor: logging (resolve #169 )	2021-04-16 16:02:55 +02:00
Ferdinand Mütsch	337b39481b	chore: set basic security headers (resolve #174 )	2021-04-16 12:35:49 +02:00
Ferdinand Mütsch	b9ea6530f9	fix: serve static file from local fs when on dev (fix #176 )	2021-04-16 12:24:19 +02:00
Ferdinand Mütsch	a9739a6db0	fix: make range picker show actual range with ceiled to date (fix #175 )	2021-04-16 11:53:37 +02:00
Ferdinand Mütsch	a22836a644	fix: remove uniqueness constraint for email	2021-04-14 00:17:02 +02:00
Ferdinand Mütsch	c8e7fb461a	Merge remote-tracking branch 'origin/master'	2021-04-13 23:50:10 +02:00
Ferdinand Mütsch	c2b099378a	chore: add contribute.json (resolve #170 )	2021-04-13 23:49:54 +02:00
Ferdinand Mütsch	20dd4cf0ab	fix: precedence in case of multiple matching language mappings (fix #172 )	2021-04-13 23:39:31 +02:00
Ferdinand Mütsch	f8e1453754	fix: failing auto migration of users table (resolve #171 )	2021-04-13 23:23:57 +02:00
Ferdinand Mütsch	fbd90d2cc1	ci: adapt go version in github build action	2021-04-13 10:34:35 +02:00
Ferdinand Mütsch	129e208169	fix: very basic sentry error logging	2021-04-13 00:02:55 +02:00
Ferdinand Mütsch	9fd9ffbb3d	fix: missing summary aggregation after days without heartbeats (see #168 )	2021-04-12 23:36:22 +02:00
Ferdinand Mütsch	0884f620f1	chore: increment version	2021-04-12 22:58:52 +02:00
Ferdinand Mütsch	7ab9c45f4f	fix: table drop in migration	2021-04-12 22:58:40 +02:00
Ferdinand Mütsch	915436822b	fix: make mail provider configs non-nullable	2021-04-12 22:57:52 +02:00
Ferdinand Mütsch	0f1d1bce4d	fix: summary missing interval calculation (fix #168 )	2021-04-12 22:57:15 +02:00
Steven Tang	6256c8e10a	ref: embed files, bump to go 1.16 (#167 ) * ref: embed portion of files * fix: readd pkger * ref: embed version.txt * fix: wrong mail template import path * refactor: get rid of sql-migrate refactor: get rid of pkger in favor of go embed (resolve #164) * chore: remove unused var [ci-skip] Co-authored-by: Ferdinand Mütsch <ferdinand@muetsch.io>	2021-04-11 10:42:43 +00:00
Ferdinand Mütsch	2a9fbfdfd7	chore: send notification on successful import	2021-04-10 10:48:06 +02:00
Ferdinand Mütsch	56247b4e1e	fix: throttle wakatime api requests (attempt to fix #152 )	2021-04-10 10:18:09 +02:00
Ferdinand Mütsch	9d7afde6a9	chore: version	2021-04-10 00:34:37 +02:00
Ferdinand Mütsch	0df0168584	Merge branch '133-password-resets'	2021-04-10 00:34:20 +02:00
Ferdinand Mütsch	a6fe15d69b	chore: add support button	2021-04-10 00:27:01 +02:00
Ferdinand Mütsch	ae363c1c82	Merge remote-tracking branch 'origin/master'	2021-04-10 00:17:13 +02:00
Ferdinand Mütsch	127a614190	Merge pull request #163 from notarock/master Add Open Graph meta tags	2021-04-10 00:16:07 +02:00
Ferdinand Mütsch	b8cefeb595	chore: add html lang	2021-04-10 00:15:20 +02:00
Ferdinand Mütsch	ae97095688	chore: exclude health endpoint from sentry tracing	2021-04-10 00:10:16 +02:00
Ferdinand Mütsch	4706809170	feat: smtp mail provider implementation	2021-04-10 00:07:13 +02:00
Ferdinand Mütsch	ddc29f0414	chore: log mailwhale error	2021-04-09 22:51:03 +02:00
Roch D'Amour	f4af787ecf	Add Open Graph meta tags	2021-04-09 00:37:14 -04:00
Ferdinand Mütsch	da6a00fec5	fix: adapt tests	2021-04-05 23:00:21 +02:00
Ferdinand Mütsch	6ad33e3c3b	feat: password resets (resolve #133 )	2021-04-05 22:57:57 +02:00
Ferdinand Mütsch	e6e134678a	wip: password resets	2021-04-05 16:25:13 +02:00
Ferdinand Mütsch	1783858854	fix: minor fixes (resolve #151 ) (resolve #154 )	2021-04-04 10:42:27 +02:00
Ferdinand Mütsch	e1d040bd55	docs: mention wiki in docs	2021-04-04 10:23:35 +02:00
Ferdinand Mütsch	7f3a654b26	fix: import bug with small number of heartbeats (fix #160 )	2021-04-04 09:45:32 +02:00
Ferdinand Mütsch	2b57da224c	chore: write authenticated user to logs and sentry	2021-03-26 13:10:10 +01:00
Ferdinand Mütsch	01d51b78b1	chore: include postman collection (resolve #148 ) [ci-skip]	2021-03-25 15:50:47 +01:00
Ferdinand Mütsch	6b83600acc	fix: responsiveness in firefox mobile (resolve #137 )	2021-03-25 10:51:36 +01:00
Ferdinand Mütsch	65bbd744b5	chore: exclude static assets from sonarqube [ci skip]	2021-03-24 23:38:38 +01:00
Ferdinand Mütsch	81ca703501	fix: disable recompute caching (resolve #149 )	2021-03-24 23:31:04 +01:00
Ferdinand Mütsch	2d1010e9d9	chore: add caching to badge endpoint chore: add type index for summary items	2021-03-24 21:49:42 +01:00
Ferdinand Mütsch	5ca9a6a8be	test: add further tests for heartbeat augmentation (resolve #144 )	2021-03-24 20:43:49 +01:00
Tobias Dillig	caf87de887	fix: allow custom mappings with dot (resolve #144 )	2021-03-24 19:25:36 +01:00
Ferdinand Mütsch	9fc3c65efe	feat: sentry integration (resolve #142 )	2021-03-23 22:12:15 +01:00
Ferdinand Mütsch	f73285160d	fix: delete language mapping (resolve #143 )	2021-03-22 21:20:23 +01:00
Ferdinand Mütsch	1f557d562f	chore: remove integrity hashes from assets files since served locally anyway (resolve #141 )	2021-03-20 09:55:21 +01:00
Ferdinand Mütsch	3685f3a156	chore: add svelte language mapping	2021-03-13 21:01:24 +01:00
Ferdinand Mütsch	b3afe9bfa2	feat: gui for sample data generator script	2021-03-11 23:54:35 +01:00
Ferdinand Mütsch	9de2c20885	fix: enable strict slash mode for api router	2021-03-09 23:56:38 +01:00
Ferdinand Mütsch	2846748b26	hotfix: remove user agent check for shields.io	2021-03-09 23:15:35 +01:00
Ferdinand Mütsch	f2f6fe1483	Merge pull request #140 from notarock/master Prevent invalid dates ranges in summary page	2021-03-06 09:05:11 +01:00
Roch D'Amour	17ddd7ca76	Prevent invalid dates ranges in summary page It is currently possible to enter a "End" date that is before the start date, or a "start" date that is after the end date. This commit prevent the user from directly entering an invalid date by setting a "min" and "max" value on those two date picker. There are no validation or the server's side, but that shouldn't be a problem since the invalid date will not create an error, it will simply not return any data.	2021-03-06 02:38:28 -05:00
Ferdinand Mütsch	292ae41c58	fix: batch insert conflict bug (resolve #139 )	2021-03-05 21:39:21 +01:00
Ferdinand Mütsch	4f86f67716	chore: fix success messages	2021-02-21 13:12:29 +01:00
Ferdinand Mütsch	017530ac4a	chore: introduce user email addresses (resolve #132 )	2021-02-21 13:02:11 +01:00
Ferdinand Mütsch	81d3251856	fix: use compatible tailwind version	2021-02-21 13:02:01 +01:00
Ferdinand Mütsch	16af17fc37	chore: save heartbeats created date	2021-02-21 12:02:19 +01:00
Ferdinand Mütsch	701ed0a3e1	chore: purge tailwind classes (resolve #22 )	2021-02-21 11:14:55 +01:00
Ferdinand Mütsch	218c93e975	Merge pull request #136 from notarock/master Fixed scale label to show seconds instead of minutes	2021-02-21 10:38:52 +01:00
Roch D'Amour	44de057022	Fixed scale label to show seconds instead of minutes	2021-02-21 04:27:45 -05:00
Ferdinand Mütsch	e55adf6287	fix: mysql character encoding (resolve #131 )	2021-02-17 21:04:22 +01:00
Ferdinand Mütsch	56800be8e8	chore: change info message in migration (resolve #128 )	2021-02-16 17:18:56 +01:00
Steven Tang	c149766ecc	fix: drop_badges_column migration for sqlite	2021-02-16 22:07:41 +11:00
Ferdinand Mütsch	759e8e4dfd	chore: change logging middleware to use different output	2021-02-14 16:41:02 +01:00
Ferdinand Mütsch	708863fd33	fix: broken migration on postgres (resolve #127 )	2021-02-14 16:02:05 +01:00
Ferdinand Mütsch	e2f046a83d	fix: add migration for newly introduced has data field	2021-02-13 13:04:47 +01:00
Ferdinand Mütsch	30510591eb	feat: custom time intervals (resolve #115 )	2021-02-13 12:59:59 +01:00
Ferdinand Mütsch	daf67b844a	refctor: change active users query	2021-02-13 11:23:58 +01:00
Ferdinand Mütsch	6b0b3bddda	fix: include overall total number of heartbeats again	2021-02-12 23:16:20 +01:00
Ferdinand Mütsch	ef17d06763	fix: tests [ci skip]	2021-02-12 23:10:25 +01:00
Ferdinand Mütsch	301cab4be4	feat: per-user heartbeats count metrics	2021-02-12 23:06:48 +01:00
Ferdinand Mütsch	703805412b	chore: code smell [ci skip]	2021-02-12 19:26:23 +01:00
Ferdinand Mütsch	88eb68b1a9	feat: add prometheus metrics without external standalone exporter	2021-02-12 18:50:13 +01:00
Ferdinand Mütsch	8191a52ce1	chore: make very first user have admin privileges	2021-02-12 18:49:47 +01:00
Ferdinand Mütsch	5b3e88247e	chore: introduce user admin flag	2021-02-12 18:13:49 +01:00
Ferdinand Mütsch	59b85863cc	chore: accept bearer prefix in auth header	2021-02-12 18:12:46 +01:00
				`@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g fill="#eee"><path fill-rule="evenodd" clip-rule="evenodd" d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"/><path d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm-.743-.55M28.93 94.535c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zm-.575-.618M31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm0 0M34.573 101.373c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm0 0M39.073 103.324c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm0 0M44.016 103.685c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm0 0M48.614 102.903c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"/></g></svg>
 @ -1 +1 @@
 .23.6
 .26.5