docs: instructions for go install [ci skip]

elaborate on cloud server API URL [ci skip]

.gitattributes

@@ -0,0 +1,6 @@
+* text=auto
+*.db -text
+*.png -text
+*.br -text
+*.ico -text
+*.woff2 -text

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,19 @@
+---
+name: Bug
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is. Please briefly describe how to reproduce the bug as well as _expected_ vs. _actual_ behavior. Optionally include screenshots and server logs, if helpful.
+
+**System information**
+Please provide information on:
+* Wakapi version
+* Operating system
+    * If Linux: which distro?
+    * If Docker: which image and tag?
+* Database (SQLite, MySQL, ... ?)

.github/ISSUE_TEMPLATE/other.md

@@ -0,0 +1,10 @@
+---
+name: Other (feature request, question, ...)
+about: Anything else
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+

.github/workflows/ci.yml

@@ -0,0 +1,100 @@
+name: ci
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    name: 'Unit- & API tests'
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.18
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: go get
+
+    - name: Unit Tests
+      run: go test ./... -run ./...
+
+    - name: API Tests
+      run: |
+        npm -g install newman
+        ./testing/run_api_tests.sh
+
+  mapi:
+    name: 'Automated pen-tests with Mayhem for API'
+    runs-on: ubuntu-latest
+    steps:
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.18
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: go get
+
+    - name: Build
+      run: GO111MODULE=on go build -v .
+
+    - name: start wakapi
+      run: ./wakapi --config config.default.yml &
+
+    - name: create a trivial testing user
+      run: sqlite3 wakapi_db.db "insert into users (id, api_key) values ('mapi', 'test-api-key')"
+
+    - name: Run Mayhem for API
+      uses: ForAllSecure/mapi-action@v1
+      continue-on-error: true
+      with:
+        mapi-token: ${{ secrets.MAPI_TOKEN }}
+        api-url: http://localhost:3000/api/
+        api-spec: static/docs/swagger.yaml
+        target: muety/wakapi
+        duration: 1min
+        sarif-report: mapi.sarif
+        run-args: |
+          --header-auth
+          Authorization: Basic dGVzdC1hcGkta2V5
+
+    - name: Upload SARIF file
+      uses: github/codeql-action/upload-sarif@v1
+      with:
+        sarif_file: mapi.sarif
+
+  build:
+    name: 'Build (Win, Linux, Mac)'
+
+    strategy:
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.18
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: go get
+
+    - name: Build
+      run: go build -v .

.github/workflows/docker.yml

@@ -0,0 +1,55 @@
+name: Publish Docker Image
+
+on:
+  push:
+    tags:
+      - '*.*.*'
+      - '!*.*.*-*'
+
+jobs:
+  docker-publish:
+    name: 'Build and publish Docker image'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Docker Metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}
+            n1try/wakapi
+          tags: |
+            latest
+            alpine
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{version}}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: Dockerfile
+          push: true
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=registry,ref=n1try/wakapi:buildcache-alpine
+          cache-to: type=registry,ref=n1try/wakapi:buildcache-alpine,mode=max

.github/workflows/linux-build-on-release.yml

@@ -1,49 +0,0 @@
-name: Build Wakapi on Linux
-
-on:
-  push:
-  pull_request:
-  release:
-    types:
-      - created
-
-jobs:
-  build-and-release:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.13
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Get dependencies
-      run: |
-        go get github.com/markbates/pkger/cmd/pkger
-        go get
-        go generate
-
-    - name: Build
-      run: GO111MODULE=on go build -v .
-
-    - name: Zip executable and sample config
-      if: github.event_name == 'release'
-      run: |
-        cp config.default.yml config.yml
-        zip -9 release.zip wakapi config.yml
-
-    - name: Upload built executable to Release
-      if: github.event_name == 'release'
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: release.zip
-        asset_name: wakapi_linux_amd64.zip
-        asset_content_type: application/gzip

.github/workflows/release.yml

@@ -0,0 +1,56 @@
+name: Release
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+  release:
+    name: 'Build, package and release to GitHub'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          - platform: ubuntu-latest
+            alias: linux
+          - platform: macos-latest
+            alias: mac
+          - platform: windows-latest
+            alias: win
+
+    runs-on: ${{ matrix.platform }}
+    steps:
+
+    - name: Set up Go 1.x
+      uses: actions/setup-go@v2
+      with:
+        go-version: ^1.18
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
+
+    - name: Get dependencies
+      run: go get
+
+    - name: Build
+      run: go build -v .
+
+    - name: Compress working folder on Windows
+      if: runner.os == 'Windows'
+      run: |
+        cp .\config.default.yml .\config.yml
+        Compress-Archive -Path .\wakapi.exe, .\config.yml -DestinationPath wakapi_${{ matrix.alias }}_amd64.zip
+    - name: Compress working folder on Unix
+      if: runner.os != 'Windows'
+      run: |
+        cp config.default.yml config.yml
+        zip -9 wakapi_${{ matrix.alias }}_amd64.zip wakapi config.yml
+
+    - name: Upload built executable to Release
+      uses: softprops/action-gh-release@v1
+      with:
+        files: wakapi_${{ matrix.alias }}_amd64.zip

.github/workflows/win-build-on-release.yml

@@ -1,52 +0,0 @@
-name: Build Wakapi on Windows
-
-on:
-  push:
-  pull_request:
-  release:
-    types:
-      - created
-
-jobs:
-  build-and-release:
-    name: Build
-    runs-on: windows-latest
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.13
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - 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"
-
-    - name: Build
-      run: go build -v .
-
-    - name: Compress working folder
-      if: github.event_name == 'release'
-      run: |
-        cp .\config.default.yml .\config.yml
-        Compress-Archive -Path .\wakapi.exe, .\config.yml -DestinationPath release.zip
-
-    - name: Upload built executable to Release
-      if: github.event_name == 'release'
-      uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: release.zip
-        asset_name: wakapi_win_amd64.zip
-        asset_content_type: application/gzip

.gitignore

@@ -7,4 +7,7 @@ build
 *.db
 config*.yml
 !config.default.yml
+!testing/config.testing.yml
 pkged.go
+package-lock.json
+node_modules

.gitpod.yml

@@ -0,0 +1,6 @@
+# List the start up tasks. Learn more https://www.gitpod.io/docs/config-start-tasks/
+tasks:
+  - before: printf "\n[settings]\napi_key = $WAKA_TIME_API_KEY\napi_url = $WAKA_TIME_API_URL\n" > ~/.wakatime.cfg
+ports:
+  - port: 3000
+    visibility: public

Dockerfile

@@ -1,19 +1,33 @@
-# Build Stage
+# To build locally: docker buildx build . -t wakapi --load
 
-FROM golang:1.15 AS build-env
+# Preparation to save some time
+FROM --platform=$BUILDPLATFORM golang:1.18-alpine AS prep-env
 WORKDIR /src
 
 ADD ./go.mod .
-RUN go mod download && go get github.com/markbates/pkger/cmd/pkger
-
+RUN go mod download
 ADD . .
-RUN go generate && go build -o wakapi
+
+RUN wget "https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh" -O wait-for-it.sh && \
+    chmod +x wait-for-it.sh
+
+# Build Stage
+FROM golang:1.18-alpine AS build-env
+
+# Required for go-sqlite3
+RUN apk add --no-cache gcc musl-dev
+
+WORKDIR /src
+COPY --from=prep-env /src .
+
+RUN go build -v -o wakapi
 
 WORKDIR /app
 RUN cp /src/wakapi . && \
     cp /src/config.default.yml config.yml && \
     sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' config.yml && \
-    cp /src/wait-for-it.sh .
+    cp /src/wait-for-it.sh . && \
+    cp /src/entrypoint.sh .
 
 # Run Stage
 
@@ -21,12 +35,12 @@ RUN cp /src/wakapi . && \
 # to override config values using `-e` syntax.
 # Available options can be found in [README.md#-configuration](README.md#-configuration)
 
-FROM debian
+FROM alpine:3
 WORKDIR /app
 
-RUN apt update && \
-    apt install -y ca-certificates
+RUN apk add --no-cache bash ca-certificates tzdata
 
+# See README.md and config.default.yml for all config options
 ENV ENVIRONMENT prod
 ENV WAKAPI_DB_TYPE sqlite3
 ENV WAKAPI_DB_USER ''
@@ -36,9 +50,10 @@ ENV WAKAPI_DB_NAME=/data/wakapi.db
 ENV WAKAPI_PASSWORD_SALT ''
 ENV WAKAPI_LISTEN_IPV4 '0.0.0.0'
 ENV WAKAPI_INSECURE_COOKIES 'true'
+ENV WAKAPI_ALLOW_SIGNUP 'true'
 
 COPY --from=build-env /app .
 
-VOLUME /data
+EXPOSE 3000
 
-ENTRYPOINT ./wait-for-it.sh
+ENTRYPOINT /app/entrypoint.sh

README.md

@@ -1,16 +1,14 @@
-<h1 align="center">📊 Wakapi</h1>
-
 <p align="center">
-  <img src="https://badges.fw-web.space/github/license/muety/wakapi">
-  <a href="https://saythanks.io/to/n1try"><img src="https://badges.fw-web.space/badge/SayThanks.io-%E2%98%BC-1EAEDB.svg"></a>
-  <a href="https://liberapay.com/muety/"><img src="https://badges.fw-web.space/liberapay/receives/muety.svg?logo=liberapay"></a>
-  <img src="https://badges.fw-web.space/endpoint?url=https://wakapi.dev/api/compat/shields/v1/n1try/interval:any/project:wakapi&color=blue&label=wakapi">
+  <img src="static/assets/images/logo-gh.svg" width="350">
 </p>
 
 <p align="center">
-  <a href="https://goreportcard.com/report/github.com/muety/wakapi"><img src="https://goreportcard.com/badge/github.com/muety/wakapi"></a>
+  <img src="https://badges.fw-web.space/github/license/muety/wakapi">
+  <a href="#-treeware"><img src="https://badges.fw-web.space:/treeware/trees/muety/wakapi?color=%234EC820&label=%F0%9F%8C%B3%20trees"></a>
+  <a href="https://liberapay.com/muety/"><img src="https://badges.fw-web.space/liberapay/receives/muety.svg?logo=liberapay"></a>
+  <img src="https://wakapi.dev/api/badge/n1try/interval:any/project:wakapi?label=wakapi">
   <img src="https://badges.fw-web.space/github/languages/code-size/muety/wakapi">
-  <a href="https://sonarcloud.io/dashboard?id=muety_wakapi"><img src="https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=sqale_index"></a>
+  <a href="https://goreportcard.com/report/github.com/muety/wakapi"><img src="https://goreportcard.com/badge/github.com/muety/wakapi"></a>
   <a href="https://sonarcloud.io/dashboard?id=muety_wakapi"><img src="https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=ncloc"></a>
 </p>
 
@@ -22,7 +20,7 @@
     <span> | </span>
     <a href="#-features">Features</a>
     <span> | </span>
-    <a href="#-how-to-use">How to use</a>
+    <a href="#%EF%B8%8F-how-to-use">How to use</a>
     <span> | </span>
     <a href="https://github.com/muety/wakapi/issues">Issues</a>
     <span> | </span>
@@ -31,215 +29,380 @@
 </div>
 
 <p align="center">
-  <img src="https://anchr.io/i/bxQ69.png" width="500px">
+  <img src="static/assets/images/screenshot.webp" width="500px">
 </p>
 
-## Table of Contents
-* [User Survey](#-user-survey)
-* [Features](#-features)
-* [How to use](#-how-to-use)
-* [Configuration Options](#-configuration-options)
-* [API Endpoints](#-api-endpoints)
-* [Prometheus Export](#-prometheus-export)
-* [Best Practices](#-best-practices)
-* [Developer Notes](#-developer-notes)
-* [Support](#-support)
-* [FAQs](#-faqs)
-
-## 📬 **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!
+Installation instructions can be found below and in the [Wiki](https://github.com/muety/wakapi/wiki).
 
 ## 🚀 Features
+
 * ✅ 100 % free and open-source
 * ✅ Built by developers for developers
 * ✅ Statistics for projects, languages, editors, hosts and operating systems
 * ✅ Badges
+* ✅ Weekly E-Mail reports
 * ✅ REST API
 * ✅ Partially compatible with WakaTime
-* ✅ WakaTime relay to use both
-* ✅ Support for [Prometheus](https://github.com/muety/wakapi#%EF%B8%8F-prometheus-export) exports
+* ✅ WakaTime integration
+* ✅ Support for Prometheus exports
+* ✅ Lightning fast
 * ✅ Self-hosted
 
+## 🚧 Roadmap
+
+Plans for the near future mainly include, besides usual improvements and bug fixes, a UI redesign as well as additional types of charts and statistics (see [#101](https://github.com/muety/wakapi/issues/101), [#76](https://github.com/muety/wakapi/issues/76), [#12](https://github.com/muety/wakapi/issues/12)). If you have feature requests or any kind of improvement proposals feel free to open an issue or share them in our [user survey](https://github.com/muety/wakapi/issues/82).
+
 ## ⌨️ How to use?
-There are different options for how to use Wakapi, ranging from out hosted cloud service to self-hosting it. Regardless of which option choose, you will always have to do the [client setup](#-client-setup) in addition. 
+
+There are different options for how to use Wakapi, ranging from our hosted cloud service to self-hosting it. Regardless of which option choose, you will always have to do the [client setup](#-client-setup) in addition.
 
 ### ☁️ Option 1: Use [wakapi.dev](https://wakapi.dev)
-If you want to you out free, hosted cloud service, all you need to do is create an account and the set up your client-side tooling (see below).
 
-However, we do not guarantee data persistence, so you might potentially lose your data if the service is taken down some day ❕
+If you want to try out a free, hosted cloud service, all you need to do is create an account and then set up your client-side tooling (see below).
+
+### 📦 Option 2: Quick-run a release
+
+```bash
+$ curl -L https://wakapi.dev/get | bash
+```
+
+### 🐳 Option 3: Use Docker
 
-### 🐳 Option 2: Use Docker
 ```bash
 # Create a persistent volume
 $ docker volume create wakapi-data
 
+$ SALT="$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1)"
+
 # Run the container
 $ docker run -d \
   -p 3000:3000 \
-  -e "WAKAPI_PASSWORD_SALT=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1)" \
+  -e "WAKAPI_PASSWORD_SALT=$SALT" \
   -v wakapi-data:/data \
-  --name wakapi n1try/wakapi
+  --name wakapi \
+  ghcr.io/muety/wakapi:latest
 ```
 
 **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.
 
-### 📦 Option 3: Run a release
-```bash
-# Download the release and unpack it
-$ wget https://github.com/muety/wakapi/releases/download/1.20.2/wakapi_linux_amd64.zip
-$ unzip wakapi_linux_amd64.zip
+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.
 
-# Optionally adapt config to your needs
-$ vi config.yml
+### 🧑‍💻 Option 4: Compile and run from source
 
-# Run it
-$ ./wakapi
-```
-
-### 🧑‍💻 Option 4: Run from source
 #### Prerequisites
-* Go >= 1.13 (with `$GOPATH` properly set)
+
+* Go >= 1.18
 * gcc (to compile [go-sqlite3](https://github.com/mattn/go-sqlite3))
-    * Fedora / RHEL: `dnf install @development-tools`
-    * Ubuntu / Debian: `apt install build-essential`
-    * Windows: See [here](https://github.com/mattn/go-sqlite3/issues/214#issuecomment-253216476)
+  * Fedora / RHEL: `dnf install @development-tools`
+  * Ubuntu / Debian: `apt install build-essential`
+  * Windows: See [here](https://github.com/mattn/go-sqlite3/issues/214#issuecomment-253216476)
+
+#### Compile & run
 
-#### Compile & Run
 ```bash
-# Adapt config to your needs
-$ cp config.default.yml config.yml
-$ vi config.yml
+# Build and install
+# Alternatively: go build -o wakapi
+$ go install github.com/muety/wakapi@latest
 
-# Install packaging tool
-$ export GO111MODULE=on
-$ go get github.com/markbates/pkger/cmd/pkger
-
-# Build the executable
-$ go generate
-$ go build -o wakapi
+# Get default config and customize
+$ curl -o wakapi.yml https://raw.githubusercontent.com/muety/wakapi/master/config.default.yml
+$ vi wakapi.yml
 
 # Run it
-$ ./wakapi
+$ ./wakapi -config wakapi.yml
 ```
 
-**Note:** By default, the application is running in dev mode. However, it is recommended to set `ENV=production` for enhanced performance and security. To still be able to log in when using production mode, you either have to run Wakapi behind a reverse proxy, that enables for HTTPS encryption (see [best practices](#best-practices)) or set `security.insecure_cookies = true` in `config.yml`.
+**Note:** Check the comments in `config.yml` for best practices regarding security configuration and more.
 
-### 💻 Client Setup
-Wakapi relies on the open-source [WakaTime](https://github.com/wakatime/wakatime) client tools. In order to collect statistics to Wakapi, you need to set them up.
+💡 When running Wakapi standalone (without Docker), it is recommended to run it as a [SystemD service](etc/wakapi.service). 
+
+### 💻 Client setup
+
+Wakapi relies on the open-source [WakaTime](https://github.com/wakatime/wakatime) client tools. In order to collect statistics for Wakapi, you need to set them up.
 
 1. **Set up WakaTime** for your specific IDE or editor. Please refer to the respective [plugin guide](https://wakatime.com/plugins)
-2. **Editing your local `~/.wakatime.cfg`** file as follows
+2. **Edit your local `~/.wakatime.cfg`** file as follows.
 
 ```ini
 [settings]
 
-# Your Wakapi server URL or 'https://wakapi.dev/api/heartbeat' when using the cloud server
-api_url = http://localhost:3000/api/heartbeat
+# Your Wakapi server URL or 'https://wakapi.dev/api' when using the cloud server
+api_url = http://localhost:3000/api
 
 # Your Wakapi API key (get it from the web interface after having created an account)
 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.
+## 🔧 Configuration options
 
-| YAML Key                  | Environment Variable      | Default      | Description                                                         |
-|---------------------------|---------------------------|--------------|---------------------------------------------------------------------|
-| `env`                       | `ENVIRONMENT`               | `dev`          | Whether to use development- or production settings                  |
-| `app.custom_languages`      | -                           | -              | Map from file endings to language names                             |
-| `server.port`               | `WAKAPI_PORT`               | `3000`         | Port to listen on                                                   |
-| `server.listen_ipv4`        | `WAKAPI_LISTEN_IPV4`        | `127.0.0.1`    | IPv4 network address to listen on (leave blank to disable IPv4)     |
-| `server.listen_ipv6`        | `WAKAPI_LISTEN_IPV6`        | `::1`          | IPv6 network address to listen on (leave blank to disable IPv6)     |
-| `server.tls_cert_path`      | `WAKAPI_TLS_CERT_PATH`      | -              | Path of SSL server certificate (leave blank to not use HTTPS)       |
-| `server.tls_key_path`       | `WAKAPI_TLS_KEY_PATH`       | -              | Path of SSL server private key (leave blank to not use HTTPS)       |
-| `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 |
-| `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.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) |
+You can specify configuration options either via a config file (default: `config.yml`, customizable through the `-c` argument) or via environment variables. Here is an overview of all options.
+
+| YAML key / Env. variable                                                     | Default                                          | Description                                                                                                                                                              |
+|------------------------------------------------------------------------------|--------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `env` /<br>`ENVIRONMENT`                                                     | `dev`                                            | Whether to use development- or production settings                                                                                                                       |
+| `app.aggregation_time` /<br>`WAKAPI_AGGREGATION_TIME`                        | `02:15`                                          | Time of day at which to periodically run summary generation for all users                                                                                                |
+| `app.report_time_weekly` /<br>`WAKAPI_REPORT_TIME_WEEKLY`                    | `fri,18:00`                                      | Week day and time at which to send e-mail reports                                                                                                                        |
+| `app.import_batch_size` /<br>`WAKAPI_IMPORT_BATCH_SIZE`                      | `50`                                             | Size of batches of heartbeats to insert to the database during importing from external services                                                                          |
+| `app.inactive_days` /<br>`WAKAPI_INACTIVE_DAYS`                              | `7`                                              | Number of days after which to consider a user inactive (only for metrics)                                                                                                |
+| `app.heartbeat_max_age /`<br>`WAKAPI_HEARTBEAT_MAX_AGE`                      | `4320h`                                          | Maximum acceptable age of a heartbeat (see [`ParseDuration`](https://pkg.go.dev/time#ParseDuration))                                                                     |
+| `app.custom_languages`                                                       | -                                                | Map from file endings to language names                                                                                                                                  |
+| `app.avatar_url_template` /<br>`WAKAPI_AVATAR_URL_TEMPLATE`                  | (see [`config.default.yml`](config.default.yml)) | URL template for external user avatar images (e.g. from [Dicebear](https://dicebear.com) or [Gravatar](https://gravatar.com))                                            |
+| `server.port` /<br> `WAKAPI_PORT`                                            | `3000`                                           | Port to listen on                                                                                                                                                        |
+| `server.listen_ipv4` /<br> `WAKAPI_LISTEN_IPV4`                              | `127.0.0.1`                                      | IPv4 network address to listen on (leave blank to disable IPv4)                                                                                                          |
+| `server.listen_ipv6` /<br> `WAKAPI_LISTEN_IPV6`                              | `::1`                                            | IPv6 network address to listen on (leave blank to disable IPv6)                                                                                                          |
+| `server.listen_socket` /<br> `WAKAPI_LISTEN_SOCKET`                          | -                                                | UNIX socket to listen on (leave blank to disable UNIX socket)                                                                                                            |
+| `server.timeout_sec` /<br> `WAKAPI_TIMEOUT_SEC`                              | `30`                                             | Request timeout in seconds                                                                                                                                               |
+| `server.tls_cert_path` /<br> `WAKAPI_TLS_CERT_PATH`                          | -                                                | Path of SSL server certificate (leave blank to not use HTTPS)                                                                                                            |
+| `server.tls_key_path` /<br> `WAKAPI_TLS_KEY_PATH`                            | -                                                | Path of SSL server private key (leave blank to not use HTTPS)                                                                                                            |
+| `server.base_path` /<br> `WAKAPI_BASE_PATH`                                  | `/`                                              | Web base path (change when running behind a proxy under a sub-path)                                                                                                      |
+| `server.public_url` /<br> `WAKAPI_PUBLIC_URL`                                | `http://localhost:3000`                          | URL at which your Wakapi instance can be found publicly                                                                                                                  |
+| `security.password_salt` /<br> `WAKAPI_PASSWORD_SALT`                        | -                                                | Pepper to use for password hashing                                                                                                                                       |
+| `security.insecure_cookies` /<br> `WAKAPI_INSECURE_COOKIES`                  | `false`                                          | Whether or not to allow cookies over HTTP                                                                                                                                |
+| `security.cookie_max_age` /<br> `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` /<br> `WAKAPI_ALLOW_SIGNUP`                          | `true`                                           | Whether to enable user registration                                                                                                                                      |
+| `security.expose_metrics` /<br> `WAKAPI_EXPOSE_METRICS`                      | `false`                                          | Whether to expose Prometheus metrics under `/api/metrics`                                                                                                                |
+| `db.host` /<br> `WAKAPI_DB_HOST`                                             | -                                                | Database host                                                                                                                                                            |
+| `db.port` /<br> `WAKAPI_DB_PORT`                                             | -                                                | Database port                                                                                                                                                            |
+| `db.user` /<br> `WAKAPI_DB_USER`                                             | -                                                | Database user                                                                                                                                                            |
+| `db.password` /<br> `WAKAPI_DB_PASSWORD`                                     | -                                                | Database password                                                                                                                                                        |
+| `db.name` /<br> `WAKAPI_DB_NAME`                                             | `wakapi_db.db`                                   | Database name                                                                                                                                                            |
+| `db.dialect` /<br> `WAKAPI_DB_TYPE`                                          | `sqlite3`                                        | Database type (one of `sqlite3`, `mysql`, `postgres`, `cockroach`)                                                                                                       |
+| `db.charset` /<br> `WAKAPI_DB_CHARSET`                                       | `utf8mb4`                                        | Database connection charset (for MySQL only)                                                                                                                             |
+| `db.max_conn` /<br> `WAKAPI_DB_MAX_CONNECTIONS`                              | `2`                                              | Maximum number of database connections                                                                                                                                   |
+| `db.ssl` /<br> `WAKAPI_DB_SSL`                                               | `false`                                          | Whether to use TLS encryption for database connection (Postgres and CockroachDB only)                                                                                    |
+| `db.automgirate_fail_silently` /<br> `WAKAPI_DB_AUTOMIGRATE_FAIL_SILENTLY`   | `false`                                          | Whether to ignore schema auto-migration failures when starting up                                                                                                        |
+| `mail.enabled` /<br> `WAKAPI_MAIL_ENABLED`                                   | `true`                                           | Whether to allow Wakapi to send e-mail (e.g. for password resets)                                                                                                        |
+| `mail.sender` /<br> `WAKAPI_MAIL_SENDER`                                     | `Wakapi <noreply@wakapi.dev>`                    | Default sender address for outgoing mails (ignored for MailWhale)                                                                                                        |
+| `mail.provider` /<br> `WAKAPI_MAIL_PROVIDER`                                 | `smtp`                                           | Implementation to use for sending mails (one of [`smtp`, `mailwhale`])                                                                                                   |
+| `mail.smtp.host` /<br> `WAKAPI_MAIL_SMTP_HOST`                               | -                                                | SMTP server address for sending mail (if using `smtp` mail provider)                                                                                                     |
+| `mail.smtp.port` /<br> `WAKAPI_MAIL_SMTP_PORT`                               | -                                                | SMTP server port (usually 465)                                                                                                                                           |
+| `mail.smtp.username` /<br> `WAKAPI_MAIL_SMTP_USER`                           | -                                                | SMTP server authentication username                                                                                                                                      |
+| `mail.smtp.password` /<br> `WAKAPI_MAIL_SMTP_PASS`                           | -                                                | SMTP server authentication password                                                                                                                                      |
+| `mail.smtp.tls` /<br> `WAKAPI_MAIL_SMTP_TLS`                                 | `false`                                          | Whether the SMTP server requires TLS encryption (`false` for STARTTLS or no encryption)                                                                                  |
+| `mail.mailwhale.url` /<br> `WAKAPI_MAIL_MAILWHALE_URL`                       | -                                                | URL of [MailWhale](https://mailwhale.dev) instance (e.g. `https://mailwhale.dev`) (if using `mailwhale` mail provider)                                                   |
+| `mail.mailwhale.client_id` /<br> `WAKAPI_MAIL_MAILWHALE_CLIENT_ID`           | -                                                | MailWhale API client ID                                                                                                                                                  |
+| `mail.mailwhale.client_secret` /<br> `WAKAPI_MAIL_MAILWHALE_CLIENT_SECRET`   | -                                                | MailWhale API client secret                                                                                                                                              |
+| `sentry.dsn` /<br> `WAKAPI_SENTRY_DSN`                                       | –                                                | DSN for to integrate [Sentry](https://sentry.io) for error logging and tracing (leave empty to disable)                                                                  |
+| `sentry.enable_tracing` /<br> `WAKAPI_SENTRY_TRACING`                        | `false`                                          | Whether to enable Sentry request tracing                                                                                                                                 |
+| `sentry.sample_rate` /<br> `WAKAPI_SENTRY_SAMPLE_RATE`                       | `0.75`                                           | Probability of tracing a request in Sentry                                                                                                                               |
+| `sentry.sample_rate_heartbeats` /<br> `WAKAPI_SENTRY_SAMPLE_RATE_HEARTBEATS` | `0.1`                                            | Probability of tracing a heartbeat request in Sentry                                                                                                                     |
+| `quick_start` /<br> `WAKAPI_QUICK_START`                                     | `false`                                          | Whether to skip initial boot tasks. Use only for development purposes!                                                                                                   |
 
 ### Supported databases
+
 Wakapi uses [GORM](https://gorm.io) as an ORM. As a consequence, a set of different relational databases is supported.
+
 * [SQLite](https://sqlite.org/) (_default, easy setup_)
 * [MySQL](https://hub.docker.com/_/mysql) (_recommended, because most extensively tested_)
 * [MariaDB](https://hub.docker.com/_/mariadb) (_open-source MySQL alternative_)
 * [Postgres](https://hub.docker.com/_/postgres) (_open-source as well_)
 * [CockroachDB](https://www.cockroachlabs.com/docs/stable/install-cockroachdb-linux.html) (_cloud-native, distributed, Postgres-compatible API_)
 
-### Client-side proxy (`optional`)
-See the [advanced setup instructions](docs/advanced_setup.md).
+## 🔧 API endpoints
 
-## 🔧 API Endpoints
-The following API endpoints are available. A more detailed Swagger documentation is about to come ([#40](https://github.com/muety/wakapi/issues/40)).
+See our [Swagger API Documentation](https://wakapi.dev/swagger-ui).
 
-* `POST /api/heartbeat`
-* `GET /api/summary`
-  * `string` parameter `interval`: One of `today`, `day`, `week`, `month`, `year`, `any`
-* `GET /api/compat/wakatime/v1/users/current/all_time_since_today` (see [Wakatime API docs](https://wakatime.com/developers#all_time_since_today))
-* `GET /api/compat/wakatime/v1/users/current/summaries` (see [Wakatime API docs](https://wakatime.com/developers#summaries))
-* `GET /api/health`
+### Generating Swagger docs
 
-## ⤴️ 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)**.
-
-[![](https://github-readme-stats.vercel.app/api/pin/?username=MacroPower&repo=wakatime_exporter&show_owner=true)](https://github.com/MacroPower/wakatime_exporter)
-
-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.
-
-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.
-
-## 👍 Best Practices
-It is recommended to use wakapi behind a **reverse proxy**, like [Caddy](https://caddyserver.com) or _nginx_ to enable **TLS encryption** (HTTPS).
-However, if you want to expose your wakapi instance to the public anyway, you need to set `server.listen_ipv4` to `0.0.0.0` in `config.yml`
-
-## 🤓 Developer Notes
-### Running tests
 ```bash
-CGO_FLAGS="-g -O2 -Wno-return-local-addr" go test -json -coverprofile=coverage/coverage.out ./... -run ./...
+$ go install github.com/swaggo/swag/cmd/swag@latest
+$ swag init -o static/docs
 ```
 
-## 🙏 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!
+## 🤝 Integrations
 
-## ❔ FAQs
-Since Wakapi heavily relies on the concepts provided by WakaTime, [their FAQs](https://wakatime.com/faq) apply to Wakapi for large parts as well. You might find answers there.
+### Prometheus export
+
+You can export your Wakapi statistics to Prometheus to view them in a Grafana dashboard or so. Here is how.
+
+```bash
+# 1. Start Wakapi with the feature enabled
+$ export WAKAPI_EXPOSE_METRICS=true
+$ ./wakapi
+
+# 2. Get your API key and hash it
+$ echo "<YOUR_API_KEY>" | base64
+
+# 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.
+
+### GitHub Readme Stats integrations
+
+Wakapi also integrates with [GitHub Readme Stats](https://github.com/anuraghazra/github-readme-stats#wakatime-week-stats) to generate fancy cards for you. Here is an example.
+
+![](https://github-readme-stats.vercel.app/api/wakatime?username=n1try&api_domain=wakapi.dev&bg_color=2D3748&title_color=2F855A&icon_color=2F855A&text_color=ffffff&custom_title=Wakapi%20Week%20Stats&layout=compact)
 
 <details>
-<summary><b>What data is sent to Wakapi?</b></summary>
+<summary>Click to view code</summary>
+
+```markdown
+![](https://github-readme-stats.vercel.app/api/wakatime?username={yourusername}&api_domain=wakapi.dev&bg_color=2D3748&title_color=2F855A&icon_color=2F855A&text_color=ffffff&custom_title=Wakapi%20Week%20Stats&layout=compact)
+```
+
+</details>
+<br>
+
+### Github Readme Metrics integration
+
+There is a [WakaTime plugin](https://github.com/lowlighter/metrics/tree/master/source/plugins/wakatime) for GitHub [Metrics](https://github.com/lowlighter/metrics/) that is also compatible with Wakapi.
+
+Preview:
+
+![](https://raw.githubusercontent.com/lowlighter/metrics/examples/metrics.plugin.wakatime.svg)
+
+<details>
+<summary>Click to view code</summary>
+
+```yml
+- uses: lowlighter/metrics@latest
+  with:
+    # ... other options
+    plugin_wakatime: yes
+    plugin_wakatime_token: ${{ secrets.WAKATIME_TOKEN }}      # Required
+    plugin_wakatime_days: 7                                   # Display last week stats
+    plugin_wakatime_sections: time, projects, projects-graphs # Display time and projects sections, along with projects graphs
+    plugin_wakatime_limit: 4                                  # Show 4 entries per graph
+    plugin_wakatime_url: http://wakapi.dev                    # Wakatime url endpoint
+    plugin_wakatime_user: .user.login                         # User
+
+```
+
+</details>
+<br>
+
+## 👍 Best practices
+
+It is recommended to use wakapi behind a **reverse proxy**, like [Caddy](https://caddyserver.com) or [nginx](https://www.nginx.com/), to enable **TLS encryption** (HTTPS).
+
+However, if you want to expose your wakapi instance to the public anyway, you need to set `server.listen_ipv4` to `0.0.0.0` in `config.yml`.
+
+## 🧪 Tests
+
+### Unit tests
+
+Unit tests are supposed to test business logic on a fine-grained level. They are implemented as part of the application, using Go's [testing](https://pkg.go.dev/testing?utm_source=godoc) package alongside [stretchr/testify](https://pkg.go.dev/github.com/stretchr/testify).
+
+#### How to run
+
+```bash
+$ CGO_FLAGS="-g -O2 -Wno-return-local-addr" go test -json -coverprofile=coverage/coverage.out ./... -run ./...
+```
+
+### API tests
+
+API tests are implemented as black box tests, which interact with a fully-fledged, standalone Wakapi through HTTP requests. They are supposed to check Wakapi's web stack and endpoints, including response codes, headers and data on a syntactical level, rather than checking the actual content that is returned.
+
+Our API (or end-to-end, in some way) tests are implemented as a [Postman](https://www.postman.com/) collection and can be run either from inside Postman, or using [newman](https://www.npmjs.com/package/newman) as a command-line runner.
+
+To get a predictable environment, tests are run against a fresh and clean Wakapi instance with a SQLite database that is populated with nothing but some seed data (see [data.sql](testing/data.sql)). It is usually recommended for software tests to be [safe](https://www.restapitutorial.com/lessons/idempotency.html), stateless and without side effects. In contrary to that paradigm, our API tests strictly require a fixed execution order (which Postman assures) and their assertions may rely on specific previous tests having succeeded.
+
+#### Prerequisites (Linux only)
+
+```bash
+# 1. sqlite (cli)
+$ sudo apt install sqlite  # Fedora: sudo dnf install sqlite
+
+# 2. newman
+$ npm install -g newman
+```
+
+#### How to run (Linux only)
+
+```bash
+$ ./testing/run_api_tests.sh
+```
+
+## 🤓 Developer notes
+
+### Building web assets
+
+To keep things minimal, all JS and CSS assets are included as static files and checked in to Git. [TailwindCSS](https://tailwindcss.com/docs/installation#building-for-production) and [Iconify](https://iconify.design/docs/icon-bundles/) require an additional build step. To only require this at the time of development, the compiled assets are checked in to Git as well.
+
+```bash
+$ yarn
+$ yarn build  # or: yarn watch
+```
+
+New icons can be added by editing the `icons` array in [scripts/bundle_icons.js](scripts/bundle_icons.js).
+
+#### Precompression
+
+As explained in [#284](https://github.com/muety/wakapi/issues/284), precompressed (using Brotli) versions of some of the assets are delivered to save additional bandwidth. This was inspired by Caddy's [`precompressed`](https://caddyserver.com/docs/caddyfile/directives/file_server) directive. [`gzipped.FileServer`](https://github.com/muety/wakapi/blob/07a367ce0a97c7738ba8e255e9c72df273fd43a3/main.go#L249) checks for every static file's `.br` or `.gz` equivalents and, if present, delivers those instead of the actual file, alongside `Content-Encoding: br`. Currently, compressed assets are simply checked in to Git. Later we might want to have this be part of a new build step.
+
+To pre-compress files, run this:
+
+```bash
+# Install brotli first
+$ sudo apt install brotli  # or: sudo dnf install brotli
+
+# Watch, build and compress
+$ yarn watch:compress
+
+# Alternatively: build and compress only
+$ yarn build:all:compress
+
+# Alternatively: compress only
+$ yarn compress
+```
+
+## ❔ FAQs
+
+Since Wakapi heavily relies on the concepts provided by WakaTime, [their FAQs](https://wakatime.com/faq) largely apply to Wakapi as well. You might find answers there.
+
+<details>
+<summary><b>What data are sent to Wakapi?</b></summary>
 
 <ul>
   <li>File names</li>
   <li>Project names</li>
   <li>Editor names</li>
-  <li>You computer's host name</li>
+  <li>Your computer's host name</li>
   <li>Timestamps for every action you take in your editor</li>
   <li>...</li>
 </ul>
 
 See the related [WakaTime FAQ section](https://wakatime.com/faq#data-collected) for details.
 
-If you host Wakapi yourself, you have control over all your data. However, if you use our webservice and are concerned about privacy, you can also [exclude or obfuscate](https://wakatime.com/faq#exclude-paths) certain file- or project names.  
+If you host Wakapi yourself, you have control over all your data. However, if you use our webservice and are concerned about privacy, you can also [exclude or obfuscate](https://wakatime.com/faq#exclude-paths) certain file- or project names.
 </details>
 
 <details>
 <summary><b>What happens if I'm offline?</b></summary>
 
-All data is cached locally on your machine and sent in batches once you're online again.
+All data are cached locally on your machine and sent in batches once you're online again.
 </details>
 
 <details>
 <summary><b>How did Wakapi come about?</b></summary>
 
-Wakapi was started when I was a student, who wanted to track detailed statistics about my coding time. Although I'm a big fan of WakaTime I didn't want to pay <a href="https://wakatime.com/pricing)">9 $ a month</a> back then. Luckily, most parts of WakaTime are open source!  
+Wakapi was started when I was a student, who wanted to track detailed statistics about my coding time. Although I'm a big fan of WakaTime I didn't want to pay <a href="https://wakatime.com/pricing">$9 a month</a> back then. Luckily, most parts of WakaTime are open source!
 </details>
 
 <details>
@@ -252,27 +415,27 @@ Wakapi is a small subset of WakaTime and has a lot less features. Cool WakaTime
   <li><a href="https://wakatime.com/share/embed">Embeddable Charts</a></li>
   <li>Personal Goals</li>
   <li>Team- / Organization Support</li>
-  <li>Integrations (with GitLab, etc.)</li>
+  <li>Additional Integrations (with GitLab, etc.)</li>
   <li>Richer API</li>
 </ul>
 
-WakaTime is worth the price. However, if you only want basic statistics and keep sovereignty over your data, you might want to go with Wakapi.
+WakaTime is worth the price. However, if you only need basic statistics and like to keep sovereignty over your data, you might want to go with Wakapi.
 </details>
 
 <details>
 <summary><b>How are durations calculated?</b></summary>
 
-Inferring a measure for your coding time from heartbeats works a bit different than in WakaTime. While WakaTime has <a href="https://wakatime.com/faq#timeout">timeout intervals</a>, Wakapi essentially just pads every heartbeat, that occurs after a longer pause, with 2 extra minutes.
+Inferring a measure for your coding time from heartbeats works a bit differently than in WakaTime. While WakaTime has <a href="https://wakatime.com/faq#timeout">timeout intervals</a>, Wakapi essentially just pads every heartbeat that occurs after a longer pause with 2 extra minutes.
 
 Here is an example (circles are heartbeats):
 
-```
+```text
 |---o---o--------------o---o---|
 |   |10s|      3m      |10s|   |
 
 ```
 
-It is unclear how to handle the three minutes in between. Did the developer do a 3-minute break or were just no heartbeats being sent, e.g. because the developer was starring at the screen find a solution, but not actually typing code.
+It is unclear how to handle the three minutes in between. Did the developer do a 3-minute break, or were just no heartbeats being sent, e.g. because the developer was staring at the screen trying to find a solution, but not actually typing code?
 
 <ul>
   <li><b>WakaTime</b> (with 5 min timeout): 3 min 20 sec
@@ -283,8 +446,22 @@ It is unclear how to handle the three minutes in between. Did the developer do a
 Wakapi adds a "padding" of two minutes before the third heartbeat. This is why total times will slightly vary between Wakapi and WakaTime.
 </details>
 
+## 🌳 Treeware
+
+This package is [Treeware](https://treeware.earth). If you use it in production, then we ask that you [**buy the world a tree**](https://plant.treeware.earth/muety/wakapi) to thank us for our work. By contributing to the Treeware forest you’ll be creating employment for local families and restoring wildlife habitats.
+
+## 👏 Support
+
+Coding in open source is my passion and I would love to do it on a full-time basis and make a living from it one day. So 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 my motivation to keep improving Wakapi!
+
 ## 🙏 Thanks
-I highly appreciate the efforts of [@alanhamlett](https://github.com/alanhamlett) and the WakaTime team and am thankful for their software being open source. 
+
+I highly appreciate the efforts of **[@alanhamlett](https://github.com/alanhamlett)** and the WakaTime team and am thankful for their software being open source.
+
+Moreover, thanks to **[JetBrains](https://jb.gg/OpenSource)** for supporting this project as part of their open-source program.
+
+![](static/assets/images/jetbrains-logo.png)
 
 ## 📓 License
+
 GPL-v3 @ [Ferdinand Mütsch](https://muetsch.io)

config.default.yml

@@ -1,31 +1,76 @@
-env: development
+env: production
 
 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
+  listen_socket:                      # leave blank to disable unix sockets
+  timeout_sec: 30                     # request timeout
+  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
+  aggregation_time: '02:15'           # time at which to run daily aggregation batch jobs
+  report_time_weekly: 'fri,18:00'     # time at which to fan out weekly reports (format: '<weekday)>,<daytime>')
+  inactive_days: 7                    # time of previous days within a user must have logged in to be considered active
+  import_batch_size: 50               # maximum number of heartbeats to insert into the database within one transaction
+  heartbeat_max_age: '4320h'          # maximum acceptable age of a heartbeat (see https://pkg.go.dev/time#ParseDuration)
   custom_languages:
     vue: Vue
     jsx: JSX
+    svelte: Svelte
+
+  # url template for user avatar images (to be used with services like gravatar or dicebear)
+  # available variable placeholders are: username, username_hash, email, email_hash
+  # defaults to wakapi's internal avatar rendering powered by https://codeberg.org/Codeberg/avatars
+  avatar_url_template: api/avatar/{username_hash}.svg
 
 db:
-  host:                     # leave blank when using sqlite3
-  port:                     # leave blank when using sqlite3
-  user:                     # leave blank when using sqlite3
-  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
-  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)
+  host:                               # leave blank when using sqlite3
+  port:                               # leave blank when using sqlite3
+  user:                               # leave blank when using sqlite3
+  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)
+  automgirate_fail_silently: false    # whether to ignore schema auto-migration failures when starting up
 
 security:
-  password_salt:            # CHANGE !
-  insecure_cookies: false
-  cookie_max_age: 172800
+  password_salt:                      # change this
+  insecure_cookies: true              # should be set to 'false', except when not running with HTTPS (e.g. on localhost)
+  cookie_max_age: 172800
+  allow_signup: true
+  expose_metrics: false
+  enable_proxy: false                 # only intended for production instance at wakapi.dev
+
+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']
+  sender: Wakapi <noreply@wakapi.dev>   # ignored for mailwhale
+
+  # smtp settings when sending mails via smtp
+  smtp:
+    host:
+    port:
+    username:
+    password:
+    tls:
+
+  # mailwhale.dev settings when using mailwhale as sending service
+  mailwhale:
+    url:
+    client_id:
+    client_secret:
+
+quick_start: false                  # whether to skip initial tasks on application startup, like summary generation
+skip_migrations: false              # whether to intentionally not run database migrations, only use for dev purposes

config/config.go

@@ -4,24 +4,23 @@ 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"
+	uuid "github.com/satori/go.uuid"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"strings"
+	"time"
+
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/securecookie"
+	"github.com/jinzhu/configor"
+	"github.com/muety/wakapi/data"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
 )
 
 const (
-	defaultConfigPath          = "config.yml"
+	defaultConfigPath = "config.yml"
 
 	SQLDialectMysql    = "mysql"
 	SQLDialectPostgres = "postgres"
@@ -29,25 +28,57 @@ 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"
+	ErrBadRequest          = "400 bad request"
+	ErrInternalServerError = "500 internal server error"
 )
 
 const (
-	WakatimeApiUrl                = "https://wakatime.com/api/v1"
-	WakatimeApiHeartbeatsEndpoint = "/users/current/heartbeats.bulk"
-	WakatimeApiUserEndpoint       = "/users/current"
+	WakatimeApiUrl               = "https://wakatime.com/api/v1"
+	WakatimeApiUserUrl           = "/users/current"
+	WakatimeApiAllTimeUrl        = "/users/current/all_time_since_today"
+	WakatimeApiHeartbeatsUrl     = "/users/current/heartbeats"
+	WakatimeApiHeartbeatsBulkUrl = "/users/current/heartbeats.bulk"
+	WakatimeApiUserAgentsUrl     = "/users/current/user_agents"
+	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"`
-	CustomLanguages map[string]string            `yaml:"custom_languages"`
-	Colors          map[string]map[string]string `yaml:"-"`
+	AggregationTime   string                       `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
+	ReportTimeWeekly  string                       `yaml:"report_time_weekly" default:"fri,18:00" env:"WAKAPI_REPORT_TIME_WEEKLY"`
+	ImportBackoffMin  int                          `yaml:"import_backoff_min" default:"5" env:"WAKAPI_IMPORT_BACKOFF_MIN"`
+	ImportBatchSize   int                          `yaml:"import_batch_size" default:"50" env:"WAKAPI_IMPORT_BATCH_SIZE"`
+	InactiveDays      int                          `yaml:"inactive_days" default:"7" env:"WAKAPI_INACTIVE_DAYS"`
+	HeartbeatMaxAge   string                       `yaml:"heartbeat_max_age" default:"4320h" env:"WAKAPI_HEARTBEAT_MAX_AGE"`
+	CountCacheTTLMin  int                          `yaml:"count_cache_ttl_min" default:"30" env:"WAKAPI_COUNT_CACHE_TTL_MIN"`
+	AvatarURLTemplate string                       `yaml:"avatar_url_template" default:"api/avatar/{username_hash}.svg" env:"WAKAPI_AVATAR_URL_TEMPLATE"`
+	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"`
+	ExposeMetrics bool `yaml:"expose_metrics" default:"false" env:"WAKAPI_EXPOSE_METRICS"`
+	EnableProxy   bool `yaml:"enable_proxy" default:"false" env:"WAKAPI_ENABLE_PROXY"` // only intended for production instance at wakapi.dev
 	// 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"`
@@ -56,41 +87,80 @@ type securityConfig struct {
 }
 
 type dbConfig struct {
-	Host     string `env:"WAKAPI_DB_HOST"`
-	Port     uint   `env:"WAKAPI_DB_PORT"`
-	User     string `env:"WAKAPI_DB_USER"`
-	Password string `env:"WAKAPI_DB_PASSWORD"`
-	Name     string `default:"wakapi_db.db" env:"WAKAPI_DB_NAME"`
-	Dialect  string `yaml:"-"`
-	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"`
+	Host                    string `env:"WAKAPI_DB_HOST"`
+	Port                    uint   `env:"WAKAPI_DB_PORT"`
+	User                    string `env:"WAKAPI_DB_USER"`
+	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"`
+	AutoMigrateFailSilently bool   `yaml:"automigrate_fail_silently" default:"false" env:"WAKAPI_DB_AUTOMIGRATE_FAIL_SILENTLY"`
 }
 
 type serverConfig struct {
-	Port        int    `default:"3000" env:"WAKAPI_PORT"`
-	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"`
-	TlsCertPath string `yaml:"tls_cert_path" default:"" env:"WAKAPI_TLS_CERT_PATH"`
-	TlsKeyPath  string `yaml:"tls_key_path" default:"" env:"WAKAPI_TLS_KEY_PATH"`
+	Port         int    `default:"3000" env:"WAKAPI_PORT"`
+	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"`
+	ListenSocket string `yaml:"listen_socket" default:"" env:"WAKAPI_LISTEN_SOCKET"`
+	TimeoutSec   int    `yaml:"timeout_sec" default:"30" env:"WAKAPI_TIMEOUT_SEC"`
+	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"`
+	Sender    string              `env:"WAKAPI_MAIL_SENDER" yaml:"sender"`
+}
+
+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"`
 }
 
 type Config struct {
-	Env      string `default:"dev" env:"ENVIRONMENT"`
-	Version  string `yaml:"-"`
-	App      appConfig
-	Security securityConfig
-	Db       dbConfig
-	Server   serverConfig
+	Env            string `default:"dev" env:"ENVIRONMENT"`
+	Version        string `yaml:"-"`
+	QuickStart     bool   `yaml:"quick_start" env:"WAKAPI_QUICK_START"`
+	SkipMigrations bool   `yaml:"skip_migrations" env:"WAKAPI_SKIP_MIGRATIONS"`
+	InstanceId     string `yaml:"-"` // only temporary, changes between runs
+	App            appConfig
+	Security       securityConfig
+	Db             dbConfig
+	Server         serverConfig
+	Sentry         sentryConfig
+	Mail           mailConfig
 }
 
-func (c *Config) CreateCookie(name, value, path string) *http.Cookie {
-	return c.createCookie(name, value, path, c.Security.CookieMaxAgeSec)
+func (c *Config) CreateCookie(name, value string) *http.Cookie {
+	return c.createCookie(name, value, c.Server.BasePath, c.Security.CookieMaxAgeSec)
 }
 
-func (c *Config) GetClearCookie(name, path string) *http.Cookie {
-	return c.createCookie(name, "", path, -1)
+func (c *Config) GetClearCookie(name string) *http.Cookie {
+	return c.createCookie(name, "", c.Server.BasePath, -1)
 }
 
 func (c *Config) createCookie(name, value, path string, maxAge int) *http.Cookie {
@@ -117,85 +187,38 @@ 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 && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.KeyStringValue{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.Alias{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.Heartbeat{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.Summary{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.SummaryItem{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.LanguageMapping{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.ProjectLabel{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				return err
+			}
+			if err := db.AutoMigrate(&models.Diagnostics{}); err != nil && !c.Db.AutoMigrateFailSilently {
+				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:
-		return mysql.New(mysql.Config{
-			DriverName: c.Dialect,
-			DSN:        mysqlConnectionString(c),
-		})
-	case SQLDialectPostgres:
-		return postgres.New(postgres.Config{
-			DSN: postgresConnectionString(c),
-		})
-	case SQLDialectSqlite:
-		return sqlite.Open(sqliteConnectionString(c))
-	}
-	return nil
-}
-
-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",
-		config.User,
-		config.Password,
-		config.Host,
-		config.Port,
-		config.Name,
-		"Local",
-	)
-}
-
-func postgresConnectionString(config *dbConfig) string {
-	sslmode := "disable"
-	if config.Ssl {
-		sslmode = "require"
-	}
-
-	return fmt.Sprintf("host=%s port=%d user=%s dbname=%s password=%s sslmode=%s",
-		config.Host,
-		config.Port,
-		config.User,
-		config.Name,
-		config.Password,
-		sslmode,
-	)
-}
-
-func sqliteConnectionString(config *dbConfig) string {
-	return config.Name
-}
-
 func (c *appConfig) GetCustomLanguages() map[string]string {
 	return cloneStringMap(c.CustomLanguages, false)
 }
@@ -212,47 +235,61 @@ 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 *appConfig) GetWeeklyReportDay() time.Weekday {
+	s := strings.Split(c.ReportTimeWeekly, ",")[0]
+	return parseWeekday(s)
 }
 
-func readVersion() string {
-	file, err := pkger.Open("/version.txt")
-	if err != nil {
-		logbuch.Fatal(err.Error())
-	}
-	defer file.Close()
+func (c *appConfig) GetWeeklyReportTime() string {
+	return strings.Split(c.ReportTimeWeekly, ",")[1]
+}
 
-	bytes, err := ioutil.ReadAll(file)
-	if err != nil {
-		logbuch.Fatal(err.Error())
-	}
+func (c *appConfig) HeartbeatsMaxAge() time.Duration {
+	d, _ := time.ParseDuration(c.HeartbeatMaxAge)
+	return d
+}
 
-	return strings.TrimSpace(string(bytes))
+func (c *dbConfig) IsSQLite() bool {
+	return c.Dialect == "sqlite3"
+}
+
+func (c *dbConfig) IsMySQL() bool {
+	return c.Dialect == "mysql"
+}
+
+func (c *dbConfig) IsPostgres() bool {
+	return c.Dialect == "postgres"
+}
+
+func (c *serverConfig) GetPublicUrl() string {
+	return strings.TrimSuffix(c.PublicUrl, "/")
+}
+
+func (c *SMTPMailConfig) ConnStr() string {
+	return fmt.Sprintf("%s:%d", c.Host, c.Port)
+}
+
+func IsDev(env string) bool {
+	return env == "dev" || env == "development"
 }
 
 func readColors() map[string]map[string]string {
 	// Read language colors
 	// Source:
-	// – https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
-	// – https://wakatime.com/colors/operating_systems
+	// - https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
+	// - https://wakatime.com/colors/operating_systems
 	// - https://wakatime.com/colors/editors
 	// 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)
+	// - $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())
 	}
 
@@ -270,9 +307,44 @@ func resolveDbDialect(dbType string) string {
 	if dbType == "cockroach" {
 		return "postgres"
 	}
+	if dbType == "sqlite" {
+		return "sqlite3"
+	}
+	if dbType == "mariadb" {
+		return "mysql"
+	}
 	return dbType
 }
 
+func findString(needle string, haystack []string, defaultVal string) string {
+	for _, s := range haystack {
+		if s == needle {
+			return s
+		}
+	}
+	return defaultVal
+}
+
+func parseWeekday(s string) time.Weekday {
+	switch strings.ToLower(s) {
+	case "mon", strings.ToLower(time.Monday.String()):
+		return time.Monday
+	case "tue", strings.ToLower(time.Tuesday.String()):
+		return time.Tuesday
+	case "wed", strings.ToLower(time.Wednesday.String()):
+		return time.Wednesday
+	case "thu", strings.ToLower(time.Thursday.String()):
+		return time.Thursday
+	case "fri", strings.ToLower(time.Friday.String()):
+		return time.Friday
+	case "sat", strings.ToLower(time.Saturday.String()):
+		return time.Saturday
+	case "sun", strings.ToLower(time.Sunday.String()):
+		return time.Sunday
+	}
+	return time.Monday
+}
+
 func Set(config *Config) {
 	cfg = config
 }
@@ -281,7 +353,7 @@ func Get() *Config {
 	return cfg
 }
 
-func Load() *Config {
+func Load(version string) *Config {
 	config := &Config{}
 
 	flag.Parse()
@@ -290,7 +362,9 @@ func Load() *Config {
 		logbuch.Fatal("failed to read config: %v", err)
 	}
 
-	config.Version = readVersion()
+	env = config.Env
+	config.Version = strings.TrimSpace(version)
+	config.InstanceId = uuid.NewV4().String()
 	config.App.Colors = readColors()
 	config.Db.Dialect = resolveDbDialect(config.Db.Type)
 	config.Security.SecureCookie = securecookie.New(
@@ -308,8 +382,33 @@ func Load() *Config {
 		}
 	}
 
-	if config.Server.ListenIpV4 == "" && config.Server.ListenIpV6 == "" {
-		logbuch.Fatal("either of listen_ipv4 or listen_ipv6 must be set")
+	if config.Sentry.Dsn != "" {
+		logbuch.Info("enabling sentry integration")
+		initSentry(config.Sentry, config.IsDev())
+	}
+
+	// some validation checks
+	if config.Server.ListenIpV4 == "" && config.Server.ListenIpV6 == "" && config.Server.ListenSocket == "" {
+		logbuch.Fatal("either of listen_ipv4 or listen_ipv6 or listen_socket must be set")
+	}
+	if config.Db.MaxConn <= 0 {
+		logbuch.Fatal("you must allow at least one database connection")
+	}
+	if config.Db.MaxConn > 1 && config.Db.IsSQLite() {
+		logbuch.Warn("with sqlite, only a single connection is supported") // otherwise 'PRAGMA foreign_keys=ON' would somehow have to be set for every connection in the pool
+		config.Db.MaxConn = 1
+	}
+	if config.Mail.Provider != "" && findString(config.Mail.Provider, emailProviders, "") == "" {
+		logbuch.Fatal("unknown mail provider '%s'", config.Mail.Provider)
+	}
+	if _, err := time.Parse("15:04", config.App.GetWeeklyReportTime()); err != nil {
+		logbuch.Fatal("invalid interval set for report_time_weekly")
+	}
+	if _, err := time.Parse("15:04", config.App.AggregationTime); err != nil {
+		logbuch.Fatal("invalid interval set for aggregation_time")
+	}
+	if _, err := time.ParseDuration(config.App.HeartbeatMaxAge); err != nil {
+		logbuch.Fatal("invalid duration set for heartbeat_max_age")
 	}
 
 	Set(config)

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,

config/db.go

@@ -0,0 +1,86 @@
+package config
+
+import (
+	"fmt"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+)
+
+/*
+A quick note to myself including some clarifications about time zones.
+
+- There are basically four time zones (at least in case of MySQL): (1) User, (2) Wakapi (host system), (3) MySQL server, (4) MySQL session
+- From my understanding, MySQL server tz is only a fallback and can be ignored as long as a connection tz is specified
+- All times are currently stored inside TIMESTAMP columns (alternatives would be DATETIME and BIGINT (plain Unix timestamps))
+- TIMESTAMP columns, to my understanding, do not keep any time zone information, but only the very time they store
+- Setting a `loc` parameter specifies what location parsed time.Time objects will be in, however, does not affect the session time zone setting (https://github.com/go-sql-driver/mysql#loc)
+- I.e., when not setting `time_zone` in addition, the session time zone will probably default to the server time zone (UTC in case of Docker)
+- Session time zone will result in conversions of inserted times from that time zone to UTC
+- From my understanding, TIMESTAMP only stores a plain time value without tz information and then converts it only for retrieval to whatever tz is set for the session
+- E.g., when inserting '2021-04-27 08:26:07' with session tz set to Europe/Berlin and then viewing the database table with UTC tz will return '2021-04-27 06:26:07' instead
+- Currently, no session tz is set (only loc), so the database server will assume it receives UTC. However, as no tz is set when retrieving the values either, they are also going to be returned just as is and as long as `loc=Local` is set properly, they are parsed in Go code with the correct time zone
+- As long as the Wakapi server always runs in the same time zone, it will always parse these dates the same way (i.e. as time.Local, Europe/Berlin in case of Wakapi.dev)
+- Using TIMESTAMP columns would only become problematic when either data needs to be migrated to a Wakapi instance in a different tz or if two consumers in different tzs were reading and writing to the same table
+- It is important to have same `time_zone` and `loc` parameters set when sending and receiving, no matter what it is (writing / reading in 'UTC' will yield same results as writing / reading in 'Europe/Berlin')
+- "The session time zone setting affects display and storage of time values that are zone-sensitive. This includes the values displayed by functions such as NOW() or CURTIME(), and values stored in and retrieved from TIMESTAMP columns. Values for TIMESTAMP columns are converted from the session time zone to UTC for storage, and from UTC to the session time zone for retrieval." (https://dev.mysql.com/doc/refman/8.0/en/time-zone-support.html)
+- Wakapi always uses time.Local for everything, i.e. all times in the database have to be interpreted with that tz
+- New heartbeats are sent with Python-like Unix timestamps, i.e. are absolute points in time as therefore not subject to any kind of tz issues
+- E.g. with Wakapi running in Europe/Berlin, 1619379014.7335322 (2021-04-25T19:30:14.733Z (UTC)) will be inserted as 2021-04-25T21:30:14.733+0200 (CEST), but obviously represents the exact same point in time no matter where it originated from
+- The reason why we need to explicitly care about tzs in the first place is the fact that user's can request their data within intervals and the results should correspond to their tz
+	- Users from California wouldn't have to care about their heartbeats being stored in German time zone
+	- However, they DO care when requesting their summaries
+	- A request with `?from=2021-04-25` from California (PST / UTC-7) would ideally have to be translated into a database query like `from >= 2021-04-25T00:00:00+0900)`, assuming that Wakapi runs at CEST (UTC+2)
+	- This translation comes from either the user explicitly requesting with a specified tz (i.e. sending `from` as ISO8601 / RFC3999) or them having specified a tz in their profile
+	- Implicit intervals are tricky, too, as they are generated on the server, but still have to respect the user's tz, as `today` is different for a user in Cali and one in Karlsruhe
+*/
+
+func (c *dbConfig) GetDialector() gorm.Dialector {
+	switch c.Dialect {
+	case SQLDialectMysql:
+		return mysql.New(mysql.Config{
+			DriverName: c.Dialect,
+			DSN:        mysqlConnectionString(c),
+		})
+	case SQLDialectPostgres:
+		return postgres.New(postgres.Config{
+			DSN: postgresConnectionString(c),
+		})
+	case SQLDialectSqlite:
+		return sqlite.Open(sqliteConnectionString(c))
+	}
+	return nil
+}
+
+func mysqlConnectionString(config *dbConfig) string {
+	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",
+	)
+}
+
+func postgresConnectionString(config *dbConfig) string {
+	sslmode := "disable"
+	if config.Ssl {
+		sslmode = "require"
+	}
+
+	return fmt.Sprintf("host=%s port=%d user=%s dbname=%s password=%s sslmode=%s",
+		config.Host,
+		config.Port,
+		config.User,
+		config.Name,
+		config.Password,
+		sslmode,
+	)
+}
+
+func sqliteConnectionString(config *dbConfig) string {
+	return config.Name
+}

config/eventbus.go

@@ -0,0 +1,32 @@
+package config
+
+import "github.com/leandro-lugaresi/hub"
+
+type ApplicationEvent struct {
+	Type    string
+	Payload interface{}
+}
+
+const (
+	TopicUser               = "user.*"
+	TopicHeartbeat          = "heartbeat.*"
+	TopicProjectLabel       = "project_label.*"
+	EventUserUpdate         = "user.update"
+	EventHeartbeatCreate    = "heartbeat.create"
+	EventProjectLabelCreate = "project_label.create"
+	EventProjectLabelDelete = "project_label.delete"
+	EventWakatimeFailure    = "wakatime.failure"
+	FieldPayload            = "payload"
+	FieldUser               = "user"
+	FieldUserId             = "user.id"
+)
+
+var eventHub *hub.Hub
+
+func init() {
+	eventHub = hub.New()
+}
+
+func EventBus() *hub.Hub {
+	return eventHub
+}

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
+}

config/sentry.go

@@ -0,0 +1,156 @@
+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)
+}
+
+var excludedRoutes = []string{
+	"GET /assets",
+	"GET /api/health",
+	"GET /swagger-ui",
+	"GET /docs",
+}
+
+func initSentry(config sentryConfig, debug bool) {
+	if err := sentry.Init(sentry.ClientOptions{
+		Dsn:              config.Dsn,
+		Debug:            debug,
+		AttachStacktrace: true,
+		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()
+
+			for _, ex := range excludedRoutes {
+				if strings.HasPrefix(txName, ex) {
+					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
+}

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"
 )

data/colors.json

@@ -2,289 +2,396 @@
   "languages": {
     "1C Enterprise": "#814CCC",
     "ABAP": "#E8274B",
-    "ActionScript": "#882B0F",
-    "Ada": "#02f88c",
-    "Agda": "#315665",
     "AGS Script": "#B9D9FF",
-    "Alloy": "#64C800",
+    "AL": "#3AA2B5",
     "AMPL": "#E6EFBB",
-    "AngelScript": "#C7D7DC",
     "ANTLR": "#9DC3FF",
     "API Blueprint": "#2ACCA8",
-    "APL": "#5A8164",
-    "AppleScript": "#101F1F",
-    "Arc": "#aa2afe",
-    "ASP": "#6a40fd",
-    "AspectJ": "#a957b0",
-    "Assembly": "#6E4C13",
-    "Asymptote": "#4a0c0c",
+    "APL": "#8a0707",
+    "ASP.NET": "#9400ff",
     "ATS": "#1ac620",
+    "ActionScript": "#e3491a",
+    "Ada": "#02f88c",
+    "Agda": "#467C91",
+    "Alloy": "#cc5c24",
+    "AngelScript": "#C7D7DC",
+    "Apex": "#1797c0",
+    "Apollo Guidance Computer": "#0B3D91",
+    "AppleScript": "#101F1F",
+    "Arc": "#ca2afe",
+    "Arduino": "#bd79d1",
+    "AspectJ": "#1957b0",
+    "Assembly": "#6E4C13",
+    "Asymptote": "#ff0000",
+    "Augeas": "#62331f",
     "AutoHotkey": "#6594b9",
-    "AutoIt": "#1C3552",
+    "AutoIt": "#36699B",
     "Ballerina": "#FF5000",
     "Batchfile": "#C1F12E",
+    "Beef": "#a52f4e",
+    "Bison": "#6A463F",
+    "Blade": "#f7523f",
     "BlitzMax": "#cd6400",
     "Boo": "#d4bec1",
+    "Boogie": "#c80fa0",
     "Brainfuck": "#2F2530",
+    "Browserslist": "#ffd539",
     "C": "#555555",
-    "C#": "#178600",
+    "C Sharp": "#178600",
+    "C#": "#5a25a2",
     "C++": "#f34b7d",
+    "CSON": "#244776",
+    "CSS": "#563d7c",
     "Ceylon": "#dfa535",
     "Chapel": "#8dc63f",
-    "Cirru": "#ccccff",
+    "Cirru": "#aaaaff",
     "Clarion": "#db901e",
-    "Clean": "#3F85AF",
+    "Classic ASP": "#6a40fd",
+    "Clean": "#3a81ad",
     "Click": "#E4E6F3",
     "Clojure": "#db5855",
+    "Closure Templates": "#0d948f",
     "CoffeeScript": "#244776",
     "ColdFusion": "#ed2cd6",
+    "ColdFusion CFC": "#ed2cd6",
     "Common Lisp": "#3fb68b",
     "Common Workflow Language": "#B5314C",
-    "Component Pascal": "#B0CE4E",
+    "Component Pascal": "#b0ce4e",
     "Crystal": "#000100",
-    "CSS": "#563d7c",
     "Cuda": "#3A4E3A",
-    "D": "#ba595e",
-    "Dart": "#00B4AB",
+    "D": "#fcd46d",
+    "DM": "#075ff1",
+    "Dafny": "#FFEC25",
+    "Dart": "#98BAD6",
     "DataWeave": "#003a52",
-    "DM": "#447265",
+    "Denizen": "#faf094",
+    "Dhall": "#dfafff",
     "Dockerfile": "#384d54",
     "Dogescript": "#cca760",
-    "Dylan": "#6c616e",
+    "Dylan": "#3ebc27",
     "E": "#ccce35",
-    "eC": "#913960",
     "ECL": "#8a1267",
+    "EJS": "#a91e50",
+    "EQ": "#a78649",
+    "Eagle": "#3994bc",
     "Eiffel": "#946d57",
     "Elixir": "#6e4a7e",
     "Elm": "#60B5CC",
     "Emacs Lisp": "#c065db",
-    "EmberScript": "#FFF4F3",
-    "EQ": "#a78649",
-    "Erlang": "#B83998",
+    "EmberScript": "#f64e3e",
+    "Erlang": "#0faf8d",
     "F#": "#b845fc",
     "F*": "#572e30",
+    "FLUX": "#33CCFF",
+    "FORTRAN": "#4d41b1",
     "Factor": "#636746",
     "Fancy": "#7b9db4",
-    "Fantom": "#14253c",
-    "FLUX": "#88ccff",
+    "Fantom": "#dbded5",
+    "Faust": "#c37240",
     "Forth": "#341708",
     "Fortran": "#4d41b1",
     "FreeMarker": "#0050b2",
     "Frege": "#00cafe",
-    "Game Maker Language": "#71b417",
+    "Futhark": "#5f021f",
+    "G-code": "#D08CF2",
+    "GAML": "#FFC766",
     "GDScript": "#355570",
+    "Game Maker Language": "#8ad353",
     "Genie": "#fb855d",
     "Gherkin": "#5B2063",
-    "Glyph": "#c1ac7f",
+    "Glyph": "#e4cc98",
     "Gnuplot": "#f0a9f0",
-    "Go": "#00ADD8",
-    "Golo": "#88562A",
+    "Go": "#375eab",
+    "Golo": "#f6a51f",
     "Gosu": "#82937f",
-    "Grammatical Framework": "#79aa7a",
+    "Grammatical Framework": "#ff0000",
+    "GraphQL": "#e10098",
     "Groovy": "#e69f56",
+    "HTML": "#e44b23",
     "Hack": "#878787",
+    "Haml": "#ece2a9",
+    "Handlebars": "#f7931e",
     "Harbour": "#0e60e3",
-    "Haskell": "#5e5086",
-    "Haxe": "#df7900",
+    "Haskell": "#29b544",
+    "Haxe": "#f7941e",
     "HiveQL": "#dce200",
-    "HTML": "#e34c26",
-    "Hy": "#7790B2",
-    "IDL": "#a3522f",
+    "HolyC": "#ffefaf",
+    "Hy": "#7891b1",
+    "IDL": "#e3592c",
+    "IGOR Pro": "#0000cc",
     "Idris": "#b30000",
+    "ImageJ Macro": "#99AAFF",
     "Io": "#a9188d",
     "Ioke": "#078193",
-    "Isabelle": "#FEFE00",
+    "Isabelle": "#fdcd00",
     "J": "#9EEDFF",
+    "JFlex": "#DBCA00",
+    "JSONiq": "#40d47e",
     "Java": "#b07219",
     "JavaScript": "#f1e05a",
     "Jolie": "#843179",
-    "JSONiq": "#40d47e",
     "Jsonnet": "#0064bd",
     "Julia": "#a270ba",
     "Jupyter Notebook": "#DA5B0B",
+    "KRL": "#f5c800",
+    "Kaitai Struct": "#773b37",
     "Kotlin": "#F18E33",
-    "KRL": "#28430A",
-    "Lasso": "#999999",
-    "Lex": "#DBCA00",
-    "LFE": "#4C3023",
-    "LiveScript": "#499886",
+    "LFE": "#004200",
     "LLVM": "#185619",
     "LOLCODE": "#cc9900",
-    "LookML": "#652B81",
     "LSL": "#3d9970",
-    "Lua": "#000080",
-    "Makefile": "#427819",
-    "Mask": "#f97732",
+    "Lark": "#0b130f",
+    "Lasso": "#2584c3",
+    "Latte": "#A8FF97",
+    "Less": "#1d365d",
+    "Lex": "#DBCA00",
+    "Liquid": "#67b8de",
+    "LiveScript": "#499886",
+    "LookML": "#652B81",
+    "Lua": "#fa1fa1",
     "MATLAB": "#e16737",
-    "Max": "#c4a79c",
     "MAXScript": "#00a6a6",
-    "mcfunction": "#E22837",
-    "Mercury": "#ff2b2b",
+    "MLIR": "#5EC8DB",
+    "MQL4": "#62A8D6",
+    "MQL5": "#4A76B8",
+    "MTML": "#0095d9",
+    "Macaulay2": "#d8ffff",
+    "Makefile": "#427819",
+    "Markdown": "#083fa1",
+    "Marko": "#42bff2",
+    "Mask": "#f97732",
+    "Matlab": "#bb92ac",
+    "Max": "#ce279c",
+    "Mercury": "#abcdef",
     "Meson": "#007800",
     "Metal": "#8f14e9",
     "Mirah": "#c7a938",
     "Modula-3": "#223388",
-    "MQL4": "#62A8D6",
-    "MQL5": "#4A76B8",
-    "MTML": "#b7e1f4",
+    "Mustache": "#724b3b",
     "NCL": "#28431f",
+    "NWScript": "#111522",
     "Nearley": "#990000",
-    "Nemerle": "#3d3c6e",
-    "nesC": "#94B0C7",
+    "Nemerle": "#0d3c6e",
     "NetLinx": "#0aa0ff",
     "NetLinx+ERB": "#747faa",
-    "NetLogo": "#ff6375",
-    "NewLisp": "#87AED7",
+    "NetLogo": "#ff2b2b",
+    "NewLisp": "#eedd66",
     "Nextflow": "#3ac486",
-    "Nim": "#37775b",
-    "Nit": "#009917",
-    "Nix": "#7e7eff",
+    "Nim": "#ffc200",
+    "Nimrod": "#37775b",
+    "Nit": "#0d8921",
+    "Nix": "#7070ff",
     "Nu": "#c9df40",
-    "Objective-C": "#438eff",
-    "Objective-C++": "#6866fb",
-    "Objective-J": "#ff0c5a",
+    "NumPy": "#9C8AF9",
+    "Nunjucks": "#3d8137",
     "OCaml": "#3be133",
+    "ObjectScript": "#424893",
+    "Objective-C": "#438eff",
+    "Objective-C++": "#4886FC",
+    "Objective-J": "#ff0c5a",
+    "Odin": "#60AFFE",
     "Omgrofl": "#cabbff",
-    "ooc": "#b0b77e",
     "Opal": "#f7ede0",
-    "Oxygene": "#cdd0e3",
-    "Oz": "#fab738",
+    "OpenQASM": "#AA70FF",
+    "Org": "#77aa99",
+    "Oxygene": "#5a63a3",
+    "Oz": "#fcaf3e",
     "P4": "#7055b5",
+    "PAWN": "#dbb284",
+    "PHP": "#4F5D95",
+    "PLSQL": "#dad8d8",
     "Pan": "#cc0000",
     "Papyrus": "#6600cc",
     "Parrot": "#f3ca0a",
-    "Pascal": "#E3F171",
+    "Pascal": "#b0ce4e",
     "Pawn": "#dbb284",
     "Pep8": "#C76F5B",
     "Perl": "#0298c3",
-    "Perl 6": "#0000fb",
-    "PHP": "#4F5D95",
+    "Perl6": "#0298c3",
     "PigLatin": "#fcd7de",
-    "Pike": "#005390",
-    "PLSQL": "#dad8d8",
+    "Pike": "#066ab2",
     "PogoScript": "#d80074",
     "PostScript": "#da291c",
     "PowerBuilder": "#8f0f8d",
     "PowerShell": "#012456",
-    "Processing": "#0096D8",
+    "Prisma": "#0c344b",
+    "Processing": "#2779ab",
     "Prolog": "#74283c",
-    "Propeller Spin": "#7fa2a7",
-    "Puppet": "#302B6D",
+    "Propeller Spin": "#2b446d",
+    "Pug": "#a86454",
+    "Puppet": "#cc5555",
+    "Pure Data": "#91de79",
     "PureBasic": "#5a6986",
-    "PureScript": "#1D222D",
-    "Python": "#3572A5",
-    "q": "#0040cd",
+    "PureScript": "#bcdc53",
+    "Python": "#3581ba",
+    "Q#": "#fed659",
     "QML": "#44a51c",
+    "Qt Script": "#00b841",
     "Quake": "#882233",
-    "R": "#198CE7",
-    "Racket": "#3c5caa",
-    "Ragel": "#9d5200",
+    "R": "#198ce7",
     "RAML": "#77d9fb",
+    "RUNOFF": "#665a4e",
+    "Racket": "#ae17ff",
+    "Ragel": "#9d5200",
+    "Ragel in Ruby Host": "#ff9c2e",
+    "Raku": "#0000fb",
     "Rascal": "#fffaa0",
+    "ReScript": "#ed5051",
+    "Reason": "#ff5847",
     "Rebol": "#358a5b",
-    "Red": "#f50000",
+    "Record Jar": "#0673ba",
+    "Red": "#ee0000",
     "Ren'Py": "#ff7f7f",
     "Ring": "#2D54CB",
+    "Riot": "#A71E49",
     "Roff": "#ecdebe",
     "Rouge": "#cc0088",
     "Ruby": "#701516",
-    "RUNOFF": "#665a4e",
     "Rust": "#dea584",
+    "SAS": "#1E90FF",
+    "SCSS": "#c6538c",
+    "SQF": "#FFCB1F",
+    "SRecode Template": "#348a34",
+    "SVG": "#ff9900",
     "SaltStack": "#646464",
-    "SAS": "#B34936",
-    "Scala": "#c22d40",
+    "Sass": "#a53b70",
+    "Scala": "#7dd3b0",
+    "Scaml": "#bd181a",
     "Scheme": "#1e4aec",
-    "sed": "#64b970",
     "Self": "#0579aa",
-    "Shell": "#89e051",
+    "Shell": "#5861ce",
     "Shen": "#120F14",
     "Slash": "#007eff",
     "Slice": "#003fa2",
+    "Slim": "#ff8877",
+    "SmPL": "#c94949",
     "Smalltalk": "#596706",
     "Solidity": "#AA6746",
-    "SourcePawn": "#5c7611",
-    "SQF": "#3F3F3F",
+    "SourcePawn": "#f69e1d",
     "Squirrel": "#800000",
-    "SRecode Template": "#348a34",
     "Stan": "#b2011d",
     "Standard ML": "#dc566d",
+    "Starlark": "#76d275",
+    "Stylus": "#ff6347",
     "SuperCollider": "#46390b",
+    "Svelte": "#ff3e00",
     "Swift": "#ffac45",
-    "SystemVerilog": "#DAE1C2",
-    "Tcl": "#e4cc98",
-    "Terra": "#00004c",
-    "TeX": "#3D6117",
+    "SystemVerilog": "#343761",
     "TI Program": "#A0AA87",
-    "Turing": "#cf142b",
-    "TypeScript": "#2b7489",
+    "Tcl": "#e4cc98",
+    "TeX": "#3D6117",
+    "Terra": "#00004c",
+    "Turing": "#45f715",
+    "Twig": "#c1d026",
+    "TypeScript": "#31859c",
+    "Unified Parallel C": "#755223",
+    "Uno": "#9933cc",
     "UnrealScript": "#a54c4d",
-    "Vala": "#fbe5cd",
-    "VCL": "#148AA8",
-    "Verilog": "#b2b7f8",
-    "VHDL": "#adb2cb",
+    "V": "#4f87c4",
+    "VBA": "#867db1",
+    "VBScript": "#15dcdc",
+    "VCL": "#0298c3",
+    "VHDL": "#543978",
+    "Vala": "#ee7d06",
+    "Verilog": "#848bf3",
     "Vim script": "#199f4b",
+    "VimL": "#199c4b",
     "Visual Basic": "#945db7",
-    "Volt": "#1F1F1F",
+    "Visual Basic .NET": "#945db7",
+    "Volt": "#0098db",
     "Vue": "#2c3e50",
-    "wdl": "#42f1f4",
+    "Web Ontology Language": "#3994bc",
     "WebAssembly": "#04133b",
-    "wisp": "#7582D1",
+    "Wollok": "#a23738",
     "X10": "#4B6BEF",
-    "xBase": "#403a40",
     "XC": "#99DA07",
-    "XQuery": "#5232e7",
+    "XQuery": "#2700e2",
     "XSLT": "#EB8CEB",
-    "Yacc": "#4B6C4B",
+    "YAML": "#cb171e",
     "YARA": "#220000",
     "YASnippet": "#32AB90",
+    "Yacc": "#4B6C4B",
     "ZAP": "#0d665e",
+    "ZIL": "#dc75e5",
+    "ZenScript": "#00BCD1",
     "Zephir": "#118f9e",
     "Zig": "#ec915c",
-    "ZIL": "#dc75e5"
+    "cpp": "#f34b7d",
+    "eC": "#913960",
+    "edn": "#db5855",
+    "mIRC Script": "#3d57c3",
+    "mcfunction": "#E22837",
+    "nesC": "#ffce3b",
+    "ooc": "#b0b77e",
+    "q": "#0040cd",
+    "sed": "#64b970",
+    "wdl": "#42f1f4",
+    "wisp": "#7582D1",
+    "xBase": "#3a4040",
+    "Other": "#1f9aef"
   },
   "editors": {
+    "Adobe XD": "#fd27bc",
     "Android Studio": "#99cd00",
     "AppCode": "#04dbde",
     "Aptana": "#ec8623",
     "Atom": "#49b77e",
     "Azure Data Studio": "#0271c6",
     "Blender": "#fb8007",
+    "BlueJ": "#5d89af",
     "Brackets": "#067dc3",
     "Chrome": "#fdd308",
     "CLion": "#14c9a5",
     "Cloud9": "#25a6d9",
     "Coda": "#3e8e1c",
+    "Code: :Blocks": "#d0ce71",
+    "Code::Blocks": "#d0ce71",
+    "CodeLite": "#1892e5",
     "CodeTasty": "#7368a8",
     "DataGrip": "#907cf2",
     "DBeaver": "#897363",
     "Eclipse": "#443582",
     "Emacs": "#8c76c3",
+    "Embarcadero Delphi": "#d9242a",
+    "EmEditor": "#ed3103",
     "Eric": "#423f13",
     "Excel": "#0f753c",
+    "Figma": "#c7b9ff",
+    "Firefox": "#d96527",
     "Flash Builder": "#aca3a4",
+    "Geany": "#fbec75",
     "Gedit": "#872114",
     "GoLand": "#bd4ffc",
     "HBuilder X": "#1ba334",
-    "IntelliJ IDEA": "#237ce2",
-    "IntelliJ": "#237ce2",
+    "IntelliJ IDEA": "#2876e1",
+    "IntelliJ": "#2876e1",
     "Kakoune": "#dd5f4a",
     "Kate": "#3f4040",
+    "KDevelop": "#22a273",
     "Komodo": "#fcb414",
+    "Light Table": "#007ac1",
+    "MacRabbit Espresso": "#e6593f",
     "Micro": "#2c3494",
     "MonoDevelop": "#6185b3",
+    "MySQL Workbench": "#245279",
+    "Neovim": "#068304",
     "NetBeans": "#f1f6e2",
     "Notepad++": "#9ecf54",
     "Nova": "#ff054a",
     "Onivim": "#ee848e",
+    "Photoshop": "#0a0054",
     "PhpStorm": "#d93ac1",
     "PowerPoint": "#c6421f",
     "Processing": "#6a7152",
     "PyCharm": "#d2ee5c",
     "Pymakr": "#323d4f",
+    "QtCreator": "#7fc342",
     "Rider": "#f7a415",
+    "RStudio": "#2369c7",
     "RubyMine": "#ff6336",
     "Sketch": "#fdad00",
     "SlickEdit": "#57ca57",
+    "Spyder": "#ee181e",
     "SQL Server Management Studio": "#ffb901",
     "Sublime Text": "#ff9800",
     "Terminal": "#133f1c",
@@ -295,29 +402,17 @@
     "Visual Studio": "#9460cd",
     "VS Code": "#027acd",
     "VSCode": "#027acd",
+    "WebMatrix": "#aeaeae",
     "WebStorm": "#00c6d7",
+    "Wing": "#b3b3b3",
     "Word": "#0f4091",
     "WPS Office": "#fc6143",
     "Xamarin": "#3598db",
-    "Xcode": "#3fa7e4",
-    "Adobe XD": "#fd27bc",
-    "Code::Blocks": "#d0ce71",
-    "Embarcadero Delphi": "#d9242a",
-    "EmEditor": "#ed3103",
-    "Figma": "#c7b9ff",
-    "Firefox": "#d96527",
-    "Geany": "#fbec75",
-    "Light Table": "#007ac1",
-    "MacRabbit Espresso": "#e6593f",
-    "MySQL Workbench": "#245279",
-    "Photoshop": "#0a0054",
-    "QtCreator": "#7fc342",
-    "RStudio": "#2369c7",
-    "WebMatrix": "#aeaeae"
+    "Xcode": "#3fa7e4"
   },
   "operating_systems": {
     "Linux": "#f0b912",
     "Windows": "#00b7ee",
     "Mac": "#4d66cb"
   }
-}
+}

data/data.go

@@ -0,0 +1,6 @@
+package data
+
+import _ "embed"
+
+//go:embed colors.json
+var ColorsFile []byte

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,10 @@ services:
     image: postgres:12.3
     environment:
       POSTGRES_USER: "wakapi"
-      POSTGRES_PASSWORD: "CHANGE_ME!!!"
+      POSTGRES_PASSWORD: "choose-a-password"
       POSTGRES_DB: "wakapi"
+    volumes:
+      - wakapi-db-data:/var/lib/postgresql/data
+
+volumes:
+  wakapi-db-data: {}

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

entrypoint.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ "$WAKAPI_DB_TYPE" == "sqlite3" ] || [ "$WAKAPI_DB_TYPE" == "" ]; then
+  exec ./wakapi
+else
+  echo "Waiting for database to come up"
+  exec ./wait-for-it.sh   "$WAKAPI_DB_HOST:$WAKAPI_DB_PORT" -s -t 60 -- ./wakapi
+fi

etc/Caddyfile

@@ -0,0 +1,26 @@
+wakapi.yourdomain.tld {
+    encode zstd gzip
+
+    header {
+        Strict-Transport-Security "max-age=2592000; includeSubDomains"
+    }
+	
+    log {
+        output file /var/log/caddy/wakapi.dev.access.log
+        format single_field common_log
+    }
+
+    reverse_proxy http://[::1]:3000
+
+    @api path_regexp "^/api.*"
+    @notapi not path_regexp "^/api.*"
+
+    push @notapi /assets/vendor/source-sans-3.css
+    push @notapi /assets/css/app.dist.css
+    push @notapi /assets/vendor/petite-vue.min.js
+    push @notapi /assets/vendor/chart.min.js
+    push @notapi /assets/vendor/iconify.basic.min.js
+    push @notapi /assets/js/icons.dist.js
+    push @notapi /assets/js/base.js
+    push @notapi /assets/images/logo.svg
+}

etc/wakapi.service

@@ -0,0 +1,53 @@
+[Unit]
+Description=Wakapi
+StartLimitIntervalSec=400
+StartLimitBurst=3
+
+# Optional, in case you're running MySQL / Postgres with Systemd, too
+Requires=mysql.service
+After=mysql.service
+
+[Service]
+Type=simple
+
+# Assuming Wakapi executable is under /opt/wakapi and config file at /etc
+# Feel free to change this
+WorkingDirectory=/opt/wakapi
+ExecStart=/opt/wakapi/wakapi -config /etc/wakapi.yml
+
+# Environment variables, see README for more
+Environment=WAKAPI_DB_HOST=localhost
+Environment=WAKAPI_DB_USER=wakapi
+Environment=WAKAPI_DB_NAME=wakapi
+Environment=WAKAPI_DB_PASSWORD=secretpassword
+Environment=WAKAPI_PASSWORD_SALT=somerandomstring
+
+# TODO: Use Systemd's credentials management (https://systemd.io/CREDENTIALS/) introduced in v247 (%d syntax in v250) once more established
+
+# sudo groupadd wakapi
+# sudo useradd -g wakapi wakapi
+User=wakapi
+Group=wakapi
+
+Restart=on-failure
+RestartSec=90
+
+# Security hardening
+PrivateTmp=true
+PrivateUsers=true
+NoNewPrivileges=true
+ProtectSystem=full
+ProtectHome=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectKernelLogs=true
+ProtectControlGroups=true
+PrivateDevices=true
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+ProtectClock=true
+RestrictSUIDSGID=true
+ProtectHostname=true
+ProtectProc=invisible
+
+[Install]
+WantedBy=multi-user.target

go.mod

@@ -1,30 +1,75 @@
 module github.com/muety/wakapi
 
-go 1.13
+go 1.18
 
 require (
-	github.com/emvi/logbuch v1.1.1
-	github.com/go-co-op/gocron v0.3.3
-	github.com/gorilla/handlers v1.4.2
-	github.com/gorilla/mux v1.7.3
-	github.com/gorilla/schema v1.1.0
+	codeberg.org/Codeberg/avatars v0.0.0-20211228163022-8da63012fe69
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
+	github.com/duke-git/lancet/v2 v2.0.4
+	github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac
+	github.com/emersion/go-smtp v0.15.0
+	github.com/emvi/logbuch v1.2.0
+	github.com/getsentry/sentry-go v0.13.0
+	github.com/go-co-op/gocron v1.13.0
+	github.com/gorilla/handlers v1.5.1
+	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/schema v1.2.0
 	github.com/gorilla/securecookie v1.1.1
-	github.com/jinzhu/configor v1.2.0
-	github.com/kr/text v0.2.0 // 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/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/hashicorp/golang-lru v0.5.4
+	github.com/jinzhu/configor v1.2.1
+	github.com/leandro-lugaresi/hub v1.1.1
+	github.com/lpar/gzipped/v2 v2.0.2
+	github.com/mitchellh/hashstructure/v2 v2.0.2
+	github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e
 	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
-	go.uber.org/atomic v1.6.0
-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
-	gorm.io/driver/mysql v1.0.3
-	gorm.io/driver/postgres v1.0.5
-	gorm.io/driver/sqlite v1.1.3
-	gorm.io/gorm v1.20.11
+	github.com/stretchr/testify v1.7.0
+	github.com/swaggo/swag v1.8.1
+	go.uber.org/atomic v1.9.0
+	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	gorm.io/driver/mysql v1.3.3
+	gorm.io/driver/postgres v1.3.4
+	gorm.io/driver/sqlite v1.3.1
+	gorm.io/gorm v1.23.4
+)
+
+require (
+	github.com/BurntSushi/toml v1.1.0 // indirect
+	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/felixge/httpsnoop v1.0.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.20.0 // indirect
+	github.com/go-openapi/spec v0.20.6 // indirect
+	github.com/go-openapi/swag v0.21.1 // indirect
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
+	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
+	github.com/jackc/pgconn v1.11.0 // indirect
+	github.com/jackc/pgio v1.0.0 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgproto3/v2 v2.2.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
+	github.com/jackc/pgtype v1.10.0 // indirect
+	github.com/jackc/pgx/v4 v4.15.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
+	github.com/stretchr/objx v0.2.0 // indirect
+	golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
+	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.10 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -1,163 +1,87 @@
-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/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+codeberg.org/Codeberg/avatars v0.0.0-20211228163022-8da63012fe69 h1:/XvI42KX57UTpeIOIt7IfM+pmEFTL8FGtiIUGcGDOIU=
+codeberg.org/Codeberg/avatars v0.0.0-20211228163022-8da63012fe69/go.mod h1:ML/htpPRb3+owhkm4+qG2ZrXnk5WXaQLASOZ5GLCPi8=
 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/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/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
+github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
+github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
+github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
+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/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/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/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/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 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/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/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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/duke-git/lancet/v2 v2.0.4 h1:IvMurTpL0cGhQmGPtkCge2eCkuiu3USQtglZJnKXxEo=
+github.com/duke-git/lancet/v2 v2.0.4/go.mod h1:5Nawyf/bK783rCiHyVkZLx+jj8028oVVjLOrC21ZONA=
+github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac h1:tn/OQ2PmwQ0XFVgAHfjlLyqMewry25Rz7jWnVoh4Ggs=
+github.com/emersion/go-sasl v0.0.0-20211008083017-0b9dcfb154ac/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.2.0 h1:Bw0jQH1Dbs+oIygZBNx/2Ub1igXRFtKQrIMRrZdVFJM=
+github.com/emvi/logbuch v1.2.0/go.mod h1:hFxe0XQOFl76SkE/f0Pt5oQbXRZtyGa8EroBrrbQHuc=
+github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o=
+github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
+github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-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-co-op/gocron v1.13.0 h1:BjkuNImPy5NuIPEifhWItFG7pYyr27cyjS6BN9w/D4c=
+github.com/go-co-op/gocron v1.13.0/go.mod h1:GD5EIEly1YNW+LovFVx5dzbYVcIc8544K99D8UVRpGo=
+github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-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-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/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/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
+github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
+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/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jIQ=
+github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+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-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU=
+github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.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/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/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 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/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
+github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
+github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc=
+github.com/gorilla/schema v1.2.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/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/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/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
+github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -165,229 +89,117 @@ github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgO
 github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
 github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
 github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.4.0/go.mod h1:Y2O3ZDF0q4mMacyWV3AstPJpeHXWGEetiFttmq5lahk=
-github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
-github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
-github.com/jackc/pgconn v1.7.0 h1:pwjzcYyfmz/HQOQlENvG1OcDqauTGaqlVahq934F0/U=
-github.com/jackc/pgconn v1.7.0/go.mod h1:sF/lPpNEMEOp+IYhyQGdAvrG20gWf6A1tKlr0v7JMeA=
+github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
+github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
+github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
+github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ=
+github.com/jackc/pgconn v1.11.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
 github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
-github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA=
 github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
+github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
 github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
 github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.0.5 h1:NUbEWPmCQZbMmYlTjVoNPhc0CfnYyz2bfUAh6A5ZVJM=
-github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5ns=
+github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
-github.com/jackc/pgtype v1.2.0/go.mod h1:5m2OfMh1wTK7x+Fk952IDmI4nw3nPrvtQdM0ZT4WpC0=
-github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkALtxZMCH411K+tKzNpwzCKU+AnPzBKZ+I+Po=
-github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
-github.com/jackc/pgtype v1.5.0 h1:jzBqRk2HFG2CV4AIwgCI2PwTgm6UUoCAK2ofHHRirtc=
-github.com/jackc/pgtype v1.5.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
+github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
+github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38=
+github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
-github.com/jackc/pgx/v4 v4.5.0/go.mod h1:EpAKPLdnTorwmPUUsqrPxy5fphV18j9q3wrfRXgo+kA=
-github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6fOLDxqtlyhe9UWgfIi9R8+8v8GKV5TRA/o=
-github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
-github.com/jackc/pgx/v4 v4.9.0 h1:6STjDqppM2ROy5p1wNDcsC7zJTjSHeuCsguZmXyzx7c=
-github.com/jackc/pgx/v4 v4.9.0/go.mod h1:MNGWmViCgqbZck9ujOOBN63gK9XVGILXWCvKLGKmnms=
+github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
+github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w=
+github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.2/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jinzhu/configor v1.2.0 h1:u78Jsrxw2+3sGbGMgpY64ObKU4xWCNmNRJIjGVqxYQA=
-github.com/jinzhu/configor v1.2.0/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
+github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jinzhu/configor v1.2.1 h1:OKk9dsR8i6HPOCZR8BcMtcEImAFjIhbJFZNyn5GCZko=
+github.com/jinzhu/configor v1.2.1/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.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/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/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/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/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/kevinpollet/nego v0.0.0-20200324111829-b3061ca9dd9d/go.mod h1:3FSWkzk9h42opyV0o357Fq6gsLF/A6MI/qOca9kKobY=
+github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43 h1:Pdirg1gwhEcGjMLyuSxGn9664p+P8J9SrfMgpFwrDyg=
+github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43/go.mod h1:ahLMuLCUyDdXqtqGyuwGev7/PGtO7r7ocvdwDuEN/3E=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2 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/leandro-lugaresi/hub v1.1.1 h1:zqp0HzFvj4HtqjMBXM2QF17o6PNmR8MJOChgeKl/aw8=
+github.com/leandro-lugaresi/hub v1.1.1/go.mod h1:XEFWanhHv6Rt3XlteHMxuNDYi8dJcpJjodpqkU+BtIo=
 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/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/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
+github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lpar/gzipped/v2 v2.0.2 h1:y7FjyTH07f8dX0YQ5o0sg2DTbRnmS3oT1pUvxViQ//o=
+github.com/lpar/gzipped/v2 v2.0.2/go.mod h1:qb7pLOGFgqz5w9xGGiiRFPxuGZ7GqWEuXUKXSbgonkQ=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+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/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 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 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/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 v1.1.0 h1:P6P1hdjqAAknpY/M1CGipelZgp+4y9ja9kmUZPXP+H0=
-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/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/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
+github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
+github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e h1:bR8DQ4ZfItytLJwRlrLOPUHd5z18V6tECwYQFy8W+8g=
+github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e/go.mod h1:m9BzkaxwU4IfPQi9ko23cmuFltayFe8iS0dlRlnEWiM=
 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/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/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/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/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 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/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 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/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/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/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 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=
@@ -396,27 +208,22 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-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/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/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/swaggo/swag v1.8.1 h1:JuARzFX1Z1njbCGz+ZytBR15TFJwF2Q7fu8puJHhQYI=
+github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ=
+github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
+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/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 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=
@@ -424,164 +231,113 @@ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9E
 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-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/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA=
+golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 h1:LRtI4W37N+KFebI/qV0OFiLUv4GLOWeEW5hn/KEJvxE=
+golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 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/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/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57 h1:LQmS1nU0twXLA96Kt7U9qtHJEbBk3z6Q0V4UXjZkpr4=
+golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
+golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/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-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-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-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/net v0.0.0-20190827160401-ba9fcec4b297/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/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 h1:CIJ76btIcR3eFI5EgSo6k1qKw9KJexJuRLI9G7Hp5wE=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/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/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-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-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-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae 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-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 h1:nonptSpoQ4vQjyraW20DXPAglgQfVnM9ZC6MmNLMR60=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/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/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/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-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-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-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-20200103221440-774c71fcf114 h1:DnSr2mCsxyCE6ZgIkmcWUQY2R5cH/6wL7eIxEmQOMSE=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023 h1:0c3L82FDQ5rt1bjTBlchS8t6RQ6299/+5bWMnRLh+uI=
+golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
+golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/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=
+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=
 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/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/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.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.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v2 v2.2.3/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/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.0.3 h1:+JKBYPfn1tygR1/of/Fh2T8iwuVwzt+PEJmKaXzMQXg=
-gorm.io/driver/mysql v1.0.3/go.mod h1:twGxftLBlFgNVNakL7F+P/x9oYqoymG3YYT8cAfI9oI=
-gorm.io/driver/postgres v1.0.5 h1:raX6ezL/ciUmaYTvOq48jq1GE95aMC0CmxQYbxQ4Ufw=
-gorm.io/driver/postgres v1.0.5/go.mod h1:qrD92UurYzNctBMVCJ8C3VQEjffEuphycXtxOudXNCA=
-gorm.io/driver/sqlite v1.1.3 h1:BYfdVuZB5He/u9dt4qDpZqiqDJ6KhPqs5QUqsr/Eeuc=
-gorm.io/driver/sqlite v1.1.3/go.mod h1:AKDgRWk8lcSQSw+9kxCJnX/yySj8G3rdwYlU57cB45c=
-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=
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.3.3 h1:jXG9ANrwBc4+bMvBcSl8zCfPBaVoPyBEBshA8dA93X8=
+gorm.io/driver/mysql v1.3.3/go.mod h1:ChK6AHbHgDCFZyJp0F+BmVGb06PSIoh9uVYKAlRbb2U=
+gorm.io/driver/postgres v1.3.4 h1:evZ7plF+Bp+Lr1mO5NdPvd6M/N98XtwHixGB+y7fdEQ=
+gorm.io/driver/postgres v1.3.4/go.mod h1:y0vEuInFKJtijuSGu9e5bs5hzzSzPK+LancpKpvbRBw=
+gorm.io/driver/sqlite v1.3.1 h1:bwfE+zTEWklBYoEodIOIBwuWHpnx52Z9zJFW5F33WLk=
+gorm.io/driver/sqlite v1.3.1/go.mod h1:wJx0hJspfycZ6myN38x1O/AqLtNS6c5o9TndewFbELg=
+gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/gorm v1.23.4 h1:1BKWM67O6CflSLcwGQR7ccfmC4ebOxQrTfOQGRE9wjg=
+gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 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=

main.go

@@ -1,24 +1,30 @@
 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/common"
-	"github.com/muety/wakapi/repositories"
-	"gorm.io/gorm/logger"
+	"embed"
+	"github.com/muety/wakapi/migrations"
+	"io/fs"
 	"log"
+	"net"
 	"net/http"
 	"os"
 	"strconv"
 	"time"
 
+	"github.com/lpar/gzipped/v2"
+	"github.com/muety/wakapi/routes/relay"
+
+	"github.com/emvi/logbuch"
+	"github.com/gorilla/handlers"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/repositories"
+	"github.com/muety/wakapi/routes/api"
+	"github.com/muety/wakapi/services/mail"
+	fsutils "github.com/muety/wakapi/utils/fs"
+	"gorm.io/gorm/logger"
+
 	"github.com/gorilla/mux"
 	"github.com/muety/wakapi/middlewares"
-	customMiddleware "github.com/muety/wakapi/middlewares/custom"
 	"github.com/muety/wakapi/routes"
 	shieldsV1Routes "github.com/muety/wakapi/routes/compat/shields/v1"
 	wtV1Routes "github.com/muety/wakapi/routes/compat/wakatime/v1"
@@ -29,6 +35,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
@@ -39,8 +53,11 @@ var (
 	heartbeatRepository       repositories.IHeartbeatRepository
 	userRepository            repositories.IUserRepository
 	languageMappingRepository repositories.ILanguageMappingRepository
+	projectLabelRepository    repositories.IProjectLabelRepository
 	summaryRepository         repositories.ISummaryRepository
 	keyValueRepository        repositories.IKeyValueRepository
+	diagnosticsRepository     repositories.IDiagnosticsRepository
+	metricsRepository         *repositories.MetricsRepository
 )
 
 var (
@@ -48,16 +65,41 @@ var (
 	heartbeatService       services.IHeartbeatService
 	userService            services.IUserService
 	languageMappingService services.ILanguageMappingService
+	projectLabelService    services.IProjectLabelService
+	durationService        services.IDurationService
 	summaryService         services.ISummaryService
 	aggregationService     services.IAggregationService
+	mailService            services.IMailService
 	keyValueService        services.IKeyValueService
+	reportService          services.IReportService
+	diagnosticsService     services.IDiagnosticsService
 	miscService            services.IMiscService
 )
 
 // TODO: Refactor entire project to be structured after business domains
 
+// @title Wakapi API
+// @version 1.0
+// @description REST API to interact with [Wakapi](https://wakapi.dev)
+// @description
+// @description ## Authentication
+// @description Set header `Authorization` to your API Key encoded as Base64 and prefixed with `Basic`
+// @description **Example:** `Basic ODY2NDhkNzQtMTljNS00NTJiLWJhMDEtZmIzZWM3MGQ0YzJmCg==`
+
+// @contact.name Ferdinand Mütsch
+// @contact.url https://github.com/muety
+// @contact.email ferdinand@muetsch.io
+
+// @license.name GPL-3.0
+// @license.url https://github.com/muety/wakapi/blob/master/LICENSE
+
+// @securitydefinitions.apikey ApiKeyAuth
+// @in header
+// @name Authorization
+
+// @BasePath /api
 func main() {
-	config = conf.Load()
+	config = conf.Load(version)
 
 	// Set log level
 	if config.IsDev() {
@@ -79,14 +121,14 @@ func main() {
 	// Connect to database
 	var err error
 	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger})
-	if config.Db.Dialect == "sqlite3" {
-		db.Raw("PRAGMA foreign_keys = ON;")
+	if config.Db.IsSQLite() {
+		db.Exec("PRAGMA foreign_keys = ON;")
 	}
 
 	if config.IsDev() {
 		db = db.Debug()
 	}
-	sqlDb, _ := db.DB()
+	sqlDb, err := db.DB()
 	sqlDb.SetMaxIdleConns(int(config.Db.MaxConn))
 	sqlDb.SetMaxOpenConns(int(config.Db.MaxConn))
 	if err != nil {
@@ -96,105 +138,144 @@ func main() {
 	defer sqlDb.Close()
 
 	// Migrate database schema
-	common.RunCustomPreMigrations(db, config)
-	runDatabaseMigrations()
-	common.RunCustomPostMigrations(db, config)
+	if !config.SkipMigrations {
+		migrations.Run(db, config)
+	}
 
 	// Repositories
 	aliasRepository = repositories.NewAliasRepository(db)
 	heartbeatRepository = repositories.NewHeartbeatRepository(db)
 	userRepository = repositories.NewUserRepository(db)
 	languageMappingRepository = repositories.NewLanguageMappingRepository(db)
+	projectLabelRepository = repositories.NewProjectLabelRepository(db)
 	summaryRepository = repositories.NewSummaryRepository(db)
 	keyValueRepository = repositories.NewKeyValueRepository(db)
+	diagnosticsRepository = repositories.NewDiagnosticsRepository(db)
+	metricsRepository = repositories.NewMetricsRepository(db)
 
 	// Services
+	mailService = mail.NewMailService()
 	aliasService = services.NewAliasService(aliasRepository)
-	userService = services.NewUserService(userRepository)
+	userService = services.NewUserService(mailService, userRepository)
 	languageMappingService = services.NewLanguageMappingService(languageMappingRepository)
+	projectLabelService = services.NewProjectLabelService(projectLabelRepository)
 	heartbeatService = services.NewHeartbeatService(heartbeatRepository, languageMappingService)
-	summaryService = services.NewSummaryService(summaryRepository, heartbeatService, aliasService)
+	durationService = services.NewDurationService(heartbeatService)
+	summaryService = services.NewSummaryService(summaryRepository, durationService, aliasService, projectLabelService)
 	aggregationService = services.NewAggregationService(userService, summaryService, heartbeatService)
 	keyValueService = services.NewKeyValueService(keyValueRepository)
+	reportService = services.NewReportService(summaryService, userService, mailService)
+	diagnosticsService = services.NewDiagnosticsService(diagnosticsRepository)
 	miscService = services.NewMiscService(userService, summaryService, keyValueService)
 
 	// Schedule background tasks
 	go aggregationService.Schedule()
 	go miscService.ScheduleCountTotalTime()
-
-	// TODO: move endpoint registration to the respective routes files
+	go reportService.Schedule()
 
 	routes.Init()
 
-	// Handlers
-	summaryHandler := routes.NewSummaryHandler(summaryService)
-	healthHandler := routes.NewHealthHandler(db)
-	heartbeatHandler := routes.NewHeartbeatHandler(heartbeatService, languageMappingService)
-	settingsHandler := routes.NewSettingsHandler(userService, summaryService, aliasService, aggregationService, languageMappingService)
-	homeHandler := routes.NewHomeHandler(keyValueService)
-	loginHandler := routes.NewLoginHandler(userService)
-	imprintHandler := routes.NewImprintHandler(keyValueService)
-	wakatimeV1AllHandler := wtV1Routes.NewAllTimeHandler(summaryService)
-	wakatimeV1SummariesHandler := wtV1Routes.NewSummariesHandler(summaryService)
+	// API Handlers
+	healthApiHandler := api.NewHealthApiHandler(db)
+	heartbeatApiHandler := api.NewHeartbeatApiHandler(userService, heartbeatService, languageMappingService)
+	summaryApiHandler := api.NewSummaryApiHandler(userService, summaryService)
+	metricsHandler := api.NewMetricsHandler(userService, summaryService, heartbeatService, keyValueService, metricsRepository)
+	diagnosticsHandler := api.NewDiagnosticsApiHandler(userService, diagnosticsService)
+	avatarHandler := api.NewAvatarHandler()
+	badgeHandler := api.NewBadgeHandler(userService, summaryService)
+
+	// Compat Handlers
+	wakatimeV1StatusBarHandler := wtV1Routes.NewStatusBarHandler(userService, summaryService)
+	wakatimeV1AllHandler := wtV1Routes.NewAllTimeHandler(userService, summaryService)
+	wakatimeV1SummariesHandler := wtV1Routes.NewSummariesHandler(userService, summaryService)
+	wakatimeV1StatsHandler := wtV1Routes.NewStatsHandler(userService, summaryService)
+	wakatimeV1UsersHandler := wtV1Routes.NewUsersHandler(userService, heartbeatService)
+	wakatimeV1ProjectsHandler := wtV1Routes.NewProjectsHandler(userService, heartbeatService)
+	wakatimeV1HeartbeatsHandler := wtV1Routes.NewHeartbeatHandler(userService, heartbeatService)
 	shieldV1BadgeHandler := shieldsV1Routes.NewBadgeHandler(summaryService, userService)
 
+	// MVC Handlers
+	summaryHandler := routes.NewSummaryHandler(summaryService, userService)
+	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, projectLabelService, keyValueService, mailService)
+	homeHandler := routes.NewHomeHandler(keyValueService)
+	loginHandler := routes.NewLoginHandler(userService, mailService)
+	imprintHandler := routes.NewImprintHandler(keyValueService)
+
+	// Other Handlers
+	relayHandler := relay.NewRelayHandler()
+
 	// Setup Routers
 	router := mux.NewRouter()
-	publicRouter := router.PathPrefix("/").Subrouter()
-	settingsRouter := publicRouter.PathPrefix("/settings").Subrouter()
-	summaryRouter := publicRouter.PathPrefix("/summary").Subrouter()
-	apiRouter := router.PathPrefix("/api").Subrouter()
-	summaryApiRouter := apiRouter.PathPrefix("/summary").Subrouter()
-	heartbeatApiRouter := apiRouter.PathPrefix("/heartbeat").Subrouter()
-	healthApiRouter := apiRouter.PathPrefix("/health").Subrouter()
-	compatRouter := apiRouter.PathPrefix("/compat").Subrouter()
-	wakatimeV1Router := compatRouter.PathPrefix("/wakatime/v1/users/{user}").Subrouter()
-	shieldsV1Router := compatRouter.PathPrefix("/shields/v1/{user}").Subrouter()
+	rootRouter := router.PathPrefix("/").Subrouter()
+	apiRouter := router.PathPrefix("/api").Subrouter().StrictSlash(true)
 
-	// Middlewares
-	recoveryMiddleware := handlers.RecoveryHandler()
-	loggingMiddleware := middlewares.NewLoggingMiddleware(
-		// Use logbuch here once https://github.com/emvi/logbuch/issues/4 is realized
-		log.New(os.Stdout, "", log.LstdFlags),
-	)
-	corsMiddleware := handlers.CORS()
-	authenticateMiddleware := middlewares.NewAuthenticateMiddleware(
-		userService,
-		[]string{"/api/health", "/api/compat/shields/v1"},
-	).Handler
-	wakatimeRelayMiddleware := customMiddleware.NewWakatimeRelayMiddleware().Handler
+	// https://github.com/gorilla/mux/issues/416
+	router.NotFoundHandler = router.NewRoute().BuildOnly().HandlerFunc(http.NotFound).GetHandler()
+	router.NotFoundHandler = middlewares.NewLoggingMiddleware(logbuch.Info, []string{
+		"/assets",
+		"/favicon",
+		"/service-worker.js",
+	})(router.NotFoundHandler)
 
-	// Router configs
-	router.Use(loggingMiddleware, recoveryMiddleware)
-	summaryRouter.Use(authenticateMiddleware)
-	settingsRouter.Use(authenticateMiddleware)
-	apiRouter.Use(corsMiddleware, authenticateMiddleware)
-	heartbeatApiRouter.Use(wakatimeRelayMiddleware)
+	// Globally used middlewares
+	router.Use(middlewares.NewPrincipalMiddleware())
+	router.Use(middlewares.NewLoggingMiddleware(logbuch.Info, []string{"/assets", "/api/health"}))
+	router.Use(handlers.RecoveryHandler())
+	if config.Sentry.Dsn != "" {
+		router.Use(middlewares.NewSentryMiddleware())
+	}
+	rootRouter.Use(middlewares.NewSecurityMiddleware())
 
 	// Route registrations
-	homeHandler.RegisterRoutes(publicRouter)
-	loginHandler.RegisterRoutes(publicRouter)
-	imprintHandler.RegisterRoutes(publicRouter)
-	summaryHandler.RegisterRoutes(summaryRouter)
-	settingsHandler.RegisterRoutes(settingsRouter)
+	homeHandler.RegisterRoutes(rootRouter)
+	loginHandler.RegisterRoutes(rootRouter)
+	imprintHandler.RegisterRoutes(rootRouter)
+	summaryHandler.RegisterRoutes(rootRouter)
+	settingsHandler.RegisterRoutes(rootRouter)
+	relayHandler.RegisterRoutes(rootRouter)
 
-	// API Route registrations
-	summaryHandler.RegisterAPIRoutes(summaryApiRouter)
-	healthHandler.RegisterAPIRoutes(healthApiRouter)
-	heartbeatHandler.RegisterAPIRoutes(heartbeatApiRouter)
-	wakatimeV1AllHandler.RegisterAPIRoutes(wakatimeV1Router)
-	wakatimeV1SummariesHandler.RegisterAPIRoutes(wakatimeV1Router)
-	shieldV1BadgeHandler.RegisterAPIRoutes(shieldsV1Router)
+	// API route registrations
+	summaryApiHandler.RegisterRoutes(apiRouter)
+	healthApiHandler.RegisterRoutes(apiRouter)
+	heartbeatApiHandler.RegisterRoutes(apiRouter)
+	metricsHandler.RegisterRoutes(apiRouter)
+	diagnosticsHandler.RegisterRoutes(apiRouter)
+	avatarHandler.RegisterRoutes(apiRouter)
+	badgeHandler.RegisterRoutes(apiRouter)
+	wakatimeV1StatusBarHandler.RegisterRoutes(apiRouter)
+	wakatimeV1AllHandler.RegisterRoutes(apiRouter)
+	wakatimeV1SummariesHandler.RegisterRoutes(apiRouter)
+	wakatimeV1StatsHandler.RegisterRoutes(apiRouter)
+	wakatimeV1UsersHandler.RegisterRoutes(apiRouter)
+	wakatimeV1ProjectsHandler.RegisterRoutes(apiRouter)
+	wakatimeV1HeartbeatsHandler.RegisterRoutes(apiRouter)
+	shieldV1BadgeHandler.RegisterRoutes(apiRouter)
 
 	// Static Routes
-	router.PathPrefix("/assets").Handler(http.FileServer(pkger.Dir("/static")))
+	// https://github.com/golang/go/issues/43431
+	embeddedStatic, _ := fs.Sub(staticFiles, "static")
+	static := conf.ChooseFS("static", embeddedStatic)
+
+	assetsFileServer := gzipped.FileServer(fsutils.NewExistsHttpFS(
+		fsutils.NewExistsFS(static).WithCache(!config.IsDev()),
+	))
+	staticFileServer := http.FileServer(http.FS(
+		fsutils.NeuteredFileSystem{FS: static},
+	))
+
+	router.PathPrefix("/contribute.json").Handler(staticFileServer)
+	router.PathPrefix("/assets").Handler(assetsFileServer)
+	router.PathPrefix("/swagger-ui").Handler(staticFileServer)
+	router.PathPrefix("/docs").Handler(
+		middlewares.NewFileTypeFilterMiddleware([]string{".go"})(staticFileServer),
+	)
 
 	// Listen HTTP
 	listen(router)
 }
 
 func listen(handler http.Handler) {
-	var s4, s6 *http.Server
+	var s4, s6, sSocket *http.Server
 
 	// IPv4
 	if config.Server.ListenIpV4 != "" {
@@ -202,8 +283,8 @@ func listen(handler http.Handler) {
 		s4 = &http.Server{
 			Handler:      handler,
 			Addr:         bindString4,
-			ReadTimeout:  10 * time.Second,
-			WriteTimeout: 10 * time.Second,
+			ReadTimeout:  time.Duration(config.Server.TimeoutSec) * time.Second,
+			WriteTimeout: time.Duration(config.Server.TimeoutSec) * time.Second,
 		}
 	}
 
@@ -213,8 +294,24 @@ func listen(handler http.Handler) {
 		s6 = &http.Server{
 			Handler:      handler,
 			Addr:         bindString6,
-			ReadTimeout:  10 * time.Second,
-			WriteTimeout: 10 * time.Second,
+			ReadTimeout:  time.Duration(config.Server.TimeoutSec) * time.Second,
+			WriteTimeout: time.Duration(config.Server.TimeoutSec) * time.Second,
+		}
+	}
+
+	// UNIX domain socket
+	if config.Server.ListenSocket != "" {
+		// Remove if exists
+		if _, err := os.Stat(config.Server.ListenSocket); err == nil {
+			logbuch.Info("--> Removing unix socket %s", config.Server.ListenSocket)
+			if err := os.Remove(config.Server.ListenSocket); err != nil {
+				logbuch.Fatal(err.Error())
+			}
+		}
+		sSocket = &http.Server{
+			Handler:      handler,
+			ReadTimeout:  time.Duration(config.Server.TimeoutSec) * time.Second,
+			WriteTimeout: time.Duration(config.Server.TimeoutSec) * time.Second,
 		}
 	}
 
@@ -235,6 +332,18 @@ func listen(handler http.Handler) {
 				}
 			}()
 		}
+		if sSocket != nil {
+			logbuch.Info("--> Listening for HTTPS on %s... ✅", config.Server.ListenSocket)
+			go func() {
+				unixListener, err := net.Listen("unix", config.Server.ListenSocket)
+				if err != nil {
+					logbuch.Fatal(err.Error())
+				}
+				if err := sSocket.ServeTLS(unixListener, config.Server.TlsCertPath, config.Server.TlsKeyPath); err != nil {
+					logbuch.Fatal(err.Error())
+				}
+			}()
+		}
 	} else {
 		if s4 != nil {
 			logbuch.Info("--> Listening for HTTP on %s... ✅", s4.Addr)
@@ -252,13 +361,19 @@ func listen(handler http.Handler) {
 				}
 			}()
 		}
+		if sSocket != nil {
+			logbuch.Info("--> Listening for HTTP on %s... ✅", config.Server.ListenSocket)
+			go func() {
+				unixListener, err := net.Listen("unix", config.Server.ListenSocket)
+				if err != nil {
+					logbuch.Fatal(err.Error())
+				}
+				if err := sSocket.Serve(unixListener); err != nil {
+					logbuch.Fatal(err.Error())
+				}
+			}()
+		}
 	}
 
 	<-make(chan interface{}, 1)
 }
-
-func runDatabaseMigrations() {
-	if err := config.GetMigrationFunc(config.Db.Dialect)(db); err != nil {
-		logbuch.Fatal(err.Error())
-	}
-}

middlewares/authenticate.go

@@ -1,30 +1,50 @@
 package middlewares
 
 import (
-	"context"
 	"fmt"
+	"net/http"
+	"strings"
+
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
-	"net/http"
-	"strings"
+)
+
+const (
+	// queryApiKey is the query parameter name for api key.
+	queryApiKey = "api_key"
+)
+
+var (
+	errEmptyKey = fmt.Errorf("the api_key is empty")
 )
 
 type AuthenticateMiddleware struct {
-	config         *conf.Config
-	userSrvc       services.IUserService
-	whitelistPaths []string
+	config           *conf.Config
+	userSrvc         services.IUserService
+	optionalForPaths []string
+	redirectTarget   string // optional
 }
 
-func NewAuthenticateMiddleware(userService services.IUserService, whitelistPaths []string) *AuthenticateMiddleware {
+func NewAuthenticateMiddleware(userService services.IUserService) *AuthenticateMiddleware {
 	return &AuthenticateMiddleware{
-		config:         conf.Get(),
-		userSrvc:       userService,
-		whitelistPaths: whitelistPaths,
+		config:           conf.Get(),
+		userSrvc:         userService,
+		optionalForPaths: []string{},
 	}
 }
 
+func (m *AuthenticateMiddleware) WithOptionalFor(paths []string) *AuthenticateMiddleware {
+	m.optionalForPaths = paths
+	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)
@@ -32,35 +52,46 @@ func (m *AuthenticateMiddleware) Handler(h http.Handler) http.Handler {
 }
 
 func (m *AuthenticateMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
-	for _, p := range m.whitelistPaths {
-		if strings.HasPrefix(r.URL.Path, p) || r.URL.Path == p {
-			next(w, r)
-			return
-		}
-	}
-
 	var user *models.User
 	user, err := m.tryGetUserByCookie(r)
 
 	if err != nil {
-		user, err = m.tryGetUserByApiKey(r)
+		user, err = m.tryGetUserByApiKeyHeader(r)
+	}
+	if err != nil {
+		user, err = m.tryGetUserByApiKeyQuery(r)
 	}
 
-	if err != nil {
-		if strings.HasPrefix(r.URL.Path, "/api") {
+	if err != nil || user == nil {
+		if m.isOptional(r.URL.Path) {
+			next(w, r)
+			return
+		}
+
+		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.SetCookie(w, m.config.GetClearCookie(models.AuthCookieKey))
+			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) tryGetUserByApiKey(r *http.Request) (*models.User, error) {
+func (m *AuthenticateMiddleware) isOptional(requestPath string) bool {
+	for _, p := range m.optionalForPaths {
+		if strings.HasPrefix(requestPath, p) || requestPath == p {
+			return true
+		}
+	}
+	return false
+}
+
+func (m *AuthenticateMiddleware) tryGetUserByApiKeyHeader(r *http.Request) (*models.User, error) {
 	key, err := utils.ExtractBearerAuth(r)
 	if err != nil {
 		return nil, err
@@ -75,6 +106,20 @@ func (m *AuthenticateMiddleware) tryGetUserByApiKey(r *http.Request) (*models.Us
 	return user, nil
 }
 
+func (m *AuthenticateMiddleware) tryGetUserByApiKeyQuery(r *http.Request) (*models.User, error) {
+	key := r.URL.Query().Get(queryApiKey)
+	var user *models.User
+	userKey := strings.TrimSpace(key)
+	if userKey == "" {
+		return nil, errEmptyKey
+	}
+	user, err := m.userSrvc.GetUserByKey(userKey)
+	if err != nil {
+		return nil, err
+	}
+	return user, nil
+}
+
 func (m *AuthenticateMiddleware) tryGetUserByCookie(r *http.Request) (*models.User, error) {
 	username, err := utils.ExtractCookieAuth(r, m.config)
 	if err != nil {

middlewares/authenticate_test.go

@@ -3,14 +3,16 @@ package middlewares
 import (
 	"encoding/base64"
 	"fmt"
+	"net/http"
+	"net/url"
+	"testing"
+
 	"github.com/muety/wakapi/mocks"
 	"github.com/muety/wakapi/models"
 	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
-func TestAuthenticateMiddleware_tryGetUserByApiKey_Success(t *testing.T) {
+func TestAuthenticateMiddleware_tryGetUserByApiKeyHeader_Success(t *testing.T) {
 	testApiKey := "z5uig69cn9ut93n"
 	testToken := base64.StdEncoding.EncodeToString([]byte(testApiKey))
 	testUser := &models.User{ApiKey: testApiKey}
@@ -24,15 +26,15 @@ func TestAuthenticateMiddleware_tryGetUserByApiKey_Success(t *testing.T) {
 	userServiceMock := new(mocks.UserServiceMock)
 	userServiceMock.On("GetUserByKey", testApiKey).Return(testUser, nil)
 
-	sut := NewAuthenticateMiddleware(userServiceMock, []string{})
+	sut := NewAuthenticateMiddleware(userServiceMock)
 
-	result, err := sut.tryGetUserByApiKey(mockRequest)
+	result, err := sut.tryGetUserByApiKeyHeader(mockRequest)
 
 	assert.Nil(t, err)
 	assert.Equal(t, testUser, result)
 }
 
-func TestAuthenticateMiddleware_tryGetUserByApiKey_InvalidHeader(t *testing.T) {
+func TestAuthenticateMiddleware_tryGetUserByApiKeyHeader_Invalid(t *testing.T) {
 	testApiKey := "z5uig69cn9ut93n"
 	testToken := base64.StdEncoding.EncodeToString([]byte(testApiKey))
 
@@ -45,12 +47,57 @@ func TestAuthenticateMiddleware_tryGetUserByApiKey_InvalidHeader(t *testing.T) {
 
 	userServiceMock := new(mocks.UserServiceMock)
 
-	sut := NewAuthenticateMiddleware(userServiceMock, []string{})
+	sut := NewAuthenticateMiddleware(userServiceMock)
 
-	result, err := sut.tryGetUserByApiKey(mockRequest)
+	result, err := sut.tryGetUserByApiKeyHeader(mockRequest)
 
 	assert.Error(t, err)
 	assert.Nil(t, result)
 }
 
+func TestAuthenticateMiddleware_tryGetUserByApiKeyQuery_Success(t *testing.T) {
+	testApiKey := "z5uig69cn9ut93n"
+	testUser := &models.User{ApiKey: testApiKey}
+
+	params := url.Values{}
+	params.Add("api_key", testApiKey)
+	mockRequest := &http.Request{
+		URL: &url.URL{
+			RawQuery: params.Encode(),
+		},
+	}
+
+	userServiceMock := new(mocks.UserServiceMock)
+	userServiceMock.On("GetUserByKey", testApiKey).Return(testUser, nil)
+
+	sut := NewAuthenticateMiddleware(userServiceMock)
+
+	result, err := sut.tryGetUserByApiKeyQuery(mockRequest)
+
+	assert.Nil(t, err)
+	assert.Equal(t, testUser, result)
+}
+
+func TestAuthenticateMiddleware_tryGetUserByApiKeyQuery_Invalid(t *testing.T) {
+	testApiKey := "z5uig69cn9ut93n"
+
+	params := url.Values{}
+	params.Add("token", testApiKey)
+	mockRequest := &http.Request{
+		URL: &url.URL{
+			RawQuery: params.Encode(),
+		},
+	}
+
+	userServiceMock := new(mocks.UserServiceMock)
+
+	sut := NewAuthenticateMiddleware(userServiceMock)
+
+	result, actualErr := sut.tryGetUserByApiKeyQuery(mockRequest)
+
+	assert.Error(t, actualErr)
+	assert.Equal(t, errEmptyKey, actualErr)
+	assert.Nil(t, result)
+}
+
 // TODO: somehow test cookie auth function

middlewares/custom/wakatime.go

@@ -3,19 +3,30 @@ package relay
 import (
 	"bytes"
 	"encoding/base64"
+	"encoding/json"
+	"errors"
 	"fmt"
 	"github.com/emvi/logbuch"
+	"github.com/leandro-lugaresi/hub"
 	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
+	routeutils "github.com/muety/wakapi/routes/utils"
+	"github.com/patrickmn/go-cache"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"time"
 )
 
-/* Middleware to conditionally relay heartbeats to Wakatime */
+const maxFailuresPerDay = 100
+
+// WakatimeRelayMiddleware is a middleware to conditionally relay heartbeats to Wakatime (and other compatible services)
 type WakatimeRelayMiddleware struct {
-	httpClient *http.Client
+	httpClient   *http.Client
+	hashCache    *cache.Cache
+	failureCache *cache.Cache
+	eventBus     *hub.Hub
 }
 
 func NewWakatimeRelayMiddleware() *WakatimeRelayMiddleware {
@@ -23,6 +34,9 @@ func NewWakatimeRelayMiddleware() *WakatimeRelayMiddleware {
 		httpClient: &http.Client{
 			Timeout: 10 * time.Second,
 		},
+		hashCache:    cache.New(10*time.Minute, 10*time.Minute),
+		failureCache: cache.New(24*time.Hour, 1*time.Hour),
+		eventBus:     config.EventBus(),
 	}
 }
 
@@ -35,19 +49,34 @@ func (m *WakatimeRelayMiddleware) Handler(h http.Handler) http.Handler {
 func (m *WakatimeRelayMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
 	defer next(w, r)
 
-	if r.Method != http.MethodPost {
+	ownInstanceId := config.Get().InstanceId
+	originInstanceId := r.Header.Get("X-Origin-Instance")
+
+	if r.Method != http.MethodPost || originInstanceId == ownInstanceId {
 		return
 	}
 
-	user := r.Context().Value(models.UserKey).(*models.User)
+	user := middlewares.GetPrincipal(r)
 	if user == nil || user.WakatimeApiKey == "" {
 		return
 	}
 
+	err := m.filterByCache(r)
+	if err != nil {
+		logbuch.Warn("%v", err)
+		return
+	}
+
 	body, _ := ioutil.ReadAll(r.Body)
 	r.Body.Close()
 	r.Body = ioutil.NopCloser(bytes.NewBuffer(body))
 
+	// prevent cycles
+	downstreamInstanceId := ownInstanceId
+	if originInstanceId != "" {
+		downstreamInstanceId = originInstanceId
+	}
+
 	headers := http.Header{
 		"X-Machine-Name": r.Header.Values("X-Machine-Name"),
 		"Content-Type":   r.Header.Values("Content-Type"),
@@ -56,23 +85,27 @@ func (m *WakatimeRelayMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reque
 		"X-Origin": []string{
 			fmt.Sprintf("wakapi v%s", config.Get().Version),
 		},
+		"X-Origin-Instance": []string{downstreamInstanceId},
 		"Authorization": []string{
 			fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(user.WakatimeApiKey))),
 		},
 	}
 
+	url := user.WakaTimeURL(config.WakatimeApiUrl) + config.WakatimeApiHeartbeatsBulkUrl
+
 	go m.send(
 		http.MethodPost,
-		config.WakatimeApiUrl+config.WakatimeApiHeartbeatsEndpoint,
+		url,
 		bytes.NewReader(body),
 		headers,
+		user,
 	)
 }
 
-func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, headers http.Header) {
+func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, headers http.Header, forUser *models.User) {
 	request, err := http.NewRequest(method, url, body)
 	if err != nil {
-		logbuch.Warn("error constructing relayed request – %v", err)
+		logbuch.Warn("error constructing relayed request - %v", err)
 		return
 	}
 
@@ -84,11 +117,74 @@ func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, heade
 
 	response, err := m.httpClient.Do(request)
 	if err != nil {
-		logbuch.Warn("error executing relayed request – %v", err)
+		logbuch.Warn("error executing relayed request - %v", err)
 		return
 	}
 
 	if response.StatusCode < 200 || response.StatusCode >= 300 {
-		logbuch.Warn("failed to relay request, got status %d", response.StatusCode)
+		logbuch.Warn("failed to relay request for user %s, got status %d", forUser.ID, response.StatusCode)
+
+		// TODO: use leaky bucket instead of expiring cache?
+		if _, found := m.failureCache.Get(forUser.ID); !found {
+			m.failureCache.SetDefault(forUser.ID, 0)
+		}
+		if n, _ := m.failureCache.IncrementInt(forUser.ID, 1); n == maxFailuresPerDay {
+			m.eventBus.Publish(hub.Message{
+				Name:   config.EventWakatimeFailure,
+				Fields: map[string]interface{}{config.FieldUser: forUser, config.FieldPayload: n},
+			})
+		} else if n%10 == 0 {
+			logbuch.Warn("%d / %d failed wakatime heartbeat relaying attempts for user %s within last 24 hours", n, maxFailuresPerDay, forUser.ID)
+		}
 	}
 }
+
+// filterByCache takes an HTTP request, tries to parse the body contents as heartbeats, checks against a local cache for whether a heartbeat has already been relayed before according to its hash and in-place filters these from the request's raw json body.
+// This method operates on the raw body data (interface{}), because serialization of models.Heartbeat is not necessarily identical to what the CLI has actually sent.
+// Purpose of this mechanism is mainly to prevent cyclic relays / loops.
+// Caution: this method does in-place changes to the request.
+func (m *WakatimeRelayMiddleware) filterByCache(r *http.Request) error {
+	heartbeats, err := routeutils.ParseHeartbeats(r)
+	if err != nil {
+		return err
+	}
+
+	body, _ := ioutil.ReadAll(r.Body)
+	r.Body.Close()
+	r.Body = ioutil.NopCloser(bytes.NewBuffer(body))
+
+	var rawData interface{}
+	if err := json.NewDecoder(ioutil.NopCloser(bytes.NewBuffer(body))).Decode(&rawData); err != nil {
+		return err
+	}
+
+	newData := make([]interface{}, 0, len(heartbeats))
+
+	for i, hb := range heartbeats {
+		hb = hb.Hashed()
+
+		// we didn't see this particular heartbeat before
+		if _, found := m.hashCache.Get(hb.Hash); !found {
+			m.hashCache.SetDefault(hb.Hash, true)
+			newData = append(newData, rawData.([]interface{})[i])
+			continue
+		}
+	}
+
+	if len(newData) == 0 {
+		return errors.New("no new heartbeats to relay")
+	}
+
+	if len(newData) != len(heartbeats) {
+		user := middlewares.GetPrincipal(r)
+		logbuch.Warn("only relaying %d of %d heartbeats for user %s", len(newData), len(heartbeats), user.ID)
+	}
+
+	buf := bytes.Buffer{}
+	if err := json.NewEncoder(&buf).Encode(newData); err != nil {
+		return err
+	}
+	r.Body = ioutil.NopCloser(&buf)
+
+	return nil
+}

middlewares/filetype.go

@@ -0,0 +1,32 @@
+package middlewares
+
+import (
+	"net/http"
+	"strings"
+)
+
+type SuffixFilterMiddleware struct {
+	handler     http.Handler
+	filterTypes []string
+}
+
+func NewFileTypeFilterMiddleware(filter []string) func(http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return &SuffixFilterMiddleware{
+			handler:     h,
+			filterTypes: filter,
+		}
+	}
+}
+
+func (f *SuffixFilterMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	path := strings.ToLower(r.URL.Path)
+	for _, t := range f.filterTypes {
+		if strings.HasSuffix(path, strings.ToLower(t)) {
+			w.WriteHeader(http.StatusForbidden)
+			w.Write([]byte("403 forbidden"))
+			return
+		}
+	}
+	f.handler.ServeHTTP(w, r)
+}

middlewares/logging.go

@@ -4,21 +4,25 @@ package middlewares
 
 import (
 	"io"
-	"log"
 	"net/http"
+	"strings"
 	"time"
 )
 
+type logFunc func(string, ...interface{})
+
 type LoggingMiddleware struct {
-	handler http.Handler
-	output  *log.Logger
+	handler         http.Handler
+	logFunc         logFunc
+	excludePrefixes []string
 }
 
-func NewLoggingMiddleware(output *log.Logger) 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,
+			handler:         h,
+			logFunc:         logFunc,
+			excludePrefixes: excludePrefixes,
 		}
 	}
 }
@@ -31,15 +35,22 @@ func (lg *LoggingMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	end := time.Now()
 	duration := end.Sub(start)
 
-	lg.output.Printf(
-		"%v status=%d, method=%s, uri=%s, duration=%v, bytes=%d, addr=%s\n",
-		time.Now().Format(time.RFC3339Nano),
+	path := strings.ToLower(r.URL.Path)
+	for _, prefix := range lg.excludePrefixes {
+		if strings.HasPrefix(path, prefix) {
+			return
+		}
+	}
+
+	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),
 	)
 }
 
@@ -54,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

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
+}

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' 'unsafe-eval'; 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)
+}

middlewares/sentry.go

@@ -0,0 +1,31 @@
+package middlewares
+
+import (
+	"context"
+	"github.com/getsentry/sentry-go"
+	sentryhttp "github.com/getsentry/sentry-go/http"
+	"net/http"
+)
+
+// SentryMiddleware is a wrapper around sentryhttp to include user information to traces
+type SentryMiddleware struct {
+	handler http.Handler
+}
+
+func NewSentryMiddleware() func(http.Handler) http.Handler {
+	return func(h http.Handler) http.Handler {
+		return sentryhttp.New(sentryhttp.Options{
+			Repanic: true,
+		}).Handle(&SentryMiddleware{handler: h})
+	}
+}
+
+func (h *SentryMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	ctx := context.WithValue(r.Context(), "-", "-")
+	h.handler.ServeHTTP(w, r.WithContext(ctx))
+	if hub := sentry.GetHubFromContext(ctx); hub != nil {
+		if user := GetPrincipal(r); user != nil {
+			hub.Scope().SetUser(sentry.User{ID: user.ID})
+		}
+	}
+}

migrations/20201103_rename_language_mappings_table.go

@@ -0,0 +1,32 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	f := migrationFunc{
+		name: "20201103-rename_language_mappings_table",
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			migrator := db.Migrator()
+			oldTableName, newTableName := "custom_rules", "language_mappings"
+			oldIndexName, newIndexName := "idx_customrule_user", "idx_language_mapping_user"
+
+			if migrator.HasTable(oldTableName) {
+				logbuch.Info("renaming '%s' table to '%s'", oldTableName, newTableName)
+				if err := migrator.RenameTable(oldTableName, &models.LanguageMapping{}); err != nil {
+					return err
+				}
+
+				logbuch.Info("renaming '%s' index to '%s'", oldIndexName, newIndexName)
+				return migrator.RenameIndex(&models.LanguageMapping{}, oldIndexName, newIndexName)
+			}
+			return nil
+		},
+	}
+
+	registerPreMigration(f)
+}

migrations/20201106_migration_cascade_constraints.go

@@ -0,0 +1,67 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20201106-migration_cascade_constraints"
+
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			// drop all already existing foreign key constraints
+			// afterwards let them be re-created by auto migrate with the newly introduced cascade settings,
+
+			migrator := db.Migrator()
+
+			if cfg.Db.Dialect == config.SQLDialectSqlite {
+				// https://stackoverflow.com/a/1884893/3112139
+				// unfortunately, we can't migrate existing sqlite databases to the newly introduced cascade settings
+				// things like deleting all summaries won't work in those cases unless an entirely new db is created
+				logbuch.Info("not attempting to drop and regenerate constraints on sqlite")
+				return nil
+			}
+
+			if !migrator.HasTable(&models.KeyStringValue{}) {
+				logbuch.Info("key-value table not yet existing")
+				return nil
+			}
+
+			if hasRun(name, db) {
+				return nil
+			}
+
+			// SELECT * FROM INFORMATION_SCHEMA.table_constraints;
+			constraints := map[string]interface{}{
+				"fk_summaries_editors":           &models.SummaryItem{},
+				"fk_summaries_languages":         &models.SummaryItem{},
+				"fk_summaries_machines":          &models.SummaryItem{},
+				"fk_summaries_operating_systems": &models.SummaryItem{},
+				"fk_summaries_projects":          &models.SummaryItem{},
+				"fk_summary_items_summary":       &models.SummaryItem{},
+				"fk_summaries_user":              &models.Summary{},
+				"fk_language_mappings_user":      &models.LanguageMapping{},
+				"fk_heartbeats_user":             &models.Heartbeat{},
+				"fk_aliases_user":                &models.Alias{},
+			}
+
+			for name, table := range constraints {
+				if migrator.HasConstraint(table, name) {
+					logbuch.Info("dropping constraint '%s'", name)
+					if err := migrator.DropConstraint(table, name); err != nil {
+						return err
+					}
+				}
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPreMigration(f)
+}

migrations/20210202_fix_cascade_for_alias_user_constraint.go

@@ -0,0 +1,46 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210202-fix_cascade_for_alias_user_constraint"
+
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			migrator := db.Migrator()
+
+			if cfg.Db.Dialect == config.SQLDialectSqlite {
+				// see 20201106_migration_cascade_constraints
+				logbuch.Info("not attempting to drop and regenerate constraints on sqlite")
+				return nil
+			}
+
+			if !migrator.HasTable(&models.KeyStringValue{}) {
+				logbuch.Info("key-value table not yet existing")
+				return nil
+			}
+
+			if hasRun(name, db) {
+				return nil
+			}
+
+			if migrator.HasConstraint(&models.Alias{}, "fk_aliases_user") {
+				logbuch.Info("dropping constraint 'fk_aliases_user'")
+				if err := migrator.DropConstraint(&models.Alias{}, "fk_aliases_user"); err != nil {
+					return err
+				}
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPreMigration(f)
+}

migrations/20210206_drop_badges_column_add_sharing_flags.go

@@ -0,0 +1,55 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	f := migrationFunc{
+		name: "20210206_drop_badges_column_add_sharing_flags",
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			migrator := db.Migrator()
+
+			if !migrator.HasColumn(&models.User{}, "badges_enabled") {
+				// empty database or already migrated, nothing to migrate
+				return nil
+			}
+
+			if err := db.Exec("UPDATE users SET share_data_max_days = 30 WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_editors = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_languages = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_projects = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_oss = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				return err
+			}
+			if err := db.Exec("UPDATE users SET share_machines = TRUE WHERE badges_enabled = TRUE").Error; err != nil {
+				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
+			}
+			logbuch.Info("dropped column 'badges_enabled' after substituting it by sharing indicators")
+
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20210213_add_has_data_field.go

@@ -0,0 +1,27 @@
+package migrations
+
+import (
+	"github.com/muety/wakapi/config"
+	"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 {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			if err := db.Exec("UPDATE users SET has_data = TRUE WHERE TRUE").Error; err != nil {
+				return err
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20210221_add_created_date_column.go

@@ -0,0 +1,27 @@
+package migrations
+
+import (
+	"github.com/muety/wakapi/config"
+	"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 {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			if err := db.Exec("UPDATE heartbeats SET created_at = time WHERE TRUE").Error; err != nil {
+				return err
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20210411_add_imprint_content.go

@@ -0,0 +1,39 @@
+package migrations
+
+import (
+	"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 {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+
+			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
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

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)
+}

migrations/20210806_remove_persisted_project_labels.go

@@ -0,0 +1,37 @@
+package migrations
+
+import (
+	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20210806-remove_persisted_project_labels"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			rawDb, err := db.DB()
+			if err != nil {
+				logbuch.Error("failed to retrieve raw sql db instance")
+				return err
+			}
+			if _, err := rawDb.Exec(fmt.Sprintf("delete from summary_items where type = %d", models.SummaryLabel)); err != nil {
+				logbuch.Error("failed to delete project label summary items")
+				return err
+			}
+			logbuch.Info("successfully deleted project label summary items")
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20211215_migrate_id_to_bigint.go

@@ -0,0 +1,52 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20211215-migrate_id_to_bigint-add_has_data_field"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			logbuch.Info("this may take a while!")
+
+			if cfg.Db.IsMySQL() {
+				tx := db.Begin()
+				if err := tx.Exec("ALTER TABLE heartbeats MODIFY COLUMN id BIGINT UNSIGNED AUTO_INCREMENT").Error; err != nil {
+					return err
+				}
+				if err := tx.Exec("ALTER TABLE summary_items MODIFY COLUMN id BIGINT UNSIGNED AUTO_INCREMENT").Error; err != nil {
+					return err
+				}
+				tx.Commit()
+			} else if cfg.Db.IsPostgres() {
+				// postgres does not have unsigned data types
+				// https://www.postgresql.org/docs/10/datatype-numeric.html
+				tx := db.Begin()
+				if err := tx.Exec("ALTER TABLE heartbeats ALTER COLUMN id TYPE BIGINT").Error; err != nil {
+					return err
+				}
+				if err := tx.Exec("ALTER TABLE summary_items ALTER COLUMN id TYPE BIGINT").Error; err != nil {
+					return err
+				}
+				tx.Commit()
+			} else {
+				// sqlite doesn't allow for changing column type easily
+				// https://stackoverflow.com/a/2083562/3112139
+				logbuch.Warn("unable to migrate id columns to bigint on %s", cfg.Db.Dialect)
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20212212_total_summary_heartbeats.go

@@ -0,0 +1,48 @@
+package migrations
+
+import (
+	"database/sql"
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20212212-total_summary_heartbeats"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			logbuch.Info("this may take a while!")
+
+			// this turns out to actually be way faster than using joins and instead has the benefit of being cross-dialect compatible
+
+			var summaries []*models.Summary
+			if err := db.Model(&models.Summary{}).
+				Select("id, from_time, to_time, user_id").
+				Scan(&summaries).Error; err != nil {
+				return err
+			}
+
+			tx := db.Begin()
+			for _, s := range summaries {
+				query := "UPDATE summaries SET num_heartbeats = (SELECT count(id) AS num_heartbeats FROM heartbeats WHERE user_id = @user AND time BETWEEN @from AND @to) WHERE id = @id"
+				tx.Exec(query, sql.Named("from", s.FromTime), sql.Named("to", s.ToTime), sql.Named("id", s.ID), sql.Named("user", s.UserID))
+			}
+			if err := tx.Commit().Error; err != nil {
+				tx.Rollback()
+				logbuch.Error("failed to retroactively determine total summary heartbeats")
+				return err
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20220317_align_num_heartbeats.go

@@ -0,0 +1,56 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20220317-align_num_heartbeats"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			logbuch.Info("this may take a while!")
+
+			// find all summaries whose num_heartbeats is zero even though they have items
+			var faultyIds []uint
+
+			if err := db.Model(&models.Summary{}).
+				Distinct("summaries.id").
+				Joins("INNER JOIN summary_items ON summaries.num_heartbeats = 0 AND summaries.id = summary_items.summary_id").
+				Scan(&faultyIds).Error; err != nil {
+				return err
+			}
+
+			// update their heartbeats counter
+			result := db.
+				Table("summaries AS s1").
+				Where("s1.id IN ?", faultyIds).
+				Update(
+					"num_heartbeats",
+					db.
+						Model(&models.Heartbeat{}).
+						Select("COUNT(*)").
+						Where("user_id = ?", gorm.Expr("s1.user_id")).
+						Where("time BETWEEN ? AND ?", gorm.Expr("s1.from_time"), gorm.Expr("s1.to_time")),
+				)
+
+			if err := result.Error; err != nil {
+				return err
+			}
+
+			logbuch.Info("corrected heartbeats counter of %d summaries", result.RowsAffected)
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20220318_mysql_timestamp_precision.go

@@ -0,0 +1,41 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "20220318-mysql_timestamp_precision"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			if cfg.Db.IsMySQL() {
+				logbuch.Info("altering heartbeats table, this may take a while (up to hours)")
+
+				db.Exec("SET foreign_key_checks=0;")
+				db.Exec("SET unique_checks=0;")
+				if err := db.Exec("ALTER TABLE heartbeats MODIFY COLUMN `time` TIMESTAMP(3) NOT NULL").Error; err != nil {
+					return err
+				}
+				if err := db.Exec("ALTER TABLE heartbeats MODIFY COLUMN `created_at` TIMESTAMP(3) NOT NULL").Error; err != nil {
+					return err
+				}
+				db.Exec("SET foreign_key_checks=1;")
+				db.Exec("SET unique_checks=1;")
+
+				logbuch.Info("migrated timestamp columns to millisecond precision")
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/202203191_drop_diagnostics_user.go

@@ -0,0 +1,39 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func init() {
+	const name = "202203191-drop_diagnostics_user"
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if hasRun(name, db) {
+				return nil
+			}
+
+			migrator := db.Migrator()
+
+			if migrator.HasColumn(&models.Diagnostics{}, "user_id") {
+				logbuch.Info("running migration '%s'", name)
+
+				if err := migrator.DropConstraint(&models.Diagnostics{}, "fk_diagnostics_user"); err != nil {
+					logbuch.Warn("failed to drop 'fk_diagnostics_user' constraint (%v)", err)
+				}
+
+				if err := migrator.DropColumn(&models.Diagnostics{}, "user_id"); err != nil {
+					logbuch.Warn("failed to drop user_id column of diagnostics (%v)", err)
+				}
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20220403_drop_user_project_idx.go

@@ -0,0 +1,40 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+// migration to fix https://github.com/muety/wakapi/issues/346
+// caused by https://github.com/muety/wakapi/blob/2.3.2/migrations/20220319_add_user_project_idx.go in combination with
+// the wrongly defined index at https://github.com/muety/wakapi/blob/5aae18e2415d9e620f383f98cd8cbdf39cd99f27/models/heartbeat.go#L18
+// and https://github.com/go-gorm/sqlite/issues/87
+// -> drop index and let it be auto-created again with properly formatted ddl
+
+func init() {
+	const name = "20220403-drop_user_project_idx"
+	const idxName = "idx_user_project"
+
+	f := migrationFunc{
+		name: name,
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			if !db.Migrator().HasTable(&models.KeyStringValue{}) || hasRun(name, db) {
+				return nil
+			}
+
+			if cfg.Db.IsSQLite() && db.Migrator().HasIndex(&models.Heartbeat{}, idxName) {
+				logbuch.Info("running migration '%s'", name)
+				if err := db.Migrator().DropIndex(&models.Heartbeat{}, idxName); err != nil {
+					logbuch.Warn("failed to drop %s", idxName)
+				}
+			}
+
+			setHasRun(name, db)
+			return nil
+		},
+	}
+
+	registerPreMigration(f)
+}

migrations/common/common.go

@@ -1,11 +0,0 @@
-package common
-
-import (
-	"github.com/muety/wakapi/config"
-	"gorm.io/gorm"
-)
-
-type migrationFunc struct {
-	f    func(db *gorm.DB, cfg *config.Config) error
-	name string
-}

migrations/common/custom_post.go

@@ -1,30 +0,0 @@
-package common
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/muety/wakapi/config"
-	"gorm.io/gorm"
-)
-
-var customPostMigrations []migrationFunc
-
-func init() {
-	customPostMigrations = []migrationFunc{
-		{
-			f: func(db *gorm.DB, cfg *config.Config) error {
-				return cfg.GetFixturesFunc(cfg.Db.Dialect)(db)
-			},
-			name: "apply fixtures",
-		},
-		// TODO: add function to modify aggregated summaries according to configured custom language mappings
-	}
-}
-
-func RunCustomPostMigrations(db *gorm.DB, cfg *config.Config) {
-	for _, m := range customPostMigrations {
-		logbuch.Info("potentially running migration '%s'", m.name)
-		if err := m.f(db, cfg); err != nil {
-			logbuch.Fatal("migration '%s' failed – %v", m.name, err)
-		}
-	}
-}

migrations/common/custom_pre.go

@@ -1,108 +0,0 @@
-package common
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-)
-
-var customPreMigrations []migrationFunc
-
-func init() {
-	customPreMigrations = []migrationFunc{
-		{
-			f: func(db *gorm.DB, cfg *config.Config) error {
-				migrator := db.Migrator()
-				oldTableName, newTableName := "custom_rules", "language_mappings"
-				oldIndexName, newIndexName := "idx_customrule_user", "idx_language_mapping_user"
-
-				if migrator.HasTable(oldTableName) {
-					logbuch.Info("renaming '%s' table to '%s'", oldTableName, newTableName)
-					if err := migrator.RenameTable(oldTableName, &models.LanguageMapping{}); err != nil {
-						return err
-					}
-
-					logbuch.Info("renaming '%s' index to '%s'", oldIndexName, newIndexName)
-					return migrator.RenameIndex(&models.LanguageMapping{}, oldIndexName, newIndexName)
-				}
-				return nil
-			},
-			name: "rename language mappings table",
-		},
-		{
-			f: func(db *gorm.DB, cfg *config.Config) error {
-				// drop all already existing foreign key constraints
-				// afterwards let them be re-created by auto migrate with the newly introduced cascade settings,
-
-				migrator := db.Migrator()
-				const lookupKey = "20201106-migration_cascade_constraints"
-
-				if cfg.Db.Dialect == config.SQLDialectSqlite {
-					// https://stackoverflow.com/a/1884893/3112139
-					// unfortunately, we can't migrate existing sqlite databases to the newly introduced cascade settings
-					// things like deleting all summaries won't work in those cases unless an entirely new db is created
-					logbuch.Info("not attempting to drop and regenerate constraints on sqlite")
-					return nil
-				}
-
-				if !migrator.HasTable(&models.KeyStringValue{}) {
-					logbuch.Info("key-value table not yet existing")
-					return nil
-				}
-
-				condition := "key = ?"
-				if cfg.Db.Dialect == config.SQLDialectMysql {
-					condition = "`key` = ?"
-				}
-				lookupResult := db.Where(condition, lookupKey).First(&models.KeyStringValue{})
-				if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
-					logbuch.Info("no need to migrate cascade constraints")
-					return nil
-				}
-
-				// SELECT * FROM INFORMATION_SCHEMA.table_constraints;
-				constraints := map[string]interface{}{
-					"fk_summaries_editors":           &models.SummaryItem{},
-					"fk_summaries_languages":         &models.SummaryItem{},
-					"fk_summaries_machines":          &models.SummaryItem{},
-					"fk_summaries_operating_systems": &models.SummaryItem{},
-					"fk_summaries_projects":          &models.SummaryItem{},
-					"fk_summary_items_summary":       &models.SummaryItem{},
-					"fk_summaries_user":              &models.Summary{},
-					"fk_language_mappings_user":      &models.LanguageMapping{},
-					"fk_heartbeats_user":             &models.Heartbeat{},
-					"fk_aliases_user":                &models.Alias{},
-				}
-
-				for name, table := range constraints {
-					if migrator.HasConstraint(table, name) {
-						logbuch.Info("dropping constraint '%s'", name)
-						if err := migrator.DropConstraint(table, name); err != nil {
-							return err
-						}
-					}
-				}
-
-				if err := db.Create(&models.KeyStringValue{
-					Key:   lookupKey,
-					Value: "done",
-				}).Error; err != nil {
-					return err
-				}
-
-				return nil
-			},
-			name: "add cascade constraints",
-		},
-	}
-}
-
-func RunCustomPreMigrations(db *gorm.DB, cfg *config.Config) {
-	for _, m := range customPreMigrations {
-		logbuch.Info("potentially running migration '%s'", m.name)
-		if err := m.f(db, cfg); err != nil {
-			logbuch.Fatal("migration '%s' failed – %v", m.name, err)
-		}
-	}
-}

migrations/common/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';

migrations/common/languages.go

@@ -1,25 +0,0 @@
-package common
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-)
-
-func MigrateLanguages(db *gorm.DB) {
-	cfg := config.Get()
-
-	for k, v := range cfg.App.CustomLanguages {
-		result := db.Model(models.Heartbeat{}).
-			Where("language = ?", "").
-			Where("entity LIKE ?", "%."+k).
-			Updates(models.Heartbeat{Language: v})
-		if result.Error != nil {
-			logbuch.Fatal(result.Error.Error())
-		}
-		if result.RowsAffected > 0 {
-			logbuch.Info("migrated %+v rows for custom language %+s", result.RowsAffected, k)
-		}
-	}
-}

migrations/migrations.go

@@ -0,0 +1,75 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+	"sort"
+	"strings"
+)
+
+type migrationFunc struct {
+	f    func(db *gorm.DB, cfg *config.Config) error
+	name string
+}
+
+type migrationFuncs []migrationFunc
+
+var (
+	preMigrations  migrationFuncs
+	postMigrations migrationFuncs
+)
+
+func registerPreMigration(f migrationFunc) {
+	preMigrations = append(preMigrations, f)
+}
+
+func registerPostMigration(f migrationFunc) {
+	postMigrations = append(postMigrations, f)
+}
+
+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)
+
+	for _, m := range preMigrations {
+		logbuch.Info("potentially running migration '%s'", m.name)
+		if err := m.f(db, cfg); err != nil {
+			logbuch.Fatal("migration '%s' failed - %v", m.name, err)
+		}
+	}
+}
+
+func RunPostMigrations(db *gorm.DB, cfg *config.Config) {
+	sort.Sort(postMigrations)
+
+	for _, m := range postMigrations {
+		logbuch.Info("potentially running migration '%s'", m.name)
+		if err := m.f(db, cfg); err != nil {
+			logbuch.Fatal("migration '%s' failed - %v", m.name, err)
+		}
+	}
+}
+
+func (m migrationFuncs) Len() int {
+	return len(m)
+}
+
+func (m migrationFuncs) Less(i, j int) bool {
+	return strings.Compare(m[i].name, m[j].name) < 0
+}
+
+func (m migrationFuncs) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}

migrations/shared.go

@@ -0,0 +1,30 @@
+package migrations
+
+import (
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"gorm.io/gorm"
+)
+
+func hasRun(name string, db *gorm.DB) bool {
+	condition := "key = ?"
+	if config.Get().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 true
+	}
+	return false
+}
+
+func setHasRun(name string, db *gorm.DB) {
+	if err := db.Create(&models.KeyStringValue{
+		Key:   name,
+		Value: "done",
+	}).Error; err != nil {
+		logbuch.Error("failed to mark migration %s as run - %v", name, err)
+	}
+}

mocks/alias_repository.go

@@ -9,6 +9,11 @@ type AliasRepositoryMock struct {
 	mock.Mock
 }
 
+func (m *AliasRepositoryMock) GetAll() ([]*models.Alias, error) {
+	args := m.Called()
+	return args.Get(0).([]*models.Alias), args.Error(1)
+}
+
 func (m *AliasRepositoryMock) GetByUser(s string) ([]*models.Alias, error) {
 	args := m.Called(s)
 	return args.Get(0).([]*models.Alias), args.Error(1)

mocks/alias_service.go

@@ -29,6 +29,11 @@ func (m *AliasServiceMock) GetByUser(s string) ([]*models.Alias, error) {
 	return args.Get(0).([]*models.Alias), args.Error(1)
 }
 
+func (m *AliasServiceMock) GetByUserAndType(s string, u uint8) ([]*models.Alias, error) {
+	args := m.Called(s, u)
+	return args.Get(0).([]*models.Alias), args.Error(1)
+}
+
 func (m *AliasServiceMock) GetByUserAndKeyAndType(s string, s2 string, u uint8) ([]*models.Alias, error) {
 	args := m.Called(s, s2, u)
 	return args.Get(0).([]*models.Alias), args.Error(1)

mocks/duration_service.go

@@ -0,0 +1,16 @@
+package mocks
+
+import (
+	"github.com/muety/wakapi/models"
+	"github.com/stretchr/testify/mock"
+	"time"
+)
+
+type DurationServiceMock struct {
+	mock.Mock
+}
+
+func (m *DurationServiceMock) Get(time time.Time, time2 time.Time, user *models.User, f *models.Filters) (models.Durations, error) {
+	args := m.Called(time, time2, user, f)
+	return args.Get(0).(models.Durations), args.Error(1)
+}

mocks/heartbeat_service.go

@@ -10,22 +10,67 @@ type HeartbeatServiceMock struct {
 	mock.Mock
 }
 
+func (m *HeartbeatServiceMock) Insert(heartbeat *models.Heartbeat) error {
+	args := m.Called(heartbeat)
+	return args.Error(0)
+}
+
 func (m *HeartbeatServiceMock) InsertBatch(heartbeats []*models.Heartbeat) error {
 	args := m.Called(heartbeats)
 	return args.Error(0)
 }
 
+func (m *HeartbeatServiceMock) Count(a bool) (int64, error) {
+	args := m.Called(a)
+	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)
 }
 
+func (m *HeartbeatServiceMock) GetAllWithinByFilters(time time.Time, time2 time.Time, user *models.User, filters *models.Filters) ([]*models.Heartbeat, error) {
+	args := m.Called(time, time2, user, filters)
+	return args.Get(0).([]*models.Heartbeat), args.Error(1)
+}
+
 func (m *HeartbeatServiceMock) GetFirstByUsers() ([]*models.TimeByUser, error) {
 	args := m.Called()
 	return args.Get(0).([]*models.TimeByUser), args.Error(1)
 }
 
+func (m *HeartbeatServiceMock) GetLatestByUser(user *models.User) (*models.Heartbeat, error) {
+	args := m.Called(user)
+	return args.Get(0).(*models.Heartbeat), args.Error(1)
+}
+
+func (m *HeartbeatServiceMock) GetLatestByOriginAndUser(s string, user *models.User) (*models.Heartbeat, error) {
+	args := m.Called(s, user)
+	return args.Get(0).(*models.Heartbeat), args.Error(1)
+}
+
+func (m *HeartbeatServiceMock) GetEntitySetByUser(u uint8, user *models.User) ([]string, error) {
+	args := m.Called(u, user)
+	return args.Get(0).([]string), args.Error(1)
+}
+
 func (m *HeartbeatServiceMock) DeleteBefore(time time.Time) error {
 	args := m.Called(time)
 	return args.Error(0)
 }
+
+func (m *HeartbeatServiceMock) DeleteByUser(u *models.User) error {
+	args := m.Called(u)
+	return args.Error(0)
+}

mocks/project_label_service.go

@@ -0,0 +1,40 @@
+package mocks
+
+import (
+	"github.com/muety/wakapi/models"
+	"github.com/stretchr/testify/mock"
+)
+
+type ProjectLabelServiceMock struct {
+	mock.Mock
+}
+
+func (p *ProjectLabelServiceMock) GetById(u uint) (*models.ProjectLabel, error) {
+	args := p.Called(u)
+	return args.Get(0).(*models.ProjectLabel), args.Error(1)
+}
+
+func (p *ProjectLabelServiceMock) GetByUser(s string) ([]*models.ProjectLabel, error) {
+	args := p.Called(s)
+	return args.Get(0).([]*models.ProjectLabel), args.Error(1)
+}
+
+func (p *ProjectLabelServiceMock) GetByUserGrouped(s string) (map[string][]*models.ProjectLabel, error) {
+	args := p.Called(s)
+	return args.Get(0).(map[string][]*models.ProjectLabel), args.Error(1)
+}
+
+func (p *ProjectLabelServiceMock) GetByUserGroupedInverted(s string) (map[string][]*models.ProjectLabel, error) {
+	args := p.Called(s)
+	return args.Get(0).(map[string][]*models.ProjectLabel), args.Error(1)
+}
+
+func (p *ProjectLabelServiceMock) Create(l *models.ProjectLabel) (*models.ProjectLabel, error) {
+	args := p.Called(l)
+	return args.Get(0).(*models.ProjectLabel), args.Error(1)
+}
+
+func (p *ProjectLabelServiceMock) Delete(l *models.ProjectLabel) error {
+	args := p.Called(l)
+	return args.Error(0)
+}

mocks/summary_repository.go

@@ -15,6 +15,11 @@ func (m *SummaryRepositoryMock) Insert(summary *models.Summary) error {
 	return args.Error(0)
 }
 
+func (m *SummaryRepositoryMock) GetAll() ([]*models.Summary, error) {
+	args := m.Called()
+	return args.Get(0).([]*models.Summary), args.Error(1)
+}
+
 func (m *SummaryRepositoryMock) GetByUserWithin(user *models.User, time time.Time, time2 time.Time) ([]*models.Summary, error) {
 	args := m.Called(user, time, time2)
 	return args.Get(0).([]*models.Summary), args.Error(1)

mocks/user_service.go

@@ -19,13 +19,38 @@ 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) GetAllByReports(b bool) ([]*models.User, error) {
+	args := m.Called(b)
+	return args.Get(0).([]*models.User), args.Error(1)
+}
+
+func (m *UserServiceMock) GetActive(b bool) ([]*models.User, error) {
+	args := m.Called(b)
+	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)
 }
 
@@ -34,6 +59,11 @@ func (m *UserServiceMock) Update(user *models.User) (*models.User, error) {
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
+func (m *UserServiceMock) Delete(user *models.User) error {
+	args := m.Called(user)
+	return args.Error(0)
+}
+
 func (m *UserServiceMock) ResetApiKey(user *models.User) (*models.User, error) {
 	args := m.Called(user)
 	return args.Get(0).(*models.User), args.Error(1)
@@ -44,8 +74,8 @@ func (m *UserServiceMock) ToggleBadges(user *models.User) (*models.User, error)
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
-func (m *UserServiceMock) SetWakatimeApiKey(user *models.User, s string) (*models.User, error) {
-	args := m.Called(user, s)
+func (m *UserServiceMock) SetWakatimeApiCredentials(user *models.User, s1, s2 string) (*models.User, error) {
+	args := m.Called(user, s1, s2)
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
@@ -53,3 +83,12 @@ func (m *UserServiceMock) MigrateMd5Password(user *models.User, login *models.Lo
 	args := m.Called(user, login)
 	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()
+}

models/alias.go

@@ -1,9 +1,15 @@
 package models
 
+// AliasResolver returns the alias of an entity, given its original name. I.e., it returns Alias.Key, given an Alias.Value
+type AliasResolver func(t uint8, k string) string
+
+// AliasReverseResolver returns all original names, which have the given alias as mapping target. I.e., it returns a list of Alias.Value, given an Alias.Key
+type AliasReverseResolver func(t uint8, k string) []string
+
 type Alias struct {
 	ID     uint   `gorm:"primary_key"`
-	Type   uint8  `gorm:"not null; index:idx_alias_type_key; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
-	User   *User  `json:"-" gorm:"not null"`
+	Type   uint8  `gorm:"not null; index:idx_alias_type_key"`
+	User   *User  `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	UserID string `gorm:"not null; index:idx_alias_user"`
 	Key    string `gorm:"not null; index:idx_alias_type_key"`
 	Value  string `gorm:"not null"`

models/compat/shields/v1/badge.go

@@ -3,14 +3,13 @@ package v1
 import (
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/utils"
-	"time"
 )
 
 // https://shields.io/endpoint
 
 const (
-	defaultLabel = "coding time"
-	defaultColor = "#2D3748" // not working
+	defaultLabel = "wakapi.dev"
+	defaultColor = "2F855A"
 )
 
 type BadgeData struct {
@@ -20,18 +19,11 @@ type BadgeData struct {
 	Color         string `json:"color"`
 }
 
-func NewBadgeDataFrom(summary *models.Summary, filters *models.Filters) *BadgeData {
-	var total time.Duration
-	if hasFilter, _, _ := filters.One(); hasFilter {
-		total = summary.TotalTimeByFilters(filters)
-	} else {
-		total = summary.TotalTime()
-	}
-
+func NewBadgeDataFrom(summary *models.Summary) *BadgeData {
 	return &BadgeData{
 		SchemaVersion: 1,
 		Label:         defaultLabel,
-		Message:       utils.FmtWakatimeDuration(total),
+		Message:       utils.FmtWakatimeDuration(summary.TotalTime()),
 		Color:         defaultColor,
 	}
 }

models/compat/wakatime/v1/all_time.go

@@ -3,31 +3,33 @@ package v1
 import (
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/utils"
-	"time"
 )
 
 // https://wakatime.com/developers#all_time_since_today
 
 type AllTimeViewModel struct {
-	Data *allTimeData `json:"data"`
+	Data *AllTimeData `json:"data"`
 }
 
-type allTimeData struct {
-	TotalSeconds float32 `json:"total_seconds"` // total number of seconds logged since account created
-	Text         string  `json:"text"`          // total time logged since account created as human readable string>
-	IsUpToDate   bool    `json:"is_up_to_date"` // true if the stats are up to date; when false, a 202 response code is returned and stats will be refreshed soon>
+type AllTimeData struct {
+	TotalSeconds float32       `json:"total_seconds"` // total number of seconds logged since account created
+	Text         string        `json:"text"`          // total time logged since account created as human readable string>
+	IsUpToDate   bool          `json:"is_up_to_date"` // true if the stats are up to date; when false, a 202 response code is returned and stats will be refreshed soon>
+	Range        *AllTimeRange `json:"range"`
 }
 
-func NewAllTimeFrom(summary *models.Summary, filters *models.Filters) *AllTimeViewModel {
-	var total time.Duration
-	if key := filters.Project; key != "" {
-		total = summary.TotalTimeByFilters(filters)
-	} else {
-		total = summary.TotalTime()
-	}
+type AllTimeRange struct {
+	End       string `json:"end"`
+	EndDate   string `json:"end_date"`
+	Start     string `json:"start"`
+	StartDate string `json:"start_date"`
+	Timezone  string `json:"timezone"`
+}
 
+func NewAllTimeFrom(summary *models.Summary) *AllTimeViewModel {
+	total := summary.TotalTime()
 	return &AllTimeViewModel{
-		Data: &allTimeData{
+		Data: &AllTimeData{
 			TotalSeconds: float32(total.Seconds()),
 			Text:         utils.FmtWakatimeDuration(total),
 			IsUpToDate:   true,

models/compat/wakatime/v1/heartbeat.go

@@ -0,0 +1,54 @@
+package v1
+
+import (
+	"strconv"
+	"time"
+
+	"github.com/muety/wakapi/models"
+)
+
+type HeartbeatsViewModel struct {
+	Data []*HeartbeatEntry `json:"data"`
+}
+
+// Incomplete, for now, only the subset of fields is implemented
+// that is actually required for the import
+
+type HeartbeatEntry struct {
+	Id            string    `json:"id"`
+	Branch        string    `json:"branch"`
+	Category      string    `json:"category"`
+	Entity        string    `json:"entity"`
+	IsWrite       bool      `json:"is_write"`
+	Language      string    `json:"language"`
+	Project       string    `json:"project"`
+	Time          float64   `json:"time"`
+	Type          string    `json:"type"`
+	UserId        string    `json:"user_id"`
+	MachineNameId string    `json:"machine_name_id"`
+	UserAgentId   string    `json:"user_agent_id"`
+	CreatedAt     time.Time `json:"created_at"`
+}
+
+func HeartbeatsToCompat(entries []*models.Heartbeat) []*HeartbeatEntry {
+	out := make([]*HeartbeatEntry, len(entries))
+	for i := 0; i < len(entries); i++ {
+		entry := entries[i]
+		out[i] = &HeartbeatEntry{
+			Id:            strconv.FormatUint(entry.ID, 10),
+			Branch:        entry.Branch,
+			Category:      entry.Category,
+			Entity:        entry.Entity,
+			IsWrite:       entry.IsWrite,
+			Language:      entry.Language,
+			Project:       entry.Project,
+			Time:          float64(entry.Time.T().Unix()),
+			Type:          entry.Type,
+			UserId:        entry.UserID,
+			MachineNameId: entry.Machine,
+			UserAgentId:   entry.UserAgent,
+			CreatedAt:     entry.CreatedAt.T(),
+		}
+	}
+	return out
+}

models/compat/wakatime/v1/machine.go

@@ -0,0 +1,13 @@
+package v1
+
+// https://wakatime.com/api/v1/users/current/machine_names
+
+type MachineViewModel struct {
+	Data       []*MachineEntry `json:"data"`
+	TotalPages int             `json:"total_pages"`
+}
+
+type MachineEntry struct {
+	Id    string `json:"id"`
+	Value string `json:"value"`
+}

models/compat/wakatime/v1/project.go

@@ -0,0 +1,11 @@
+package v1
+
+type ProjectsViewModel struct {
+	Data []*Project `json:"data"`
+}
+
+type Project struct {
+	ID         string `json:"id"`
+	Name       string `json:"name"`
+	Repository string `json:"repository"`
+}

models/compat/wakatime/v1/stats.go

@@ -0,0 +1,94 @@
+package v1
+
+import (
+	"github.com/muety/wakapi/models"
+	"math"
+	"time"
+)
+
+// https://wakatime.com/api/v1/users/current/stats/last_7_days
+// https://pastr.de/p/f2fxg6ragj7z5e7fhsow9rb6
+
+type StatsViewModel struct {
+	Data *StatsData `json:"data"`
+}
+
+type StatsData struct {
+	Username              string            `json:"username"`
+	UserId                string            `json:"user_id"`
+	Start                 time.Time         `json:"start"`
+	End                   time.Time         `json:"end"`
+	TotalSeconds          float64           `json:"total_seconds"`
+	DailyAverage          float64           `json:"daily_average"`
+	DaysIncludingHolidays int               `json:"days_including_holidays"`
+	Editors               []*SummariesEntry `json:"editors"`
+	Languages             []*SummariesEntry `json:"languages"`
+	Machines              []*SummariesEntry `json:"machines"`
+	Projects              []*SummariesEntry `json:"projects"`
+	OperatingSystems      []*SummariesEntry `json:"operating_systems"`
+	Branches              []*SummariesEntry `json:"branches,omitempty"`
+}
+
+func NewStatsFrom(summary *models.Summary, filters *models.Filters) *StatsViewModel {
+	totalTime := summary.TotalTime()
+	numDays := int(summary.ToTime.T().Sub(summary.FromTime.T()).Hours() / 24)
+
+	data := &StatsData{
+		Username:              summary.UserID,
+		UserId:                summary.UserID,
+		Start:                 summary.FromTime.T(),
+		End:                   summary.ToTime.T(),
+		TotalSeconds:          totalTime.Seconds(),
+		DailyAverage:          totalTime.Seconds() / float64(numDays),
+		DaysIncludingHolidays: numDays,
+	}
+
+	if math.IsInf(data.DailyAverage, 0) || math.IsNaN(data.DailyAverage) {
+		data.DailyAverage = 0
+	}
+
+	editors := make([]*SummariesEntry, len(summary.Editors))
+	for i, e := range summary.Editors {
+		editors[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryEditor))
+	}
+
+	languages := make([]*SummariesEntry, len(summary.Languages))
+	for i, e := range summary.Languages {
+		languages[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryLanguage))
+	}
+
+	machines := make([]*SummariesEntry, len(summary.Machines))
+	for i, e := range summary.Machines {
+		machines[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryMachine))
+	}
+
+	projects := make([]*SummariesEntry, len(summary.Projects))
+	for i, e := range summary.Projects {
+		projects[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryProject))
+	}
+
+	oss := make([]*SummariesEntry, len(summary.OperatingSystems))
+	for i, e := range summary.OperatingSystems {
+		oss[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryOS))
+	}
+
+	branches := make([]*SummariesEntry, len(summary.Branches))
+	for i, e := range summary.Branches {
+		branches[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryBranch))
+	}
+
+	data.Editors = editors
+	data.Languages = languages
+	data.Machines = machines
+	data.Projects = projects
+	data.OperatingSystems = oss
+	data.Branches = branches
+
+	if summary.Branches == nil {
+		data.Branches = nil
+	}
+
+	return &StatsViewModel{
+		Data: data,
+	}
+}

models/compat/wakatime/v1/summaries.go

@@ -13,24 +13,25 @@ import (
 // https://pastr.de/v/736450
 
 type SummariesViewModel struct {
-	Data  []*summariesData `json:"data"`
+	Data  []*SummariesData `json:"data"`
 	End   time.Time        `json:"end"`
 	Start time.Time        `json:"start"`
 }
 
-type summariesData struct {
-	Categories       []*summariesEntry    `json:"categories"`
-	Dependencies     []*summariesEntry    `json:"dependencies"`
-	Editors          []*summariesEntry    `json:"editors"`
-	Languages        []*summariesEntry    `json:"languages"`
-	Machines         []*summariesEntry    `json:"machines"`
-	OperatingSystems []*summariesEntry    `json:"operating_systems"`
-	Projects         []*summariesEntry    `json:"projects"`
-	GrandTotal       *summariesGrandTotal `json:"grand_total"`
-	Range            *summariesRange      `json:"range"`
+type SummariesData struct {
+	Categories       []*SummariesEntry    `json:"categories"`
+	Dependencies     []*SummariesEntry    `json:"dependencies"`
+	Editors          []*SummariesEntry    `json:"editors"`
+	Languages        []*SummariesEntry    `json:"languages"`
+	Machines         []*SummariesEntry    `json:"machines"`
+	OperatingSystems []*SummariesEntry    `json:"operating_systems"`
+	Projects         []*SummariesEntry    `json:"projects"`
+	Branches         []*SummariesEntry    `json:"branches,omitempty"`
+	GrandTotal       *SummariesGrandTotal `json:"grand_total"`
+	Range            *SummariesRange      `json:"range"`
 }
 
-type summariesEntry struct {
+type SummariesEntry struct {
 	Digital      string  `json:"digital"`
 	Hours        int     `json:"hours"`
 	Minutes      int     `json:"minutes"`
@@ -41,7 +42,7 @@ type summariesEntry struct {
 	TotalSeconds float64 `json:"total_seconds"`
 }
 
-type summariesGrandTotal struct {
+type SummariesGrandTotal struct {
 	Digital      string  `json:"digital"`
 	Hours        int     `json:"hours"`
 	Minutes      int     `json:"minutes"`
@@ -49,7 +50,7 @@ type summariesGrandTotal struct {
 	TotalSeconds float64 `json:"total_seconds"`
 }
 
-type summariesRange struct {
+type SummariesRange struct {
 	Date     string    `json:"date"`
 	End      time.Time `json:"end"`
 	Start    time.Time `json:"start"`
@@ -57,8 +58,8 @@ type summariesRange struct {
 	Timezone string    `json:"timezone"`
 }
 
-func NewSummariesFrom(summaries []*models.Summary, filters *models.Filters) *SummariesViewModel {
-	data := make([]*summariesData, len(summaries))
+func NewSummariesFrom(summaries []*models.Summary) *SummariesViewModel {
+	data := make([]*SummariesData, len(summaries))
 	minDate, maxDate := time.Now().Add(1*time.Second), time.Time{}
 
 	for i, s := range summaries {
@@ -79,27 +80,28 @@ func NewSummariesFrom(summaries []*models.Summary, filters *models.Filters) *Sum
 	}
 }
 
-func newDataFrom(s *models.Summary) *summariesData {
+func newDataFrom(s *models.Summary) *SummariesData {
 	zone, _ := time.Now().Zone()
 	total := s.TotalTime()
 	totalHrs, totalMins := int(total.Hours()), int((total - time.Duration(total.Hours())*time.Hour).Minutes())
 
-	data := &summariesData{
-		Categories:       make([]*summariesEntry, 0),
-		Dependencies:     make([]*summariesEntry, 0),
-		Editors:          make([]*summariesEntry, len(s.Editors)),
-		Languages:        make([]*summariesEntry, len(s.Languages)),
-		Machines:         make([]*summariesEntry, len(s.Machines)),
-		OperatingSystems: make([]*summariesEntry, len(s.OperatingSystems)),
-		Projects:         make([]*summariesEntry, len(s.Projects)),
-		GrandTotal: &summariesGrandTotal{
+	data := &SummariesData{
+		Categories:       make([]*SummariesEntry, 0),
+		Dependencies:     make([]*SummariesEntry, 0),
+		Editors:          make([]*SummariesEntry, len(s.Editors)),
+		Languages:        make([]*SummariesEntry, len(s.Languages)),
+		Machines:         make([]*SummariesEntry, len(s.Machines)),
+		OperatingSystems: make([]*SummariesEntry, len(s.OperatingSystems)),
+		Projects:         make([]*SummariesEntry, len(s.Projects)),
+		Branches:         make([]*SummariesEntry, len(s.Branches)),
+		GrandTotal: &SummariesGrandTotal{
 			Digital:      fmt.Sprintf("%d:%d", totalHrs, totalMins),
 			Hours:        totalHrs,
 			Minutes:      totalMins,
 			Text:         utils.FmtWakatimeDuration(total),
 			TotalSeconds: total.Seconds(),
 		},
-		Range: &summariesRange{
+		Range: &SummariesRange{
 			Date:     time.Now().Format(time.RFC3339),
 			End:      s.ToTime.T(),
 			Start:    s.FromTime.T(),
@@ -109,52 +111,60 @@ func newDataFrom(s *models.Summary) *summariesData {
 	}
 
 	var wg sync.WaitGroup
-	wg.Add(5)
+	wg.Add(6)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Projects {
 			data.Projects[i] = convertEntry(e, s.TotalTimeBy(models.SummaryProject))
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Editors {
 			data.Editors[i] = convertEntry(e, s.TotalTimeBy(models.SummaryEditor))
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Languages {
 			data.Languages[i] = convertEntry(e, s.TotalTimeBy(models.SummaryLanguage))
-
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.OperatingSystems {
 			data.OperatingSystems[i] = convertEntry(e, s.TotalTimeBy(models.SummaryOS))
 		}
 	}(data)
 
-	go func(data *summariesData) {
+	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Machines {
 			data.Machines[i] = convertEntry(e, s.TotalTimeBy(models.SummaryMachine))
 		}
 	}(data)
 
+	go func(data *SummariesData) {
+		defer wg.Done()
+		for i, e := range s.Branches {
+			data.Branches[i] = convertEntry(e, s.TotalTimeBy(models.SummaryBranch))
+		}
+	}(data)
+
+	if s.Branches == nil {
+		data.Branches = nil
+	}
+
 	wg.Wait()
 	return data
 }
 
-func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *summariesEntry {
-	// this is a workaround, since currently, the total time of a summary item is mistakenly represented in seconds
-	// TODO: fix some day, while migrating persisted summary items
-	total := e.Total * time.Second
+func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *SummariesEntry {
+	total := e.TotalFixed()
 	hrs := int(total.Hours())
 	mins := int((total - time.Duration(hrs)*time.Hour).Minutes())
 	secs := int((total - time.Duration(hrs)*time.Hour - time.Duration(mins)*time.Minute).Seconds())
@@ -163,7 +173,7 @@ func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *summariesEn
 		percentage = 0
 	}
 
-	return &summariesEntry{
+	return &SummariesEntry{
 		Digital:      fmt.Sprintf("%d:%d:%d", hrs, mins, secs),
 		Hours:        hrs,
 		Minutes:      mins,

models/compat/wakatime/v1/user.go

@@ -0,0 +1,55 @@
+package v1
+
+import (
+	"github.com/muety/wakapi/models"
+	"time"
+)
+
+const DefaultWakaUserDisplayName = "Anonymous User"
+
+// partially compatible with https://wakatime.com/developers#users
+
+type UserViewModel struct {
+	Data *User `json:"data"`
+}
+
+type User struct {
+	ID               string            `json:"id"`
+	DisplayName      string            `json:"display_name"`
+	FullName         string            `json:"full_name"`
+	Email            string            `json:"email"`
+	IsEmailPublic    bool              `json:"is_email_public"`
+	IsEmailConfirmed bool              `json:"is_email_confirmed"`
+	TimeZone         string            `json:"timezone"`
+	LastHeartbeatAt  models.CustomTime `json:"last_heartbeat_at"`
+	LastProject      string            `json:"last_project"`
+	LastPluginName   string            `json:"last_plugin_name"`
+	Username         string            `json:"username"`
+	Website          string            `json:"website"`
+	CreatedAt        models.CustomTime `json:"created_at"`
+	ModifiedAt       models.CustomTime `json:"modified_at"`
+}
+
+func NewFromUser(user *models.User) *User {
+	tz, _ := time.Now().Zone()
+	if user.Location != "" {
+		tz = user.Location
+	}
+
+	return &User{
+		ID:          user.ID,
+		DisplayName: DefaultWakaUserDisplayName,
+		Email:       user.Email,
+		TimeZone:    tz,
+		Username:    user.ID,
+		CreatedAt:   user.CreatedAt,
+		ModifiedAt:  user.CreatedAt,
+	}
+}
+
+func (u *User) WithLatestHeartbeat(h *models.Heartbeat) *User {
+	u.LastHeartbeatAt = h.Time
+	u.LastProject = h.Project
+	u.LastPluginName = h.Editor
+	return u
+}

models/compat/wakatime/v1/user_agent.go

@@ -0,0 +1,13 @@
+package v1
+
+type UserAgentsViewModel struct {
+	Data       []*UserAgentEntry `json:"data"`
+	TotalPages int               `json:"total_pages"`
+}
+
+type UserAgentEntry struct {
+	Id     string `json:"id"`
+	Editor string `json:"editor"`
+	Os     string `json:"os"`
+	Value  string `json:"value"`
+}

models/diagnostics.go

@@ -0,0 +1,11 @@
+package models
+
+type Diagnostics struct {
+	ID           uint   `gorm:"primary_key"`
+	Platform     string `json:"platform"`
+	Architecture string `json:"architecture"`
+	Plugin       string `json:"plugin"`
+	CliVersion   string `json:"cli_version"`
+	Logs         string `json:"logs" gorm:"type:text"`
+	StackTrace   string `json:"stacktrace" gorm:"type:text"`
+}

models/duration.go

@@ -0,0 +1,70 @@
+package models
+
+import (
+	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/mitchellh/hashstructure/v2"
+	"time"
+)
+
+type Duration struct {
+	UserID          string        `json:"user_id"`
+	Time            CustomTime    `json:"time" hash:"ignore"`
+	Duration        time.Duration `json:"duration" hash:"ignore"`
+	Project         string        `json:"project"`
+	Language        string        `json:"language"`
+	Editor          string        `json:"editor"`
+	OperatingSystem string        `json:"operating_system"`
+	Machine         string        `json:"machine"`
+	Branch          string        `json:"branch"`
+	NumHeartbeats   int           `json:"-" hash:"ignore"`
+	GroupHash       string        `json:"-" hash:"ignore"`
+}
+
+func NewDurationFromHeartbeat(h *Heartbeat) *Duration {
+	d := &Duration{
+		UserID:          h.UserID,
+		Time:            h.Time,
+		Duration:        0,
+		Project:         h.Project,
+		Language:        h.Language,
+		Editor:          h.Editor,
+		OperatingSystem: h.OperatingSystem,
+		Machine:         h.Machine,
+		Branch:          h.Branch,
+		NumHeartbeats:   1,
+	}
+	return d.Hashed()
+}
+
+func (d *Duration) Hashed() *Duration {
+	hash, err := hashstructure.Hash(d, hashstructure.FormatV2, nil)
+	if err != nil {
+		logbuch.Error("CRITICAL ERROR: failed to hash struct - %v", err)
+	}
+	d.GroupHash = fmt.Sprintf("%x", hash)
+	return d
+}
+
+func (d *Duration) GetKey(t uint8) (key string) {
+	switch t {
+	case SummaryProject:
+		key = d.Project
+	case SummaryEditor:
+		key = d.Editor
+	case SummaryLanguage:
+		key = d.Language
+	case SummaryOS:
+		key = d.OperatingSystem
+	case SummaryMachine:
+		key = d.Machine
+	case SummaryBranch:
+		key = d.Branch
+	}
+
+	if key == "" {
+		key = UnknownSummaryKey
+	}
+
+	return key
+}

models/durations.go

@@ -0,0 +1,46 @@
+package models
+
+import "sort"
+
+type Durations []*Duration
+
+func (d Durations) Len() int {
+	return len(d)
+}
+
+func (d Durations) Less(i, j int) bool {
+	return d[i].Time.T().Before(d[j].Time.T())
+}
+
+func (d Durations) Swap(i, j int) {
+	d[i], d[j] = d[j], d[i]
+}
+
+func (d Durations) TotalNumHeartbeats() int {
+	var total int
+	for _, e := range d {
+		total += e.NumHeartbeats
+	}
+	return total
+}
+
+func (d Durations) Sorted() Durations {
+	sort.Sort(d)
+	return d
+}
+
+func (d *Durations) First() *Duration {
+	// assumes slice to be sorted
+	if d.Len() == 0 {
+		return nil
+	}
+	return (*d)[0]
+}
+
+func (d *Durations) Last() *Duration {
+	// assumes slice to be sorted
+	if d.Len() == 0 {
+		return nil
+	}
+	return (*d)[d.Len()-1]
+}

models/filters.go

@@ -1,45 +1,223 @@
 package models
 
+import (
+	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/mitchellh/hashstructure/v2"
+)
+
 type Filters struct {
-	Project  string
-	OS       string
-	Language string
-	Editor   string
-	Machine  string
+	Project  OrFilter
+	OS       OrFilter
+	Language OrFilter
+	Editor   OrFilter
+	Machine  OrFilter
+	Label    OrFilter
+	Branch   OrFilter
+}
+
+type OrFilter []string
+
+func (f OrFilter) Exists() bool {
+	return len(f) > 0 && f[0] != ""
+}
+
+func (f OrFilter) MatchAny(search string) bool {
+	for _, s := range f {
+		if s == search {
+			return true
+		}
+	}
+	return false
 }
 
 type FilterElement struct {
-	Type uint8
-	Key  string
+	entity uint8
+	filter OrFilter
 }
 
 func NewFiltersWith(entity uint8, key string) *Filters {
-	switch entity {
-	case SummaryProject:
-		return &Filters{Project: key}
-	case SummaryOS:
-		return &Filters{OS: key}
-	case SummaryLanguage:
-		return &Filters{Language: key}
-	case SummaryEditor:
-		return &Filters{Editor: key}
-	case SummaryMachine:
-		return &Filters{Machine: key}
-	}
-	return &Filters{}
+	return NewFilterWithMultiple(entity, []string{key})
 }
 
-func (f *Filters) One() (bool, uint8, string) {
-	if f.Project != "" {
-		return true, SummaryProject, f.Project
-	} else if f.OS != "" {
-		return true, SummaryOS, f.OS
-	} else if f.Language != "" {
-		return true, SummaryLanguage, f.Language
-	} else if f.Editor != "" {
-		return true, SummaryEditor, f.Editor
-	} else if f.Machine != "" {
-		return true, SummaryMachine, f.Machine
-	}
-	return false, 0, ""
+func NewFilterWithMultiple(entity uint8, keys []string) *Filters {
+	filters := &Filters{}
+	return filters.WithMultiple(entity, keys)
+}
+
+func (f *Filters) With(entity uint8, key string) *Filters {
+	return f.WithMultiple(entity, []string{key})
+}
+
+func (f *Filters) WithMultiple(entity uint8, keys []string) *Filters {
+	switch entity {
+	case SummaryProject:
+		f.Project = append(f.Project, keys...)
+	case SummaryOS:
+		f.OS = append(f.OS, keys...)
+	case SummaryLanguage:
+		f.Language = append(f.Language, keys...)
+	case SummaryEditor:
+		f.Editor = append(f.Editor, keys...)
+	case SummaryMachine:
+		f.Machine = append(f.Machine, keys...)
+	case SummaryLabel:
+		f.Label = append(f.Label, keys...)
+	case SummaryBranch:
+		f.Branch = append(f.Branch, keys...)
+	}
+	return f
+}
+
+func (f *Filters) One() (bool, uint8, OrFilter) {
+	if f.Project != nil && f.Project.Exists() {
+		return true, SummaryProject, f.Project
+	} else if f.OS != nil && f.OS.Exists() {
+		return true, SummaryOS, f.OS
+	} else if f.Language != nil && f.Language.Exists() {
+		return true, SummaryLanguage, f.Language
+	} else if f.Editor != nil && f.Editor.Exists() {
+		return true, SummaryEditor, f.Editor
+	} else if f.Machine != nil && f.Machine.Exists() {
+		return true, SummaryMachine, f.Machine
+	} else if f.Label != nil && f.Label.Exists() {
+		return true, SummaryLabel, f.Label
+	} else if f.Branch != nil && f.Branch.Exists() {
+		return true, SummaryBranch, f.Branch
+	}
+	return false, 0, OrFilter{}
+}
+
+func (f *Filters) OneOrEmpty() FilterElement {
+	if ok, t, of := f.One(); ok {
+		return FilterElement{entity: t, filter: of}
+	}
+	return FilterElement{entity: SummaryUnknown, filter: []string{}}
+}
+
+func (f *Filters) IsEmpty() bool {
+	nonEmpty, _, _ := f.One()
+	return !nonEmpty
+}
+
+func (f *Filters) Count() int {
+	var count int
+	for i := SummaryProject; i <= SummaryBranch; i++ {
+		count += f.CountByEntity(i)
+	}
+	return count
+}
+
+func (f *Filters) CountByEntity(entity uint8) int {
+	return len(*f.ResolveEntity(entity))
+}
+
+func (f *Filters) EntityCount() int {
+	var count int
+	for i := SummaryProject; i <= SummaryBranch; i++ {
+		if c := f.CountByEntity(i); c > 0 {
+			count++
+		}
+	}
+	return count
+}
+
+func (f *Filters) ResolveEntity(entityId uint8) *OrFilter {
+	switch entityId {
+	case SummaryProject:
+		return &f.Project
+	case SummaryLanguage:
+		return &f.Language
+	case SummaryEditor:
+		return &f.Editor
+	case SummaryOS:
+		return &f.OS
+	case SummaryMachine:
+		return &f.Machine
+	case SummaryLabel:
+		return &f.Label
+	case SummaryBranch:
+		return &f.Branch
+	default:
+		return &OrFilter{}
+	}
+}
+
+func (f *Filters) Hash() string {
+	hash, err := hashstructure.Hash(f, hashstructure.FormatV2, nil)
+	if err != nil {
+		logbuch.Error("CRITICAL ERROR: failed to hash struct - %v", err)
+	}
+	return fmt.Sprintf("%x", hash) // "uint64 values with high bit set are not supported"
+}
+
+func (f *Filters) Match(h *Heartbeat) bool {
+	return (f.Project == nil || f.Project.MatchAny(h.Project)) &&
+		(f.OS == nil || f.OS.MatchAny(h.OperatingSystem)) &&
+		(f.Language == nil || f.Language.MatchAny(h.Language)) &&
+		(f.Editor == nil || f.Editor.MatchAny(h.Editor)) &&
+		(f.Machine == nil || f.Machine.MatchAny(h.Machine))
+}
+
+// WithAliases adds OR-conditions for every alias of a filter key as additional filter keys
+func (f *Filters) WithAliases(resolve AliasReverseResolver) *Filters {
+	if f.Project != nil {
+		updated := OrFilter(make([]string, 0, len(f.Project)))
+		for _, e := range f.Project {
+			updated = append(updated, e)
+			updated = append(updated, resolve(SummaryProject, e)...)
+		}
+		f.Project = updated
+	}
+	if f.OS != nil {
+		updated := OrFilter(make([]string, 0, len(f.OS)))
+		for _, e := range f.OS {
+			updated = append(updated, e)
+			updated = append(updated, resolve(SummaryOS, e)...)
+		}
+		f.OS = updated
+	}
+	if f.Language != nil {
+		updated := OrFilter(make([]string, 0, len(f.Language)))
+		for _, e := range f.Language {
+			updated = append(updated, e)
+			updated = append(updated, resolve(SummaryLanguage, e)...)
+		}
+		f.Language = updated
+	}
+	if f.Editor != nil {
+		updated := OrFilter(make([]string, 0, len(f.Editor)))
+		for _, e := range f.Editor {
+			updated = append(updated, e)
+			updated = append(updated, resolve(SummaryEditor, e)...)
+		}
+		f.Editor = updated
+	}
+	if f.Machine != nil {
+		updated := OrFilter(make([]string, 0, len(f.Machine)))
+		for _, e := range f.Machine {
+			updated = append(updated, e)
+			updated = append(updated, resolve(SummaryMachine, e)...)
+		}
+		f.Machine = updated
+	}
+	if f.Branch != nil {
+		updated := OrFilter(make([]string, 0, len(f.Branch)))
+		for _, e := range f.Branch {
+			updated = append(updated, e)
+			updated = append(updated, resolve(SummaryBranch, e)...)
+		}
+		f.Branch = updated
+	}
+	return f
+}
+
+func (f *Filters) WithProjectLabels(resolve ProjectLabelReverseResolver) *Filters {
+	if f.Label == nil || !f.Label.Exists() {
+		return f
+	}
+	for _, l := range f.Label {
+		f.WithMultiple(SummaryProject, resolve(l))
+	}
+	return f
 }

models/filters_test.go

@@ -0,0 +1,160 @@
+package models
+
+import (
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/suite"
+	"testing"
+)
+
+type FiltersTestSuite struct {
+	suite.Suite
+	TestAliases                    []*Alias
+	TestProjectLabels              []*ProjectLabel
+	GetAliasReverseResolver        func(indices []int) AliasReverseResolver
+	GetProjectLabelReverseResolver func(indices []int) ProjectLabelReverseResolver
+}
+
+func (suite *FiltersTestSuite) SetupSuite() {
+	suite.TestAliases = []*Alias{
+		{
+			Type:  SummaryProject,
+			Key:   "wakapi",
+			Value: "wakapi-mobile",
+		},
+		{
+			Type:  SummaryProject,
+			Key:   "wakapi",
+			Value: "wakapi-desktop",
+		},
+		{
+			Type:  SummaryLanguage,
+			Key:   "Python",
+			Value: "Python 3",
+		},
+	}
+
+	suite.TestProjectLabels = []*ProjectLabel{
+		{
+			ProjectKey: "wakapi",
+			Label:      "oss",
+		},
+		{
+			ProjectKey: "anchr",
+			Label:      "oss",
+		},
+		{
+			ProjectKey: "business-application",
+			Label:      "work",
+		},
+	}
+
+	suite.GetAliasReverseResolver = func(indices []int) AliasReverseResolver {
+		return func(t uint8, k string) []string {
+			aliases := make([]string, 0, len(indices))
+			for _, j := range indices {
+				if a := suite.TestAliases[j]; a.Type == t && a.Key == k {
+					aliases = append(aliases, a.Value)
+				}
+			}
+			return aliases
+		}
+	}
+
+	suite.GetProjectLabelReverseResolver = func(indices []int) ProjectLabelReverseResolver {
+		return func(k string) []string {
+			labels := make([]string, 0, len(indices))
+			for _, j := range indices {
+				if l := suite.TestProjectLabels[j]; l.Label == k {
+					labels = append(labels, l.ProjectKey)
+				}
+			}
+			return labels
+		}
+	}
+}
+
+func TestFiltersTestSuite(t *testing.T) {
+	suite.Run(t, new(FiltersTestSuite))
+}
+
+func (suite *FiltersTestSuite) TestFilters_IsEmpty() {
+	assert.False(suite.T(), NewFiltersWith(SummaryProject, "wakapi").IsEmpty())
+	assert.True(suite.T(), (&Filters{}).IsEmpty())
+}
+
+func (suite *FiltersTestSuite) TestFilters_Match() {
+	heartbeats := []*Heartbeat{
+		{Project: "wakapi", Language: "Go"},
+		{Project: "anchr", Language: "Javascript"},
+	}
+
+	sut1 := NewFiltersWith(SummaryProject, "wakapi")
+	assert.True(suite.T(), sut1.Match(heartbeats[0]))
+	assert.False(suite.T(), sut1.Match(heartbeats[1]))
+
+	sut2 := NewFiltersWith(SummaryProject, "Go").With(SummaryLanguage, "JavaScript")
+	assert.False(suite.T(), sut2.Match(heartbeats[0]))
+	assert.False(suite.T(), sut2.Match(heartbeats[1]))
+
+	sut3 := NewFilterWithMultiple(SummaryProject, []string{"wakapi", "anchr"})
+	assert.True(suite.T(), sut3.Match(heartbeats[0]))
+	assert.True(suite.T(), sut3.Match(heartbeats[1]))
+
+	sut4 := &Filters{}
+	assert.True(suite.T(), sut4.Match(heartbeats[0]))
+	assert.True(suite.T(), sut4.Match(heartbeats[1]))
+}
+
+func (suite *FiltersTestSuite) TestFilters_One() {
+	sut1 := NewFiltersWith(SummaryLanguage, "Java")
+	ok1, type1, filters1 := sut1.One()
+	assert.True(suite.T(), ok1)
+	assert.Equal(suite.T(), SummaryLanguage, type1)
+	assert.Equal(suite.T(), "Java", filters1[0])
+
+	sut2 := &Filters{}
+	ok2, type2, filters2 := sut2.One()
+	assert.False(suite.T(), ok2)
+	assert.Zero(suite.T(), type2)
+	assert.Empty(suite.T(), filters2)
+}
+
+func (suite *FiltersTestSuite) TestFilters_WithAliases() {
+	sut1 := NewFiltersWith(SummaryProject, "wakapi")
+	sut1 = sut1.WithAliases(suite.GetAliasReverseResolver([]int{0, 1, 2}))
+	assert.Len(suite.T(), sut1.Project, 3)
+	assert.Len(suite.T(), sut1.Language, 0)
+	assert.Contains(suite.T(), sut1.Project, "wakapi")
+	assert.Contains(suite.T(), sut1.Project, "wakapi-desktop")
+	assert.Contains(suite.T(), sut1.Project, "wakapi-mobile")
+
+	sut2 := NewFiltersWith(SummaryProject, "wakapi").With(SummaryLanguage, "Python")
+	sut2 = sut2.WithAliases(suite.GetAliasReverseResolver([]int{0, 1, 2}))
+	assert.Len(suite.T(), sut2.Project, 3)
+	assert.Len(suite.T(), sut2.Language, 2)
+	assert.Contains(suite.T(), sut2.Language, "Python")
+	assert.Contains(suite.T(), sut2.Language, "Python 3")
+
+	sut3 := NewFiltersWith(SummaryProject, "foo")
+	sut3 = sut3.WithAliases(suite.GetAliasReverseResolver([]int{0, 1, 2}))
+	assert.Len(suite.T(), sut3.Project, 1)
+	assert.Len(suite.T(), sut3.Language, 0)
+	assert.Contains(suite.T(), sut3.Project, "foo")
+}
+
+func (suite *FiltersTestSuite) TestFilters_WithProjectLabels() {
+	sut1 := NewFiltersWith(SummaryProject, "mailwhale").With(SummaryLabel, "oss")
+	sut1 = sut1.WithProjectLabels(suite.GetProjectLabelReverseResolver([]int{0, 1, 2}))
+	assert.Len(suite.T(), sut1.Project, 3)
+	assert.Contains(suite.T(), sut1.Project, "wakapi")
+	assert.Contains(suite.T(), sut1.Project, "anchr")
+	assert.Contains(suite.T(), sut1.Project, "mailwhale")
+	assert.Contains(suite.T(), sut1.Label, "oss")
+
+	sut2 := NewFiltersWith(SummaryLabel, "oss")
+	sut2 = sut2.WithProjectLabels(suite.GetProjectLabelReverseResolver([]int{0, 1, 2}))
+	assert.Len(suite.T(), sut2.Project, 2)
+	assert.Contains(suite.T(), sut2.Project, "wakapi")
+	assert.Contains(suite.T(), sut2.Project, "anchr")
+	assert.Contains(suite.T(), sut2.Label, "oss")
+}

models/heartbeat.go

@@ -4,46 +4,49 @@ 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"`
-	OperatingSystem string         `json:"operating_system"`
-	Machine         string         `json:"machine"`
-	Time            CustomTime     `json:"time" gorm:"type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time,idx_time_user"`
-	Hash            string         `json:"-" gorm:"type:varchar(17); uniqueIndex"`
-	languageRegex   *regexp.Regexp `hash:"ignore"`
+	ID              uint64     `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; index:idx_user_project"` // idx_user_project is for quickly fetching a user's project list (settings page)
+	Entity          string     `json:"entity" gorm:"not null"`
+	Type            string     `json:"type"`
+	Category        string     `json:"category"`
+	Project         string     `json:"project" gorm:"index:idx_project; index:idx_user_project"`
+	Branch          string     `json:"branch" gorm:"index:idx_branch"`
+	Language        string     `json:"language" gorm:"index:idx_language"`
+	IsWrite         bool       `json:"is_write"`
+	Editor          string     `json:"editor" gorm:"index:idx_editor" hash:"ignore"`                     // ignored because editor might be parsed differently by wakatime
+	OperatingSystem string     `json:"operating_system" gorm:"index:idx_operating_system" hash:"ignore"` // ignored because os might be parsed differently by wakatime
+	Machine         string     `json:"machine" gorm:"index:idx_machine" hash:"ignore"`                   // ignored because wakatime api doesn't return machines currently
+	UserAgent       string     `json:"user_agent" hash:"ignore" gorm:"type:varchar(255)"`
+	Time            CustomTime `json:"time" gorm:"type:timestamp(3); index:idx_time,idx_time_user" swaggertype:"primitive,number"`
+	Hash            string     `json:"-" gorm:"type:varchar(17); uniqueIndex"`
+	Origin          string     `json:"-" hash:"ignore" gorm:"type:varchar(255)"`
+	OriginId        string     `json:"-" hash:"ignore" gorm:"type:varchar(255)"`
+	CreatedAt       CustomTime `json:"created_at" gorm:"type:timestamp(3)" swaggertype:"primitive,number" hash:"ignore"` // https://gorm.io/docs/conventions.html#CreatedAt
 }
 
 func (h *Heartbeat) Valid() bool {
 	return h.User != nil && h.UserID != "" && h.User.ID == h.UserID && h.Time != CustomTime(time.Time{})
 }
 
+func (h *Heartbeat) Timely(maxAge time.Duration) bool {
+	now := time.Now()
+	return now.Sub(h.Time.T()) <= maxAge && h.Time.T().Sub(now) < 1*time.Hour
+}
+
 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) {
@@ -58,6 +61,8 @@ func (h *Heartbeat) GetKey(t uint8) (key string) {
 		key = h.OperatingSystem
 	case SummaryMachine:
 		key = h.Machine
+	case SummaryBranch:
+		key = h.Branch
 	}
 
 	if key == "" {
@@ -94,8 +99,20 @@ func (h *Heartbeat) String() string {
 func (h *Heartbeat) Hashed() *Heartbeat {
 	hash, err := hashstructure.Hash(h, hashstructure.FormatV2, nil)
 	if err != nil {
-		logbuch.Error("CRITICAL ERROR: failed to hash struct – %v", err)
+		logbuch.Error("CRITICAL ERROR: failed to hash struct - %v", err)
 	}
 	h.Hash = fmt.Sprintf("%x", hash) // "uint64 values with high bit set are not supported"
 	return h
 }
+
+func GetEntityColumn(t uint8) string {
+	return []string{
+		"project",
+		"language",
+		"editor",
+		"operating_system",
+		"machine",
+		"label",
+		"branch",
+	}[t]
+}

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) {

models/interval.go

@@ -0,0 +1,46 @@
+package models
+
+// Support Wakapi and WakaTime range / interval identifiers
+// See https://wakatime.com/developers/#summaries
+var (
+	IntervalToday              = &IntervalKey{"today", "Today"}
+	IntervalYesterday          = &IntervalKey{"day", "yesterday", "Yesterday"}
+	IntervalThisWeek           = &IntervalKey{"week", "This Week"}
+	IntervalLastWeek           = &IntervalKey{"Last Week"}
+	IntervalThisMonth          = &IntervalKey{"month", "This Month"}
+	IntervalLastMonth          = &IntervalKey{"Last Month"}
+	IntervalThisYear           = &IntervalKey{"year"}
+	IntervalPast7Days          = &IntervalKey{"7_days", "last_7_days", "Last 7 Days"}
+	IntervalPast7DaysYesterday = &IntervalKey{"Last 7 Days from Yesterday"}
+	IntervalPast14Days         = &IntervalKey{"Last 14 Days"}
+	IntervalPast30Days         = &IntervalKey{"30_days", "last_30_days", "Last 30 Days"}
+	IntervalPast12Months       = &IntervalKey{"12_months", "last_12_months"}
+	IntervalAny                = &IntervalKey{"any"}
+)
+
+var AllIntervals = []*IntervalKey{
+	IntervalToday,
+	IntervalYesterday,
+	IntervalThisWeek,
+	IntervalLastWeek,
+	IntervalThisMonth,
+	IntervalLastMonth,
+	IntervalThisYear,
+	IntervalPast7Days,
+	IntervalPast7DaysYesterday,
+	IntervalPast14Days,
+	IntervalPast30Days,
+	IntervalPast12Months,
+	IntervalAny,
+}
+
+type IntervalKey []string
+
+func (k *IntervalKey) HasAlias(s string) bool {
+	for _, e := range *k {
+		if e == s {
+			return true
+		}
+	}
+	return false
+}

models/mail.go

@@ -0,0 +1,48 @@
+package models
+
+import (
+	"fmt"
+	"strings"
+)
+
+const HtmlType = "text/html; charset=UTF-8"
+const PlainType = "text/html; charset=UTF-8"
+
+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 = PlainType
+	return m
+}
+
+func (m *Mail) WithHTML(html string) *Mail {
+	m.Body = html
+	m.Type = HtmlType
+	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())
+}

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
+}

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
+}

models/metrics/counter_metric.go

@@ -0,0 +1,22 @@
+package metrics
+
+import "fmt"
+
+type CounterMetric struct {
+	Name   string
+	Value  int64
+	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)
+}

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)
+}

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
+}

models/project_label.go

@@ -0,0 +1,16 @@
+package models
+
+// ProjectLabelReverseResolver returns all projects for a given label
+type ProjectLabelReverseResolver func(l string) []string
+
+type ProjectLabel struct {
+	ID         uint   `json:"id" gorm:"primary_key"`
+	User       *User  `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
+	UserID     string `json:"-" gorm:"not null; index:idx_project_label_user"`
+	ProjectKey string `json:"project"`
+	Label      string `json:"label" gorm:"type:varchar(64)"`
+}
+
+func (l *ProjectLabel) IsValid() bool {
+	return l.ProjectKey != "" && l.Label != ""
+}

models/report.go

@@ -0,0 +1,10 @@
+package models
+
+import "time"
+
+type Report struct {
+	From    time.Time
+	To      time.Time
+	User    *User
+	Summary *Summary
+}

models/shared.go

@@ -2,10 +2,10 @@ package models
 
 import (
 	"database/sql/driver"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"gorm.io/gorm"
-	"math"
 	"strconv"
 	"strings"
 	"time"
@@ -29,20 +29,29 @@ type Interval struct {
 	End   time.Time
 }
 
+type KeyedInterval struct {
+	Interval
+	Key *IntervalKey
+}
+
+// CustomTime is a wrapper type around time.Time, mainly used for the purpose of transparently unmarshalling Python timestamps in the format <sec>.<nsec> (e.g. 1619335137.3324468)
 type CustomTime time.Time
 
+func (j *CustomTime) MarshalJSON() ([]byte, error) {
+	return json.Marshal(j.T())
+}
+
 func (j *CustomTime) UnmarshalJSON(b []byte) error {
-	s := strings.Replace(strings.Trim(string(b), "\""), ".", "", 1)
-	i, err := strconv.ParseInt(s, 10, 64)
+	s := strings.Trim(string(b), "\"")
+	ts, err := strconv.ParseFloat(s, 64)
 	if err != nil {
 		return err
 	}
-	t := time.Unix(0, i*int64(math.Pow10(19-len(s))))
+	t := time.Unix(0, int64(ts*1e9)) // ms to ns
 	*j = CustomTime(t)
 	return nil
 }
 
-// heartbeat timestamps arrive as strings for sqlite and as time.Time for postgres
 func (j *CustomTime) Scan(value interface{}) error {
 	var (
 		t   time.Time
@@ -51,13 +60,12 @@ func (j *CustomTime) Scan(value interface{}) error {
 
 	switch value.(type) {
 	case string:
+		// with sqlite, some queries (like GetLastByUser()) return dates as strings,
+		// however, most of the time they are returned as time.Time
 		t, err = time.Parse("2006-01-02 15:04:05-07:00", value.(string))
 		if err != nil {
 			return errors.New(fmt.Sprintf("unsupported date time format: %s", value))
 		}
-	case int64:
-		t = time.Unix(0, value.(int64))
-		break
 	case time.Time:
 		t = value.(time.Time)
 		break
@@ -71,18 +79,17 @@ func (j *CustomTime) Scan(value interface{}) error {
 	return nil
 }
 
-func (j *CustomTime) Hash() (uint64, error) {
-	return uint64((j.T().UnixNano() / 1000) / 1000), nil
-}
-
 func (j CustomTime) Value() (driver.Value, error) {
 	t := time.Unix(0, j.T().UnixNano()/int64(time.Millisecond)*int64(time.Millisecond)) // round to millisecond precision
 	return t, nil
 }
 
+func (j *CustomTime) Hash() (uint64, error) {
+	return uint64((j.T().UnixNano() / 1000) / 1000), nil
+}
+
 func (j CustomTime) String() string {
-	t := time.Time(j)
-	return t.Format("2006-01-02 15:04:05.000")
+	return j.T().String()
 }
 
 func (j CustomTime) T() time.Time {

models/summary.go

@@ -1,73 +1,51 @@
 package models
 
 import (
+	"errors"
 	"sort"
 	"time"
 )
 
 const (
 	NSummaryTypes   uint8 = 99
+	SummaryUnknown  uint8 = 98
 	SummaryProject  uint8 = 0
 	SummaryLanguage uint8 = 1
 	SummaryEditor   uint8 = 2
 	SummaryOS       uint8 = 3
 	SummaryMachine  uint8 = 4
+	SummaryLabel    uint8 = 5
+	SummaryBranch   uint8 = 6
 )
 
-const (
-	IntervalToday        string = "today"
-	IntervalYesterday    string = "day"
-	IntervalThisWeek     string = "week"
-	IntervalThisMonth    string = "month"
-	IntervalThisYear     string = "year"
-	IntervalPast7Days    string = "7_days"
-	IntervalPast30Days   string = "30_days"
-	IntervalPast12Months string = "12_months"
-	IntervalAny          string = "any"
-
-	// https://wakatime.com/developers/#summaries
-	IntervalWakatimeToday              string = "Today"
-	IntervalWakatimeYesterday          string = "Yesterday"
-	IntervalWakatimeLast7Days          string = "Last 7 Days"
-	IntervalWakatimeLast7DaysYesterday string = "Last 7 Days from Yesterday"
-	IntervalWakatimeLast14Days         string = "Last 14 Days"
-	IntervalWakatimeLast30Days         string = "Last 30 Days"
-	IntervalWakatimeThisWeek           string = "This Week"
-	IntervalWakatimeLastWeek           string = "Last Week"
-	IntervalWakatimeThisMonth          string = "This Month"
-	IntervalWakatimeLastMonth          string = "Last Month"
-)
-
-func Intervals() []string {
-	return []string{
-		IntervalToday, IntervalYesterday, IntervalThisWeek, IntervalThisMonth, IntervalThisYear, IntervalPast7Days, IntervalPast30Days, IntervalPast12Months, IntervalAny,
-	}
-}
-
 const UnknownSummaryKey = "unknown"
+const DefaultProjectLabel = "default"
 
 type Summary struct {
 	ID               uint         `json:"-" gorm:"primary_key"`
 	User             *User        `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	UserID           string       `json:"user_id" gorm:"not null; index:idx_time_summary_user"`
-	FromTime         CustomTime   `json:"from" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user"`
-	ToTime           CustomTime   `json:"to" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user"`
+	FromTime         CustomTime   `json:"from" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	ToTime           CustomTime   `json:"to" gorm:"not null; type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time_summary_user" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
 	Projects         SummaryItems `json:"projects" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	Languages        SummaryItems `json:"languages" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	Editors          SummaryItems `json:"editors" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	OperatingSystems SummaryItems `json:"operating_systems" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	Machines         SummaryItems `json:"machines" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
+	Labels           SummaryItems `json:"labels" gorm:"-"`   // labels are not persisted, but calculated at runtime, i.e. when summary is retrieved
+	Branches         SummaryItems `json:"branches" gorm:"-"` // branches are not persisted, but calculated at runtime in case a project filter is applied
+	NumHeartbeats    int          `json:"-" gorm:"default:0"`
 }
 
 type SummaryItems []*SummaryItem
 
 type SummaryItem struct {
-	ID        uint          `json:"-" gorm:"primary_key"`
+	ID        uint64        `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"`
+	Total     time.Duration `json:"total" swaggertype:"primitive,integer"`
 }
 
 type SummaryItemContainer struct {
@@ -75,26 +53,23 @@ type SummaryItemContainer struct {
 	Items []*SummaryItem
 }
 
-type SummaryViewModel struct {
-	*Summary
-	LanguageColors map[string]string
-	EditorColors   map[string]string
-	OSColors       map[string]string
-	Error          string
-	Success        string
-	ApiKey         string
-}
-
 type SummaryParams struct {
 	From      time.Time
 	To        time.Time
 	User      *User
+	Filters   *Filters
 	Recompute bool
 }
 
-type AliasResolver func(t uint8, k string) string
-
 func SummaryTypes() []uint8 {
+	return []uint8{SummaryProject, SummaryLanguage, SummaryEditor, SummaryOS, SummaryMachine, SummaryLabel, SummaryBranch}
+}
+
+func NativeSummaryTypes() []uint8 {
+	return []uint8{SummaryProject, SummaryLanguage, SummaryEditor, SummaryOS, SummaryMachine, SummaryBranch}
+}
+
+func PersistedSummaryTypes() []uint8 {
 	return []uint8{SummaryProject, SummaryLanguage, SummaryEditor, SummaryOS, SummaryMachine}
 }
 
@@ -104,6 +79,8 @@ func (s *Summary) Sorted() *Summary {
 	sort.Sort(sort.Reverse(s.OperatingSystems))
 	sort.Sort(sort.Reverse(s.Languages))
 	sort.Sort(sort.Reverse(s.Editors))
+	sort.Sort(sort.Reverse(s.Labels))
+	sort.Sort(sort.Reverse(s.Branches))
 	return s
 }
 
@@ -118,9 +95,45 @@ func (s *Summary) MappedItems() map[uint8]*SummaryItems {
 		SummaryEditor:   &s.Editors,
 		SummaryOS:       &s.OperatingSystems,
 		SummaryMachine:  &s.Machines,
+		SummaryLabel:    &s.Labels,
+		SummaryBranch:   &s.Branches,
 	}
 }
 
+func (s *Summary) ItemsByType(summaryType uint8) *SummaryItems {
+	switch summaryType {
+	case SummaryProject:
+		return &s.Projects
+	case SummaryLanguage:
+		return &s.Languages
+	case SummaryEditor:
+		return &s.Editors
+	case SummaryOS:
+		return &s.OperatingSystems
+	case SummaryMachine:
+		return &s.Machines
+	case SummaryLabel:
+		return &s.Labels
+	case SummaryBranch:
+		return &s.Branches
+	}
+	return nil
+}
+
+func (s *Summary) KeepOnly(types map[uint8]bool) *Summary {
+	if len(types) == 0 {
+		return s
+	}
+
+	for _, t := range SummaryTypes() {
+		if keep, ok := types[t]; !keep || !ok {
+			*s.ItemsByType(t) = []*SummaryItem{}
+		}
+	}
+
+	return s
+}
+
 /* 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"
@@ -132,7 +145,7 @@ of time than the other ones.
 To avoid having to modify persisted data retrospectively, i.e. inserting a dummy SummaryItem for the new type,
 such is generated dynamically here, considering the "machine" for all old heartbeats "unknown".
 */
-func (s *Summary) FillUnknown() {
+func (s *Summary) FillMissing() {
 	types := s.Types()
 	typeItems := s.MappedItems()
 	missingTypes := make([]uint8, 0)
@@ -148,15 +161,46 @@ func (s *Summary) FillUnknown() {
 		return
 	}
 
-	timeSum := s.TotalTime()
-
 	// construct dummy item for all missing types
+	presentType, err := s.findFirstPresentType()
+	if err != nil {
+		return // all types are either zero or missing entirely, nothing to fill
+	}
 	for _, t := range missingTypes {
-		*typeItems[t] = append(*typeItems[t], &SummaryItem{
-			Type:  t,
-			Key:   UnknownSummaryKey,
-			Total: timeSum,
-		})
+		s.FillBy(presentType, t)
+	}
+}
+
+// inplace!
+func (s *Summary) FillBy(fromType uint8, toType uint8) {
+	typeItems := s.MappedItems()
+	totalWanted := s.TotalTimeBy(fromType)
+	totalActual := s.TotalTimeBy(toType)
+
+	key := UnknownSummaryKey
+	if toType == SummaryLabel {
+		key = DefaultProjectLabel
+	}
+
+	existingEntryIdx := -1
+	for i, item := range *typeItems[toType] {
+		if item.Key == key {
+			existingEntryIdx = i
+			break
+		}
+	}
+
+	total := (totalWanted - totalActual) / time.Second // workaround
+	if total > 0 {
+		if existingEntryIdx >= 0 {
+			(*typeItems[toType])[existingEntryIdx].Total = total
+		} else {
+			*typeItems[toType] = append(*typeItems[toType], &SummaryItem{
+				Type:  toType,
+				Key:   key,
+				Total: total,
+			})
+		}
 	}
 }
 
@@ -164,14 +208,12 @@ func (s *Summary) TotalTime() time.Duration {
 	var timeSum time.Duration
 
 	mappedItems := s.MappedItems()
-	// calculate total duration from any of the present sets of items
-	for _, t := range s.Types() {
-		if items := mappedItems[t]; len(*items) > 0 {
-			for _, item := range *items {
-				timeSum += item.Total
-			}
-			break
-		}
+	t, err := s.findFirstPresentType()
+	if err != nil {
+		return 0
+	}
+	for _, item := range *mappedItems[t] {
+		timeSum += item.Total
 	}
 
 	return timeSum * time.Second
@@ -200,16 +242,41 @@ func (s *Summary) TotalTimeByKey(entityType uint8, key string) (timeSum time.Dur
 	return timeSum
 }
 
-func (s *Summary) TotalTimeByFilters(filters *Filters) time.Duration {
-	do, typeId, key := filters.One()
-	if do {
-		return s.TotalTimeByKey(typeId, key)
+func (s *Summary) TotalTimeByFilter(filter FilterElement) time.Duration {
+	var total time.Duration
+	for _, f := range filter.filter {
+		total += s.TotalTimeByKey(filter.entity, f)
 	}
-	return 0
+	return total
+}
+
+func (s *Summary) MaxBy(entityType uint8) *SummaryItem {
+	var max *SummaryItem
+	mappedItems := s.MappedItems()
+	if items := mappedItems[entityType]; len(*items) > 0 {
+		for _, item := range *items {
+			if max == nil || item.Total > max.Total {
+				max = item
+			}
+		}
+	}
+	return max
+}
+
+func (s *Summary) MaxByToString(entityType uint8) string {
+	max := s.MaxBy(entityType)
+	if max == nil {
+		return "-"
+	}
+	return max.Key
 }
 
 func (s *Summary) WithResolvedAliases(resolve AliasResolver) *Summary {
 	processAliases := func(origin []*SummaryItem) []*SummaryItem {
+		if origin == nil {
+			return nil
+		}
+
 		target := make([]*SummaryItem, 0)
 
 		findItem := func(key string) *SummaryItem {
@@ -254,10 +321,47 @@ func (s *Summary) WithResolvedAliases(resolve AliasResolver) *Summary {
 	s.Languages = processAliases(s.Languages)
 	s.OperatingSystems = processAliases(s.OperatingSystems)
 	s.Machines = processAliases(s.Machines)
+	s.Labels = processAliases(s.Labels)
+	s.Branches = processAliases(s.Branches)
 
 	return s
 }
 
+func (s *Summary) findFirstPresentType() (uint8, error) {
+	for _, t := range s.Types() {
+		if s.TotalTimeBy(t) != 0 {
+			return t, nil
+		}
+	}
+	return 127, errors.New("no type present")
+}
+
+func (s *SummaryParams) HasFilters() bool {
+	return s.Filters != nil && !s.Filters.IsEmpty()
+}
+
+func (s *SummaryParams) IsProjectDetails() bool {
+	if !s.HasFilters() {
+		return false
+	}
+	_, entity, filters := s.Filters.One()
+	return entity == SummaryProject && len(filters) == 1 // exactly one
+}
+
+func (s *SummaryParams) GetProjectFilter() string {
+	if !s.IsProjectDetails() {
+		return ""
+	}
+	_, _, filters := s.Filters.One()
+	return filters[0]
+}
+
+func (s *SummaryItem) TotalFixed() time.Duration {
+	// this is a workaround, since currently, the total time of a summary item is mistakenly represented in seconds
+	// TODO: fix some day, while migrating persisted summary items
+	return s.Total * time.Second
+}
+
 func (s SummaryItems) Len() int {
 	return len(s)
 }

models/summary_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 )
 
-func TestSummary_FillUnknown(t *testing.T) {
+func TestSummary_FillMissing(t *testing.T) {
 	testDuration := 10 * time.Minute
 
 	sut := &Summary{
@@ -20,7 +20,7 @@ func TestSummary_FillUnknown(t *testing.T) {
 		},
 	}
 
-	sut.FillUnknown()
+	sut.FillMissing()
 
 	itemLists := [][]*SummaryItem{
 		sut.Machines,
@@ -31,8 +31,12 @@ func TestSummary_FillUnknown(t *testing.T) {
 	for _, l := range itemLists {
 		assert.Len(t, l, 1)
 		assert.Equal(t, UnknownSummaryKey, l[0].Key)
-		assert.Equal(t, testDuration, l[0].Total)
+		assert.Equal(t, testDuration, l[0].TotalFixed())
 	}
+
+	assert.Len(t, sut.Labels, 1)
+	assert.Equal(t, DefaultProjectLabel, sut.Labels[0].Key)
+	assert.Equal(t, testDuration, sut.Labels[0].TotalFixed())
 }
 
 func TestSummary_TotalTimeBy(t *testing.T) {
@@ -94,20 +98,13 @@ func TestSummary_TotalTimeByFilters(t *testing.T) {
 		},
 	}
 
-	// Specifying filters about multiple entites is not supported at the moment
-	// as the current, very rudimentary, time calculation logic wouldn't make sense then.
-	// Evaluating a filter like (project="wakapi", language="go") can only be realized
-	// before computing the summary in the first place, because afterwards we can't know
-	// what time coded in "Go" was in the "Wakapi" project
-	// See https://github.com/muety/wakapi/issues/108
+	filters1 := NewFiltersWith(SummaryProject, "wakapi").OneOrEmpty()
+	filters2 := NewFiltersWith(SummaryLanguage, "Go").OneOrEmpty()
+	filters3 := FilterElement{}
 
-	filters1 := &Filters{Project: "wakapi"}
-	filters2 := &Filters{Language: "Go"}
-	filters3 := &Filters{}
-
-	assert.Equal(t, testDuration1, sut.TotalTimeByFilters(filters1))
-	assert.Equal(t, testDuration3, sut.TotalTimeByFilters(filters2))
-	assert.Zero(t, sut.TotalTimeByFilters(filters3))
+	assert.Equal(t, testDuration1, sut.TotalTimeByFilter(filters1))
+	assert.Equal(t, testDuration3, sut.TotalTimeByFilter(filters2))
+	assert.Zero(t, sut.TotalTimeByFilter(filters3))
 }
 
 func TestSummary_WithResolvedAliases(t *testing.T) {
@@ -171,6 +168,66 @@ func TestSummary_WithResolvedAliases(t *testing.T) {
 	assert.Empty(t, sut.Machines)
 }
 
+func TestSummary_KeepOnly(t *testing.T) {
+	newSummary := func() *Summary {
+		return &Summary{
+			Projects: []*SummaryItem{
+				{
+					Type: SummaryProject,
+					Key:  "wakapi",
+					// hack to work around the issue that the total time of a summary item is mistakenly represented in seconds
+					Total: 10 * time.Minute / time.Second,
+				},
+				{
+					Type:  SummaryProject,
+					Key:   "anchr",
+					Total: 10 * time.Minute / time.Second,
+				},
+			},
+			Languages: []*SummaryItem{
+				{
+					Type:  SummaryLanguage,
+					Key:   "Go",
+					Total: 10 * time.Minute / time.Second,
+				},
+			},
+			Editors: []*SummaryItem{
+				{
+					Type:  SummaryEditor,
+					Key:   "VSCode",
+					Total: 10 * time.Minute / time.Second,
+				},
+			},
+		}
+	}
+
+	var sut *Summary
+
+	sut = newSummary().KeepOnly(map[uint8]bool{}) // keep all
+	assert.NotZero(t, sut.TotalTimeBy(SummaryProject))
+	assert.NotZero(t, sut.TotalTimeBy(SummaryLanguage))
+	assert.NotZero(t, sut.TotalTimeBy(SummaryEditor))
+	assert.Equal(t, 20*time.Minute, sut.TotalTime())
+
+	sut = newSummary().KeepOnly(map[uint8]bool{SummaryProject: true})
+	assert.NotZero(t, sut.TotalTimeBy(SummaryProject))
+	assert.Zero(t, sut.TotalTimeBy(SummaryLanguage))
+	assert.Zero(t, sut.TotalTimeBy(SummaryEditor))
+	assert.Equal(t, 20*time.Minute, sut.TotalTime())
+
+	sut = newSummary().KeepOnly(map[uint8]bool{SummaryEditor: true, SummaryLanguage: true})
+	assert.Zero(t, sut.TotalTimeBy(SummaryProject))
+	assert.NotZero(t, sut.TotalTimeBy(SummaryLanguage))
+	assert.NotZero(t, sut.TotalTimeBy(SummaryEditor))
+	assert.Equal(t, 10*time.Minute, sut.TotalTime())
+
+	sut = newSummary().KeepOnly(map[uint8]bool{SummaryProject: true})
+	sut.FillMissing()
+	assert.NotZero(t, sut.TotalTimeBy(SummaryProject))
+	assert.NotZero(t, sut.TotalTimeBy(SummaryLanguage))
+	assert.NotZero(t, sut.TotalTimeBy(SummaryEditor))
+}
+
 func TestSummaryItems_Sorted(t *testing.T) {
 	testDuration1, testDuration2, testDuration3 := 10*time.Minute, 5*time.Minute, 20*time.Minute
 

models/user.go

@@ -1,13 +1,38 @@
 package models
 
+import (
+	"crypto/md5"
+	"fmt"
+	"regexp"
+	"strings"
+	"time"
+)
+
+func init() {
+	mailRegex = regexp.MustCompile(MailPattern)
+}
+
 type User struct {
-	ID             string     `json:"id" gorm:"primary_key"`
-	ApiKey         string     `json:"api_key" gorm:"unique"`
-	Password       string     `json:"-"`
-	CreatedAt      CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP"`
-	LastLoggedInAt CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP"`
-	BadgesEnabled  bool       `json:"-" gorm:"default:false; type:bool"`
-	WakatimeApiKey string     `json:"-"`
+	ID               string     `json:"id" gorm:"primary_key"`
+	ApiKey           string     `json:"api_key" gorm:"unique; default:NULL"`
+	Email            string     `json:"email" gorm:"index:idx_user_email; size:255"`
+	Location         string     `json:"location"`
+	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"`
+	ShareDataMaxDays int        `json:"-" gorm:"default:0"`
+	ShareEditors     bool       `json:"-" gorm:"default:false; type:bool"`
+	ShareLanguages   bool       `json:"-" gorm:"default:false; type:bool"`
+	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"`
+	ShareLabels      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:"-"` // for relay middleware and imports
+	WakatimeApiUrl   string     `json:"-"` // for relay middleware and imports
+	ResetToken       string     `json:"-"`
+	ReportsWeekly    bool       `json:"-" gorm:"default:false; type:bool"`
 }
 
 type Login struct {
@@ -17,8 +42,20 @@ type Login struct {
 
 type Signup struct {
 	Username       string `schema:"username"`
+	Email          string `schema:"email"`
 	Password       string `schema:"password"`
 	PasswordRepeat string `schema:"password_repeat"`
+	Location       string `schema:"location"`
+}
+
+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 {
@@ -27,26 +64,94 @@ type CredentialsReset struct {
 	PasswordRepeat string `schema:"password_repeat"`
 }
 
+type UserDataUpdate struct {
+	Email         string `schema:"email"`
+	Location      string `schema:"location"`
+	ReportsWeekly bool   `schema:"reports_weekly"`
+}
+
 type TimeByUser struct {
 	User string
 	Time CustomTime
 }
 
+type CountByUser struct {
+	User  string
+	Count int64
+}
+
+func (u *User) TZ() *time.Location {
+	if u.Location == "" {
+		u.Location = "Local"
+	}
+	tz, err := time.LoadLocation(u.Location)
+	if err != nil {
+		return time.Local
+	}
+	return tz
+}
+
+// TZOffset returns the time difference between the user's current time zone and UTC
+// TODO: is this actually working??
+func (u *User) TZOffset() time.Duration {
+	_, offset := time.Now().In(u.TZ()).Zone()
+	return time.Duration(offset * int(time.Second))
+}
+
+func (u *User) AvatarURL(urlTemplate string) string {
+	urlTemplate = strings.ReplaceAll(urlTemplate, "{username}", u.ID)
+	urlTemplate = strings.ReplaceAll(urlTemplate, "{email}", u.Email)
+	if strings.Contains(urlTemplate, "{username_hash}") {
+		urlTemplate = strings.ReplaceAll(urlTemplate, "{username_hash}", fmt.Sprintf("%x", md5.Sum([]byte(u.ID))))
+	}
+	if strings.Contains(urlTemplate, "{email_hash}") {
+		urlTemplate = strings.ReplaceAll(urlTemplate, "{email_hash}", fmt.Sprintf("%x", md5.Sum([]byte(u.Email))))
+	}
+	return urlTemplate
+}
+
+// WakaTimeURL returns the user's effective WakaTime URL, i.e. a custom one (which could also point to another Wakapi instance) or fallback if not specified otherwise.
+func (u *User) WakaTimeURL(fallback string) string {
+	if u.WakatimeApiUrl != "" {
+		return strings.TrimSuffix(u.WakatimeApiUrl, "/")
+	}
+	return fallback
+}
+
 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) && ValidateTimezone(r.Location)
+}
+
+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))
+}
+
+func ValidateTimezone(tz string) bool {
+	_, err := time.LoadLocation(tz)
+	return err == nil
+}

models/user_test.go

@@ -0,0 +1,20 @@
+package models
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestUser_TZ(t *testing.T) {
+	sut1, sut2 := &User{Location: ""}, &User{Location: "America/Los_Angeles"}
+	pst, _ := time.LoadLocation("America/Los_Angeles")
+	_, offset1 := time.Now().Zone()
+	_, offset2 := time.Now().In(pst).Zone()
+
+	assert.Equal(t, time.Local, sut1.TZ())
+	assert.Equal(t, pst, sut2.TZ())
+
+	assert.InDelta(t, time.Duration(offset1*int(time.Second)), sut1.TZOffset(), float64(1*time.Second))
+	assert.InDelta(t, time.Duration(offset2*int(time.Second)), sut2.TZOffset(), float64(1*time.Second))
+}

models/view/login.go

@@ -1,8 +1,15 @@
 package view
 
 type LoginViewModel struct {
-	Success string
-	Error   string
+	Success     string
+	Error       string
+	TotalUsers  int
+	AllowSignup bool
+}
+
+type SetPasswordViewModel struct {
+	LoginViewModel
+	Token string
 }
 
 func (s *LoginViewModel) WithSuccess(m string) *LoginViewModel {