ci(docker): Publish Docker Images on Release

.dockerignore

@@ -8,6 +8,3 @@ Dockerfile
 docker-compose.yml
 .dockerignore
 .git*
-node_modules/
-testing/*.zip
-testing/wakapi

.gitattributes

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

.github/ISSUE_TEMPLATE/bug.md

@@ -1,19 +0,0 @@
----
-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

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

.github/workflows/ci.yml

@@ -1,124 +0,0 @@
-name: ci
-on:
-  push:
-  pull_request:
-
-jobs:
-  test:
-    name: 'Unit- & API tests'
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v3
-      with:
-        go-version: ^1.19
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
-    - name: Get dependencies
-      run: go get
-
-    - name: Unit Tests
-      run: CGO_ENABLED=0 go test `go list ./... | grep -v 'github.com/muety/wakapi/scripts'` -run ./...  # skip scripts package, because not actually a package
-
-    - 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
-    env:
-      CGO_ENABLED: 0
-
-    steps:
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v3
-      with:
-        go-version: ^1.19
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
-    - name: Get dependencies
-      run: go get
-
-    - name: Build
-      run: 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@v2
-      with:
-        sarif_file: mapi.sarif
-
-  build:
-    name: 'Build (Win, Linux, Mac)'
-
-    strategy:
-      matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
-
-    runs-on: ${{ matrix.platform }}
-    env:
-      CGO_ENABLED: 0
-
-    steps:
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v3
-      with:
-        go-version: ^1.19
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
-    - name: Get dependencies
-      run: go get
-
-    - name: Build
-      run: go build -v .
-
-  migration:
-    name: Migration tests
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        db: [sqlite, postgres, mysql, mariadb]
-
-    steps:
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v3
-      with:
-        go-version: ^1.19
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
-    - run: ./testing/run_api_tests.sh ${{ matrix.db }} --migration

.github/workflows/docker.yml

@@ -1,64 +1,44 @@
 name: Publish Docker Image
 
 on:
-  release:
+  push:
-    types:
+    tags:
-      - published
+      - '*.*.*'
+      - '!*.*.*-*'
 
 jobs:
   docker-publish:
-    name: 'Build and publish Docker image'
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      # https://stackoverflow.com/questions/58177786
-        uses: actions/checkout@v3
+      - name: Get version
-
+        run: echo "GIT_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-      - name: Set version
+      - name: Print version
-        run: |
+        run: echo "${{ env.GIT_TAG }}"
-          (git describe --tags --exact-match \
-            || git symbolic-ref -q --short HEAD \
-            || git rev-parse --short HEAD) > version.txt 2> /dev/null
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v1
 
-      - name: Login to DockerHub
+      - name: Cache Docker layers
-        uses: docker/login-action@v2
+        uses: actions/cache@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          path: /tmp/.buildx-cache
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
 
-      - name: Log in to the Container registry
+      # - name: Login to DockerHub
-        uses: docker/login-action@v2
+      #   uses: docker/login-action@v1
-        with:
+      #   with:
-          registry: ghcr.io
+      #     username: ${{ secrets.DOCKERHUB_USERNAME }}
-          username: ${{ github.actor }}
+      #     password: ${{ secrets.DOCKERHUB_TOKEN }}
-          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Docker Metadata
+      - name: Build and push to Docker Hub
-        id: meta
+        uses: docker/build-push-action@v2
-        uses: docker/metadata-action@v4
         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@v4
-        with:
-          context: .
-          file: Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          tags: |
-          tags: ${{ steps.meta.outputs.tags }}
+            n1try/wakapi:${{ env.GIT_TAG }}
-          cache-from: type=registry,ref=n1try/wakapi:buildcache-alpine
+            n1try/wakapi:latest
-          cache-to: type=registry,ref=n1try/wakapi:buildcache-alpine,mode=max
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache

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

@@ -0,0 +1,50 @@
+name: Build Wakapi on Linux
+
+on:
+  push:
+    branches:
+  pull_request:
+  release:
+    types:
+      - published
+
+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

@@ -1,77 +0,0 @@
-name: Release
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  release:
-    name: 'Build, package and release to GitHub'
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: ubuntu-18.04
-            GOOS: linux
-            GOARCH: amd64
-          - platform: ubuntu-18.04
-            GOOS: linux
-            GOARCH: arm64
-          - platform: windows-latest
-            GOOS: windows
-            GOARCH: amd64
-          - platform: macos-latest
-            GOOS: darwin
-            GOARCH: amd64
-          - platform: macos-latest
-            GOOS: darwin
-            GOARCH: arm64
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v3
-      with:
-        go-version: ^1.19
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v3
-
-    - name: Set version
-      shell: bash
-      run: |
-        (git describe --tags --exact-match \
-          || git symbolic-ref -q --short HEAD \
-          || git rev-parse --short HEAD) > version.txt 2> /dev/null
-
-    - name: Prepare
-      run: |
-        mkdir -p dist/ && cd dist/
-        cp ../config.default.yml config.yml
-
-    - name: Build
-      working-directory: ./dist
-      shell: bash
-      run: |
-        GOOS=${{ matrix.GOOS }} GOARCH=${{ matrix.GOARCH }} CGO_ENABLED=0 \
-            go build -v -ldflags '-w -s' ../
-
-    - name: Compress working folder (Windows PowerShell)
-      working-directory: ./dist
-      if: "${{ matrix.GOOS == 'windows' }}"
-      run: |
-        Compress-Archive -Path .\wakapi.exe, .\config.yml -DestinationPath wakapi_${{ matrix.GOOS }}_${{ matrix.GOARCH }}.zip
-
-    - name: Compress working folder
-      working-directory: ./dist
-      if: "${{ matrix.GOOS != 'windows' }}"
-      run: |
-        zip -9 wakapi_${{ matrix.GOOS }}_${{ matrix.GOARCH }}.zip *
-
-    - name: Upload built executable to Release
-      uses: softprops/action-gh-release@v1
-      with:
-        files: ./dist/*.zip

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

@@ -0,0 +1,53 @@
+name: Build Wakapi on Windows
+
+on:
+  push:
+    branches:
+  pull_request:
+  release:
+    types:
+      - published
+
+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

@@ -5,10 +5,6 @@ wakapi
 build
 *.exe
 *.db
-*.zip
 config*.yml
 !config.default.yml
-!testing/config.*.yml
 pkged.go
-package-lock.json
-node_modules

.gitpod.yml

@@ -1,6 +0,0 @@
-# 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,23 +1,19 @@
-FROM golang:1.19-alpine AS build-env
+# Build Stage
+
+FROM golang:1.15 AS build-env
 WORKDIR /src
 
-RUN wget "https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh" -O wait-for-it.sh && \
+ADD ./go.mod .
-    chmod +x wait-for-it.sh
+RUN go mod download && go get github.com/markbates/pkger/cmd/pkger
 
-ADD ./go.mod ./go.sum ./
-RUN go mod download
 ADD . .
+RUN go generate && go build -o wakapi
 
-RUN CGO_ENABLED=0 go build -ldflags "-s -w" -v -o wakapi main.go
+WORKDIR /app
-
+RUN cp /src/wakapi . && \
-WORKDIR /staging
+    cp /src/config.default.yml config.yml && \
-RUN mkdir ./data ./app && \
+    sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' config.yml && \
-    cp /src/wakapi app/ && \
+    cp /src/wait-for-it.sh .
-    cp /src/config.default.yml app/config.yml && \
-    sed -i 's/listen_ipv6: ::1/listen_ipv6: /g' app/config.yml && \
-    cp /src/wait-for-it.sh app/ && \
-    cp /src/entrypoint.sh app/ && \
-    chown 1000:1000 ./data
 
 # Run Stage
 
@@ -25,28 +21,24 @@ RUN mkdir ./data ./app && \
 # to override config values using `-e` syntax.
 # Available options can be found in [README.md#-configuration](README.md#-configuration)
 
-FROM alpine:3
+FROM debian
 WORKDIR /app
 
-RUN addgroup -g 1000 app && \
+RUN apt update && \
-    adduser -u 1000 -G app -s /bin/sh -D app && \
+    apt install -y ca-certificates
-    apk add --no-cache bash ca-certificates tzdata
 
-# See README.md and config.default.yml for all config options
+ENV ENVIRONMENT prod
-ENV ENVIRONMENT=prod \
+ENV WAKAPI_DB_TYPE sqlite3
-    WAKAPI_DB_TYPE=sqlite3 \
+ENV WAKAPI_DB_USER ''
-    WAKAPI_DB_USER='' \
+ENV WAKAPI_DB_PASSWORD ''
-    WAKAPI_DB_PASSWORD='' \
+ENV WAKAPI_DB_HOST ''
-    WAKAPI_DB_HOST='' \
+ENV WAKAPI_DB_NAME=/data/wakapi.db
-    WAKAPI_DB_NAME=/data/wakapi.db \
+ENV WAKAPI_PASSWORD_SALT ''
-    WAKAPI_PASSWORD_SALT='' \
+ENV WAKAPI_LISTEN_IPV4 '0.0.0.0'
-    WAKAPI_LISTEN_IPV4='0.0.0.0' \
+ENV WAKAPI_INSECURE_COOKIES 'true'
-    WAKAPI_INSECURE_COOKIES='true' \
-    WAKAPI_ALLOW_SIGNUP='true'
 
-COPY --from=build-env /staging /
+COPY --from=build-env /app .
-USER app
 
-EXPOSE 3000
+VOLUME /data
 
-ENTRYPOINT /app/entrypoint.sh
+ENTRYPOINT ./wait-for-it.sh

LICENSE

@@ -1,21 +1,674 @@
-The MIT License (MIT)
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2016 
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+                            Preamble
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+  The GNU General Public License is a free, copyleft license for
-copies or substantial portions of the Software.
+software and other kinds of works.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  The licenses for most software and other practical works are designed
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+to take away your freedom to share and change the works.  By contrast,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+the GNU General Public License is intended to guarantee your freedom to
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+share and change all versions of a program--to make sure it remains free
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+software for all its users.  We, the Free Software Foundation, use the
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+GNU General Public License for most of our software; it applies also to
-SOFTWARE.
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    Awesome and simple movie downloader, for NZB and Torrents.
+    Copyright (C) 2011 - Ruud Burger
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    CouchPotato -  Copyright (C) 2011 - Ruud Burger
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,13 +1,16 @@
-<p align="center">
+<h1 align="center">📊 Wakapi</h1>
-  <img src="static/assets/images/logo-gh.svg" width="350">
-</p>
 
 <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://wakapi.dev/api/badge/n1try/interval:any/project:wakapi?label=wakapi">
+  <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="https://badges.fw-web.space/github/languages/code-size/muety/wakapi">
+</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/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://sonarcloud.io/dashboard?id=muety_wakapi"><img src="https://sonarcloud.io/api/project_badges/measure?project=muety_wakapi&metric=ncloc"></a>
 </p>
 
@@ -19,7 +22,7 @@
     <span> | </span>
     <a href="#-features">Features</a>
     <span> | </span>
-    <a href="#%EF%B8%8F-how-to-use">How to use</a>
+    <a href="#-how-to-use">How to use</a>
     <span> | </span>
     <a href="https://github.com/muety/wakapi/issues">Issues</a>
     <span> | </span>
@@ -28,386 +31,196 @@
 </div>
 
 <p align="center">
-  <img src="static/assets/images/screenshot.webp" width="500px">
+  <img src="https://anchr.io/i/bxQ69.png" width="500px">
 </p>
 
-Installation instructions can be found below and in the [Wiki](https://github.com/muety/wakapi/wiki).
+## 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!
 
 ## 🚀 Features
-
+* ✅ 100 % free and open-source
-* ✅ 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 integration
+* ✅ WakaTime relay to use both
-* ✅ Support for Prometheus exports
+* ✅ Support for [Prometheus](https://github.com/muety/wakapi#%EF%B8%8F-prometheus-export) 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).
 
-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).
+However, we do not guarantee data persistence, so you might potentially lose your data if the service is taken down some day ❕
-
-### 📦 Option 2: Quick-run a release
-
-```bash
-$ curl -L https://wakapi.dev/get | bash
-```
-
-**Alternatively** using [eget](https://github.com/zyedidia/eget):
-```bash
-$ eget muety/wakapi
-```
-
-### 🐳 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=$SALT" \
+  -e "WAKAPI_PASSWORD_SALT=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w ${1:-32} | head -n 1)" \
   -v wakapi-data:/data \
-  --name wakapi \
+  --name wakapi n1try/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.
 
-If you want to run Wakapi on **Kubernetes**, there is [wakapi-helm-chart](https://github.com/andreymaznyak/wakapi-helm-chart) for quick and easy deployment.
+### 📦 Option 3: Run a release
-
-### 🧑‍💻 Option 4: Compile and run from source
-
 ```bash
-# Build and install
+# Download the release and unpack it
-# Alternatively: go build -o wakapi
+$ wget https://github.com/muety/wakapi/releases/download/1.20.2/wakapi_linux_amd64.zip
-$ go install github.com/muety/wakapi@latest
+$ unzip wakapi_linux_amd64.zip
 
-# Get default config and customize
+# Optionally adapt config to your needs
-$ curl -o wakapi.yml https://raw.githubusercontent.com/muety/wakapi/master/config.default.yml
+$ vi config.yml
-$ vi wakapi.yml
 
 # Run it
-$ ./wakapi -config wakapi.yml
+$ ./wakapi
 ```
 
-**Note:** Check the comments in `config.yml` for best practices regarding security configuration and more.
+### 🧑‍💻 Option 4: Run from source
+#### Prerequisites
+* Go >= 1.13 (with `$GOPATH` properly set)
+* gcc (to compile [go-sqlite3](https://github.com/mattn/go-sqlite3))
+    * Fedora / RHEL: `dnf install @development-tools`
+    * Ubuntu / Debian: `apt install build-essential`
+    * Windows: See [here](https://github.com/mattn/go-sqlite3/issues/214#issuecomment-253216476)
 
-💡 When running Wakapi standalone (without Docker), it is recommended to run it as a [SystemD service](etc/wakapi.service).
+#### Compile & Run
+```bash
+# Adapt config to your needs
+$ cp config.default.yml config.yml
+$ vi config.yml
 
-### 💻 Client setup
+# Install packaging tool
+$ export GO111MODULE=on
+$ go get github.com/markbates/pkger/cmd/pkger
 
-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.
+# Build the executable
+$ go generate
+$ go build -o wakapi
+
+# Run it
+$ ./wakapi
+```
+
+**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`.
+
+### 💻 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.
 
 1. **Set up WakaTime** for your specific IDE or editor. Please refer to the respective [plugin guide](https://wakatime.com/plugins)
-2. **Edit your local `~/.wakatime.cfg`** file as follows.
+2. **Editing your local `~/.wakatime.cfg`** file as follows
 
 ```ini
 [settings]
 
-# Your Wakapi server URL or 'https://wakapi.dev/api' when using the cloud server
+# Your Wakapi server URL or 'https://wakapi.dev/api/heartbeat' when using the cloud server
-api_url = http://localhost:3000/api
+api_url = http://localhost:3000/api/heartbeat
 
 # 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](https://github.com/muety/wakapi/wiki/Advanced-Setup:-Client-side-proxy) in addition.
+Optionally, you can set up a [client-side proxy](docs/advanced_setup.md) in addition.
 
-## 🔧 Configuration options
+## 🔧 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.
 
-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                  | Environment Variable      | Default      | Description                                                         |
-
+|---------------------------|---------------------------|--------------|---------------------------------------------------------------------|
-| YAML key / Env. variable                                                     | Default                                          | Description                                                                                                                                                              |
+| `env`                       | `ENVIRONMENT`               | `dev`          | Whether to use development- or production settings                  |
-|------------------------------------------------------------------------------|--------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `app.custom_languages`      | -                           | -              | Map from file endings to language names                             |
-| `env` /<br>`ENVIRONMENT`                                                     | `dev`                                            | Whether to use development- or production settings                                                                                                                       |
+| `server.port`               | `WAKAPI_PORT`               | `3000`         | Port to listen on                                                   |
-| `app.aggregation_time` /<br>`WAKAPI_AGGREGATION_TIME`                        | `0 15 2 * * *`                                   | Time of day at which to periodically run summary generation for all users                                                                                                |
+| `server.listen_ipv4`        | `WAKAPI_LISTEN_IPV4`        | `127.0.0.1`    | IPv4 network address to listen on (leave blank to disable IPv4)     |
-| `app.report_time_weekly` /<br>`WAKAPI_REPORT_TIME_WEEKLY`                    | `0 0 18 * * 5`                                   | Week day and time at which to send e-mail reports                                                                                                                        |
+| `server.listen_ipv6`        | `WAKAPI_LISTEN_IPV6`        | `::1`          | IPv6 network address to listen on (leave blank to disable IPv6)     |
-| `app.leaderboard_generation_time` /<br>`WAKAPI_LEADERBOARD_GENERATION_TIME`  | `0 0 6 * * *,0 0 18 * * *`                       | One or multiple times of day at which to re-calculate the leaderboard                                                                                                    |
+| `server.tls_cert_path`      | `WAKAPI_TLS_CERT_PATH`      | -              | Path of SSL server certificate (leave blank to not use HTTPS)       |
-| `app.data_cleanup_time` /<br>`WAKAPI_DATA_CLEANUP_TIME`                      | `0 0 6 * * 0`                                    | When to perform data cleanup operations (see `app.data_retention_months`)                                                                                                |
+| `server.tls_key_path`       | `WAKAPI_TLS_KEY_PATH`       | -              | Path of SSL server private key (leave blank to not use HTTPS)       |
-| `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                                                                          |
+| `server.base_path`          | `WAKAPI_BASE_PATH`          | `/`            | Web base path (change when running behind a proxy under a sub-path) |
-| `app.inactive_days` /<br>`WAKAPI_INACTIVE_DAYS`                              | `7`                                              | Number of days after which to consider a user inactive (only for metrics)                                                                                                |
+| `security.password_salt`    | `WAKAPI_PASSWORD_SALT`      | -              | Pepper to use for password hashing                                  |
-| `app.heartbeat_max_age /`<br>`WAKAPI_HEARTBEAT_MAX_AGE`                      | `4320h`                                          | Maximum acceptable age of a heartbeat (see [`ParseDuration`](https://pkg.go.dev/time#ParseDuration))                                                                     |
+| `security.insecure_cookies` | `WAKAPI_INSECURE_COOKIES`   | `false`        | Whether or not to allow cookies over HTTP                           |
-| `app.custom_languages`                                                       | -                                                | Map from file endings to language names                                                                                                                                  |
+| `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 |
-| `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))                                            |
+| `db.host`                   | `WAKAPI_DB_HOST`            | -              | Database host                                                       |
-| `app.support_contact` /<br>`WAKAPI_SUPPORT_CONTACT`                          | `hostmaster@wakapi.dev`                          | E-Mail address to display as a support contact on the page                                                                                                               |
+| `db.port`                   | `WAKAPI_DB_PORT`            | -              | Database port                                                       |
-| `app.data_retention_months` /<br>`WAKAPI_DATA_RETENTION_MONTHS`              | `-1`                                             | Maximum retention period in months for user data (heartbeats) (-1 for unlimited)                                                                                         |
+| `db.user`                   | `WAKAPI_DB_USER`            | -              | Database user                                                       |
-| `server.port` /<br> `WAKAPI_PORT`                                            | `3000`                                           | Port to listen on                                                                                                                                                        |
+| `db.password`               | `WAKAPI_DB_PASSWORD`        | -              | Database password                                                   |
-| `server.listen_ipv4` /<br> `WAKAPI_LISTEN_IPV4`                              | `127.0.0.1`                                      | IPv4 network address to listen on (leave blank to disable IPv4)                                                                                                          |
+| `db.name`                   | `WAKAPI_DB_NAME`            | `wakapi_db.db` | Database name                                                       |
-| `server.listen_ipv6` /<br> `WAKAPI_LISTEN_IPV6`                              | `::1`                                            | IPv6 network address to listen on (leave blank to disable IPv6)                                                                                                          |
+| `db.dialect`                | `WAKAPI_DB_TYPE`            | `sqlite3`      | Database type (one of `sqlite3`, `mysql`, `postgres`, `cockroach`)                     |
-| `server.listen_socket` /<br> `WAKAPI_LISTEN_SOCKET`                          | -                                                | UNIX socket to listen on (leave blank to disable UNIX socket)                                                                                                            |
+| `db.max_conn`               | `WAKAPI_DB_MAX_CONNECTIONS` | `2`            | Maximum number of database connections                              |
-| `server.listen_socket_mode` /<br> `WAKAPI_LISTEN_SOCKET_MODE`                | `0666`                                           | Permission mode to create UNIX socket with                                                                                                                               |
+| `db.ssl`                    | `WAKAPI_DB_SSL`             | `false`        | Whether to use TLS encryption for database connection (Postgres and CockroachDB only) |
-| `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.disable_frontpage` /<br> `WAKAPI_DISABLE_FRONTPAGE`                | `false`                                          | Whether to disable landing page (useful for personal instances)                                                                                                          |
-| `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.socket` /<br> `WAKAPI_DB_SOCKET`                                         | -                                                | Database UNIX socket (alternative to `host`) (for MySQL only)                                                                                                            |
-| `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_)
 
-## 🔧 API endpoints
+### Client-side proxy (`optional`)
+See the [advanced setup instructions](docs/advanced_setup.md).
 
-See our [Swagger API Documentation](https://wakapi.dev/swagger-ui).
+## 🔧 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)).
 
-### Generating Swagger docs
+* `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`
 
+## ⤴️ 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
-$ go install github.com/swaggo/swag/cmd/swag@latest
+CGO_FLAGS="-g -O2 -Wno-return-local-addr" go test -json -coverprofile=coverage/coverage.out ./... -run ./...
-$ swag init -o static/docs
 ```
 
-## 🤝 Integrations
+## 🙏 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!
-### 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. To use this, don't forget to **enable public data** under [Settings -> Permissions](https://wakapi.dev/settings#permissions).
-
-![](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&range=last_7_days)
-
-<details>
-<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. To use this, don't forget to **enable public data** under [Settings -> Permissions](https://wakapi.dev/settings#permissions).
-
-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>
-
-## 📦 Data Export
-You can export your coding activity from Wakapi to CSV in the form of raw heartbeats. While there is no way to accomplish this directly through the web UI, we provide an easy-to-use Python [script](scripts/download_heartbeats.py) instead.
-
-```bash
-$ pip install requests tqdm
-$ python scripts/download_heartbeats.py --api_key API_KEY [--url URL] [--from FROM] [--to TO] [--output OUTPUT]
-```
-
-<details>
-
-<summary>Example</summary>
-
-```bash
-python scripts/download_heartbeats.py --api_key 04648d14-15c9-432b-b901-dbeec70d4eaf \
-  --url https://wakapi.dev/api \
-  --from 2023-01-01 \
-  --to 2023-01-31 \
-  --output wakapi_export.csv
-```
-
-</details>
-
-## 👍 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_ENABLED=0 go test `go list ./... | grep -v 'github.com/muety/wakapi/scripts'` -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) apply to Wakapi for large parts as well. You might find answers there.
-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>
+<summary><b>What data is sent to Wakapi?</b></summary>
 
 <ul>
   <li>File names</li>
   <li>Project names</li>
   <li>Editor names</li>
-  <li>Your computer's host name</li>
+  <li>You computer's host name</li>
   <li>Timestamps for every action you take in your editor</li>
   <li>...</li>
 </ul>
@@ -420,13 +233,13 @@ If you host Wakapi yourself, you have control over all your data. However, if yo
 <details>
 <summary><b>What happens if I'm offline?</b></summary>
 
-All data are cached locally on your machine and sent in batches once you're online again.
+All data is 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>
@@ -439,27 +252,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>Additional Integrations (with GitLab, etc.)</li>
+  <li>Integrations (with GitLab, etc.)</li>
   <li>Richer API</li>
 </ul>
 
-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.
+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.
 </details>
 
 <details>
 <summary><b>How are durations calculated?</b></summary>
 
-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.
+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.
 
 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 staring at the screen trying to 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 starring at the screen find a solution, but not actually typing code.
 
 <ul>
   <li><b>WakaTime</b> (with 5 min timeout): 3 min 20 sec
@@ -470,18 +283,8 @@ 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>
 
-## 👏 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 **[Frachtwerk](https://frachtwerk.de)** for sponsoring server infrastructure for Wakapi.dev.
-
-![](.github/assets/frachtwerk_logo.png)
 
 ## 📓 License
-
+GPL-v3 @ [Ferdinand Mütsch](https://muetsch.io)
-MIT @ [Ferdinand Mütsch](https://muetsch.io)

config.default.yml

@@ -1,94 +1,31 @@
-env: production
+env: development
-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
 
 server:
   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
-  listen_socket_mode: 0666            # permission mode to create unix socket with
-  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: '0 15 2 * * *'                          # time at which to run daily aggregation batch jobs
+  aggregation_time: '02:15' # time at which to run daily aggregation batch jobs
-  leaderboard_generation_time: '0 0 6 * * *,0 0 18 * * *'   # times at which to re-calculate the leaderboard
+  counting_time: '05:15'    # time at which to run daily job to count total hours tracked in the system
-  report_time_weekly: '0 0 18 * * 5'                        # time at which to fan out weekly reports (extended cron)
-  data_cleanup_time: '0 0 6 * * 0'                          # time at which to run old data cleanup (if enabled through data_retention_months)
-  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)
-  data_retention_months: -1                                 # maximum retention period on months for user data (heartbeats) (-1 for infinity)
   custom_languages:
     vue: Vue
     jsx: JSX
-    tsx: TSX
-    cjs: JavaScript
-    ipynb: Python
-    svelte: Svelte
-    astro: Astro
-
-  # 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
-  socket:                             # alternative to db.host (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)
-  automigrate_fail_silently: false    # whether to ignore schema auto-migration failures when starting up
 
 security:
-  password_salt:                      # change this
+  password_salt:            # CHANGE !
-  insecure_cookies: true              # should be set to 'false', except when not running with HTTPS (e.g. on localhost)
+  insecure_cookies: false
   cookie_max_age: 172800
-  allow_signup: true
-  disable_frontpage: false
-  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
-
-# only relevant for running wakapi as a hosted service with paid subscriptions and stripe payments
-subscriptions:
-  enabled: false
-  expiry_notifications: true
-  stripe_api_key:
-  stripe_secret_key:
-  stripe_endpoint_secret:
-  standard_price_id:
-
-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:

config/config.go

@@ -2,25 +2,26 @@ package config
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
-	"net/http"
-	"os"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
 	"github.com/emvi/logbuch"
 	"github.com/gorilla/securecookie"
 	"github.com/jinzhu/configor"
-	"github.com/muety/wakapi/data"
+	"github.com/markbates/pkger"
-	"github.com/muety/wakapi/utils"
+	"github.com/muety/wakapi/models"
-	"github.com/robfig/cron/v3"
+	migrate "github.com/rubenv/sql-migrate"
-	uuid "github.com/satori/go.uuid"
+	"gorm.io/driver/mysql"
+	"gorm.io/driver/postgres"
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	"io/ioutil"
+	"net/http"
+	"os"
+	"strings"
 )
 
 const (
-	DefaultConfigPath = "config.yml"
+	defaultConfigPath = "config.yml"
 
 	SQLDialectMysql    = "mysql"
 	SQLDialectPostgres = "postgres"
@@ -28,164 +29,68 @@ const (
 
 	KeyLatestTotalTime  = "latest_total_time"
 	KeyLatestTotalUsers = "latest_total_users"
-	KeyLastImportImport             = "last_import"
-	KeyFirstHeartbeat               = "first_heartbeat"
-	KeySubscriptionNotificationSent = "sub_reminder"
-	KeyNewsbox                      = "newsbox"
-
-	SessionKeyDefault = "default"
-
-	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"
-	WakatimeApiUserUrl           = "/users/current"
+	WakatimeApiHeartbeatsEndpoint = "/users/current/heartbeats.bulk"
-	WakatimeApiAllTimeUrl        = "/users/current/all_time_since_today"
+	WakatimeApiUserEndpoint       = "/users/current"
-	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 env string
+var cFlag = flag.String("config", defaultConfigPath, "config file location")
 
 type appConfig struct {
-	AggregationTime           string                       `yaml:"aggregation_time" default:"0 15 2 * * *" env:"WAKAPI_AGGREGATION_TIME"`
+	AggregationTime string                       `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
-	LeaderboardGenerationTime string                       `yaml:"leaderboard_generation_time" default:"0 0 6 * * *,0 0 18 * * *" env:"WAKAPI_LEADERBOARD_GENERATION_TIME"`
+	CountingTime    string                       `yaml:"counting_time" default:"05:15" env:"WAKAPI_COUNTING_TIME"`
-	ReportTimeWeekly          string                       `yaml:"report_time_weekly" default:"0 0 18 * * 5" env:"WAKAPI_REPORT_TIME_WEEKLY"`
-	DataCleanupTime           string                       `yaml:"data_cleanup_time" default:"0 0 6 * * 0" env:"WAKAPI_DATA_CLEANUP_TIME"`
-	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"`
-	DataRetentionMonths       int                          `yaml:"data_retention_months" default:"-1" env:"WAKAPI_DATA_RETENTION_MONTHS"`
-	DataCleanupDryRun         bool                         `yaml:"data_cleanup_dry_run" default:"false" env:"WAKAPI_DATA_CLEANUP_DRY_RUN"` // for debugging only
-	AvatarURLTemplate         string                       `yaml:"avatar_url_template" default:"api/avatar/{username_hash}.svg" env:"WAKAPI_AVATAR_URL_TEMPLATE"`
-	SupportContact            string                       `yaml:"support_contact" default:"hostmaster@wakapi.dev" env:"WAKAPI_SUPPORT_CONTACT"`
 	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
-	DisableFrontpage bool `yaml:"disable_frontpage" default:"false" env:"WAKAPI_DISABLE_FRONTPAGE"`
 	// 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"`
 	CookieMaxAgeSec int                        `yaml:"cookie_max_age" default:"172800" env:"WAKAPI_COOKIE_MAX_AGE"`
 	SecureCookie    *securecookie.SecureCookie `yaml:"-"`
-	SessionKey      []byte                     `yaml:"-"`
 }
 
 type dbConfig struct {
 	Host     string `env:"WAKAPI_DB_HOST"`
-	Socket                  string `env:"WAKAPI_DB_SOCKET"`
 	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"`
-	DSN                     string `yaml:"DSN" default:"" env:"WAKAPI_DB_DSN"`
 	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"`
-	ListenSocket     string `yaml:"listen_socket" default:"" env:"WAKAPI_LISTEN_SOCKET"`
-	ListenSocketMode uint32 `yaml:"listen_socket_mode" default:"0666" env:"WAKAPI_LISTEN_SOCKET_MODE"`
-	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 subscriptionsConfig struct {
-	Enabled              bool   `yaml:"enabled" default:"false" env:"WAKAPI_SUBSCRIPTIONS_ENABLED"`
-	ExpiryNotifications  bool   `yaml:"expiry_notifications" default:"true" env:"WAKAPI_SUBSCRIPTIONS_EXPIRY_NOTIFICATIONS"`
-	StripeApiKey         string `yaml:"stripe_api_key" env:"WAKAPI_SUBSCRIPTIONS_STRIPE_API_KEY"`
-	StripeSecretKey      string `yaml:"stripe_secret_key" env:"WAKAPI_SUBSCRIPTIONS_STRIPE_SECRET_KEY"`
-	StripeEndpointSecret string `yaml:"stripe_endpoint_secret" env:"WAKAPI_SUBSCRIPTIONS_STRIPE_ENDPOINT_SECRET"`
-	StandardPriceId      string `yaml:"standard_price_id" env:"WAKAPI_SUBSCRIPTIONS_STANDARD_PRICE_ID"`
-	StandardPrice        string `yaml:"-"`
-}
-
-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:"-"`
-	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
-	Subscriptions  subscriptionsConfig
-	Sentry         sentryConfig
-	Mail           mailConfig
 }
 
-func (c *Config) CreateCookie(name, value string) *http.Cookie {
+func (c *Config) CreateCookie(name, value, path string) *http.Cookie {
-	return c.createCookie(name, value, c.Server.BasePath, c.Security.CookieMaxAgeSec)
+	return c.createCookie(name, value, path, c.Security.CookieMaxAgeSec)
 }
 
-func (c *Config) GetClearCookie(name string) *http.Cookie {
+func (c *Config) GetClearCookie(name, path string) *http.Cookie {
-	return c.createCookie(name, "", c.Server.BasePath, -1)
+	return c.createCookie(name, "", path, -1)
 }
 
 func (c *Config) createCookie(name, value, path string, maxAge int) *http.Cookie {
@@ -196,7 +101,7 @@ func (c *Config) createCookie(name, value, path string, maxAge int) *http.Cookie
 		MaxAge:   maxAge,
 		Secure:   !c.Security.InsecureCookies,
 		HttpOnly: true,
-		SameSite: http.SameSiteLaxMode,
+		SameSite: http.SameSiteStrictMode,
 	}
 }
 
@@ -208,161 +113,163 @@ func (c *Config) UseTLS() bool {
 	return c.Server.TlsCertPath != "" && c.Server.TlsKeyPath != ""
 }
 
+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{})
+			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 utils.CloneStringMap(c.CustomLanguages, false)
+	return cloneStringMap(c.CustomLanguages, false)
 }
 
 func (c *appConfig) GetLanguageColors() map[string]string {
-	return utils.CloneStringMap(c.Colors["languages"], true)
+	return cloneStringMap(c.Colors["languages"], true)
 }
 
 func (c *appConfig) GetEditorColors() map[string]string {
-	return utils.CloneStringMap(c.Colors["editors"], true)
+	return cloneStringMap(c.Colors["editors"], true)
 }
 
 func (c *appConfig) GetOSColors() map[string]string {
-	return utils.CloneStringMap(c.Colors["operating_systems"], true)
+	return cloneStringMap(c.Colors["operating_systems"], true)
-}
-
-func (c *appConfig) GetAggregationTimeCron() string {
-	if strings.Contains(c.AggregationTime, ":") {
-		// old gocron format, e.g. "15:04"
-		timeParts := strings.Split(c.AggregationTime, ":")
-		h, err := strconv.Atoi(timeParts[0])
-		if err != nil {
-			logbuch.Fatal(err.Error())
-		}
-
-		m, err := strconv.Atoi(timeParts[1])
-		if err != nil {
-			logbuch.Fatal(err.Error())
-		}
-
-		return fmt.Sprintf("0 %d %d * * *", m, h)
-	}
-
-	return utils.CronPadToSecondly(c.AggregationTime)
-}
-
-func (c *appConfig) GetWeeklyReportCron() string {
-	if strings.Contains(c.ReportTimeWeekly, ",") {
-		// old gocron format, e.g. "fri,18:00"
-		split := strings.Split(c.ReportTimeWeekly, ",")
-		weekday := utils.ParseWeekday(split[0])
-		timeParts := strings.Split(split[1], ":")
-
-		h, err := strconv.Atoi(timeParts[0])
-		if err != nil {
-			logbuch.Fatal(err.Error())
-		}
-
-		m, err := strconv.Atoi(timeParts[1])
-		if err != nil {
-			logbuch.Fatal(err.Error())
-		}
-
-		return fmt.Sprintf("0 %d %d * * %d", m, h, weekday)
-	}
-
-	return utils.CronPadToSecondly(c.ReportTimeWeekly)
-}
-
-func (c *appConfig) GetLeaderboardGenerationTimeCron() []string {
-	crons := []string{}
-
-	var parse func(string) string
-
-	if strings.Contains(c.LeaderboardGenerationTime, ":") {
-		// old gocron format, e.g. "15:04"
-		parse = func(s string) string {
-			timeParts := strings.Split(s, ":")
-			h, err := strconv.Atoi(timeParts[0])
-			if err != nil {
-				logbuch.Fatal(err.Error())
-			}
-
-			m, err := strconv.Atoi(timeParts[1])
-			if err != nil {
-				logbuch.Fatal(err.Error())
-			}
-
-			return fmt.Sprintf("0 %d %d * * *", m, h)
-		}
-	} else {
-		parse = func(s string) string {
-			return utils.CronPadToSecondly(s)
-		}
-	}
-
-	for _, s := range utils.SplitMulti(c.LeaderboardGenerationTime, ",", ";") {
-		crons = append(crons, parse(strings.TrimSpace(s)))
-	}
-
-	return crons
-}
-
-func (c *appConfig) HeartbeatsMaxAge() time.Duration {
-	d, _ := time.ParseDuration(c.HeartbeatMaxAge)
-	return d
-}
-
-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 readVersion() string {
+	file, err := pkger.Open("/version.txt")
+	if err != nil {
+		logbuch.Fatal(err.Error())
+	}
+	defer file.Close()
+
+	bytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		logbuch.Fatal(err.Error())
+	}
+
+	return strings.TrimSpace(string(bytes))
+}
+
 func readColors() map[string]map[string]string {
 	// Read language colors
 	// Source:
-	// - https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
+	// – https://raw.githubusercontent.com/ozh/github-colors/master/colors.json
-	// - https://wakatime.com/colors/operating_systems
+	// – 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"]/@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"]/div[1]/text()').map(e => e.nodeValue)
+	var colors = make(map[string]map[string]string)
 
-	raw := data.ColorsFile
+	file, err := pkger.Open("/data/colors.json")
-	if IsDev(env) {
+	if err != nil {
-		raw, _ = os.ReadFile("data/colors.json")
+		logbuch.Fatal(err.Error())
+	}
+	defer file.Close()
+	bytes, err := ioutil.ReadAll(file)
+	if err != nil {
+		logbuch.Fatal(err.Error())
 	}
 
-	var colors = make(map[string]map[string]string)
+	if err := json.Unmarshal(bytes, &colors); err != nil {
-	if err := json.Unmarshal(raw, &colors); err != nil {
 		logbuch.Fatal(err.Error())
 	}
 
 	return colors
 }
 
+func mustReadConfigLocation() string {
+	if _, err := os.Stat(*cFlag); err != nil {
+		logbuch.Fatal("failed to find config file at '%s'", *cFlag)
+	}
+	return *cFlag
+}
+
 func resolveDbDialect(dbType string) string {
 	if dbType == "cockroach" {
 		return "postgres"
 	}
-	if dbType == "sqlite" {
-		return "sqlite3"
-	}
-	if dbType == "mariadb" {
-		return "mysql"
-	}
 	return dbType
 }
 
@@ -374,103 +281,40 @@ func Get() *Config {
 	return cfg
 }
 
-func Load(configFlag string, version string) *Config {
+func Load() *Config {
 	config := &Config{}
 
-	if err := configor.New(&configor.Config{}).Load(config, configFlag); err != nil {
+	flag.Parse()
+
+	if err := configor.New(&configor.Config{}).Load(config, mustReadConfigLocation()); err != nil {
 		logbuch.Fatal("failed to read config: %v", err)
 	}
 
-	env = config.Env
+	config.Version = readVersion()
-
-	config.Version = strings.TrimSpace(version)
-	tagVersionMatch, _ := regexp.MatchString(`\d+\.\d+\.\d+`, version)
-	if tagVersionMatch {
-		config.Version = "v" + config.Version
-	}
-
-	config.InstanceId = uuid.NewV4().String()
 	config.App.Colors = readColors()
 	config.Db.Dialect = resolveDbDialect(config.Db.Type)
+	config.Security.SecureCookie = securecookie.New(
+		securecookie.GenerateRandomKey(64),
+		securecookie.GenerateRandomKey(32),
+	)
 
-	hashKey := securecookie.GenerateRandomKey(64)
+	if strings.HasSuffix(config.Server.BasePath, "/") {
-	blockKey := securecookie.GenerateRandomKey(32)
+		config.Server.BasePath = config.Server.BasePath[:len(config.Server.BasePath)-1]
-	sessionKey := securecookie.GenerateRandomKey(32)
-
-	if IsDev(env) {
-		logbuch.Warn("using temporary keys to sign and encrypt cookies in dev mode, make sure to set env to production for real-world use")
-		hashKey, blockKey = getTemporarySecureKeys()
-		blockKey = hashKey
 	}
 
-	config.Security.SecureCookie = securecookie.New(hashKey, blockKey)
-	config.Security.SessionKey = sessionKey
-
-	config.Server.BasePath = strings.TrimSuffix(config.Server.BasePath, "/")
-
 	for k, v := range config.App.CustomLanguages {
 		if v == "" {
 			config.App.CustomLanguages[k] = "unknown"
 		}
 	}
 
-	if config.Sentry.Dsn != "" {
+	if config.Server.ListenIpV4 == "" && config.Server.ListenIpV6 == "" {
-		logbuch.Info("enabling sentry integration")
+		logbuch.Fatal("either of listen_ipv4 or listen_ipv6 must be set")
-		initSentry(config.Sentry, config.IsDev())
 	}
 
-	if config.App.DataRetentionMonths <= 0 {
-		logbuch.Info("disabling data retention policy, keeping data forever")
-	} else {
-		dataRetentionWarning := fmt.Sprintf("⚠️ data retention policy will cause user data older than %d months to be deleted", config.App.DataRetentionMonths)
-		if config.Subscriptions.Enabled {
-			dataRetentionWarning += " (except for users with active subscriptions)"
-		}
-		logbuch.Warn(dataRetentionWarning)
-	}
-
-	// 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 != "" && utils.FindString(config.Mail.Provider, emailProviders, "") == "" {
-		logbuch.Fatal("unknown mail provider '%s'", config.Mail.Provider)
-	}
-	if _, err := time.ParseDuration(config.App.HeartbeatMaxAge); err != nil {
-		logbuch.Fatal("invalid duration set for heartbeat_max_age")
-	}
-
-	cronParser := cron.NewParser(cron.Second | cron.Minute | cron.Hour | cron.Dom | cron.Month | cron.Dow | cron.Descriptor)
-
-	if _, err := cronParser.Parse(config.App.GetWeeklyReportCron()); err != nil {
-		logbuch.Fatal("invalid cron expression for report_time_weekly")
-	}
-	if _, err := cronParser.Parse(config.App.GetAggregationTimeCron()); err != nil {
-		logbuch.Fatal("invalid cron expression for aggregation_time")
-	}
-	for _, c := range config.App.GetLeaderboardGenerationTimeCron() {
-		if _, err := cronParser.Parse(c); err != nil {
-			logbuch.Fatal("invalid cron expression for leaderboard_generation_time")
-		}
-	}
-
-	// deprecation notices
-	if strings.Contains(config.App.AggregationTime, ":") {
-		logbuch.Warn("you're using deprecated syntax for 'aggregation_time', please change it to a valid cron expression")
-	}
-	if strings.Contains(config.App.ReportTimeWeekly, ":") {
-		logbuch.Warn("you're using deprecated syntax for 'report_time_weekly', please change it to a valid cron expression")
-	}
-	if strings.Contains(config.App.LeaderboardGenerationTime, ":") {
-		logbuch.Warn("you're using deprecated syntax for 'leaderboard_generation_time', please change it to a semicolon-separated list if valid cron expressions")
-	}
 
 	Set(config)
 	return Get()

config/config_test.go

@@ -2,9 +2,8 @@ package config
 
 import (
 	"fmt"
-	"testing"
-
 	"github.com/stretchr/testify/assert"
+	"testing"
 )
 
 func TestConfig_IsDev(t *testing.T) {
@@ -23,12 +22,11 @@ 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=utf8mb4&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
+		"%s:%s@tcp(%s:%d)/%s?charset=utf8&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
 		c.User,
 		c.Password,
 		c.Host,
@@ -38,28 +36,6 @@ func Test_mysqlConnectionString(t *testing.T) {
 	), mysqlConnectionString(c))
 }
 
-func Test_mysqlConnectionStringSocket(t *testing.T) {
-	c := &dbConfig{
-		Socket:   "/var/run/mysql.sock",
-		Port:     9999,
-		User:     "test_user",
-		Password: "test_password",
-		Name:     "test_name",
-		Dialect:  "mysql",
-		Charset:  "utf8mb4",
-		MaxConn:  10,
-	}
-
-	assert.Equal(t, fmt.Sprintf(
-		"%s:%s@unix(%s)/%s?charset=utf8mb4&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
-		c.User,
-		c.Password,
-		c.Socket,
-		c.Name,
-		"Local",
-	), mysqlConnectionString(c))
-}
-
 func Test_postgresConnectionString(t *testing.T) {
 	c := &dbConfig{
 		Host:     "test_host",

config/db.go

@@ -1,96 +0,0 @@
-package config
-
-import (
-	"fmt"
-
-	"github.com/glebarez/sqlite"
-	"gorm.io/driver/mysql"
-	"gorm.io/driver/postgres"
-	"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 {
-	host := fmt.Sprintf("tcp(%s:%d)", config.Host, config.Port)
-
-	if config.Socket != "" {
-		host = fmt.Sprintf("unix(%s)", config.Socket)
-	}
-
-	return fmt.Sprintf("%s:%s@%s/%s?charset=%s&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
-		config.User,
-		config.Password,
-		host,
-		config.Name,
-		config.Charset,
-		"Local",
-	)
-}
-
-func postgresConnectionString(config *dbConfig) string {
-	if len(config.DSN) > 0 {
-		return config.DSN
-	}
-
-	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/db_opts.go

@@ -1,35 +0,0 @@
-package config
-
-import (
-	"gorm.io/gorm"
-)
-
-type WakapiDBOpts struct {
-	dbConfig *dbConfig
-}
-
-func GetWakapiDBOpts(dbConfig *dbConfig) *WakapiDBOpts {
-	return &WakapiDBOpts{dbConfig: dbConfig}
-}
-
-func (opts WakapiDBOpts) Apply(config *gorm.Config) error {
-	return nil
-}
-
-func (opts WakapiDBOpts) AfterInitialize(db *gorm.DB) error {
-	// initial session variables
-	if opts.dbConfig.Type == "cockroach" {
-		// https://www.cockroachlabs.com/docs/stable/experimental-features.html#alter-column-types
-		if err := db.Exec("SET enable_experimental_alter_column_type_general = true;").Error; err != nil {
-			return err
-		}
-	}
-
-	if opts.dbConfig.IsSQLite() {
-		if err := db.Exec("PRAGMA foreign_keys = ON;").Error; err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

config/eventbus.go

@@ -1,33 +0,0 @@
-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"
-	EventUserDelete         = "user.delete"
-	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

@@ -1,14 +0,0 @@
-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/jobqueue.go

@@ -1,88 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"math"
-	"runtime"
-
-	"github.com/emvi/logbuch"
-	"github.com/muety/artifex/v2"
-)
-
-var jobQueues map[string]*artifex.Dispatcher
-var jobCounts map[string]int
-
-const (
-	QueueDefault      = "wakapi.default"
-	QueueProcessing   = "wakapi.processing"
-	QueueReports      = "wakapi.reports"
-	QueueMails        = "wakapi.mail"
-	QueueImports      = "wakapi.imports"
-	QueueHousekeeping = "wakapi.housekeeping"
-)
-
-type JobQueueMetrics struct {
-	Queue        string
-	EnqueuedJobs int
-	FinishedJobs int
-}
-
-func init() {
-	jobQueues = make(map[string]*artifex.Dispatcher)
-}
-
-func StartJobs() {
-	InitQueue(QueueDefault, 1)
-	InitQueue(QueueProcessing, halfCPUs())
-	InitQueue(QueueReports, 1)
-	InitQueue(QueueMails, 1)
-	InitQueue(QueueImports, 1)
-	InitQueue(QueueHousekeeping, halfCPUs())
-}
-
-func InitQueue(name string, workers int) error {
-	if _, ok := jobQueues[name]; ok {
-		return fmt.Errorf("queue '%s' already existing", name)
-	}
-	logbuch.Info("creating job queue '%s' (%d workers)", name, workers)
-	jobQueues[name] = artifex.NewDispatcher(workers, 4096)
-	jobQueues[name].Start()
-	return nil
-}
-
-func GetDefaultQueue() *artifex.Dispatcher {
-	return GetQueue(QueueDefault)
-}
-
-func GetQueue(name string) *artifex.Dispatcher {
-	if _, ok := jobQueues[name]; !ok {
-		InitQueue(name, 1)
-	}
-	return jobQueues[name]
-}
-
-func GetQueueMetrics() []*JobQueueMetrics {
-	metrics := make([]*JobQueueMetrics, 0, len(jobQueues))
-	for name, queue := range jobQueues {
-		metrics = append(metrics, &JobQueueMetrics{
-			Queue:        name,
-			EnqueuedJobs: queue.CountEnqueued(),
-			FinishedJobs: queue.CountDispatched(),
-		})
-	}
-	return metrics
-}
-
-func CloseQueues() {
-	for _, q := range jobQueues {
-		q.Stop()
-	}
-}
-
-func allCPUs() int {
-	return runtime.NumCPU()
-}
-
-func halfCPUs() int {
-	return int(math.Ceil(float64(runtime.NumCPU()) / 2.0))
-}

config/key_utils.go

@@ -1,41 +0,0 @@
-package config
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/gorilla/securecookie"
-	"io"
-	"os"
-	"path/filepath"
-)
-
-func getTemporarySecureKeys() (hashKey, blockKey []byte) {
-	keyFile := filepath.Join(os.TempDir(), ".wakapi-dev-keys")
-
-	// key file already exists
-	if _, err := os.Stat(keyFile); err == nil {
-		file, err := os.Open(keyFile)
-		if err != nil {
-			logbuch.Fatal("failed to open dev keys file, %v", err)
-		}
-		defer file.Close()
-
-		combinedKey, err := io.ReadAll(file)
-		if err != nil {
-			logbuch.Fatal("failed to read key from file")
-		}
-		return combinedKey[:32], combinedKey[32:64]
-	}
-
-	// otherwise, generate random keys and save them
-	file, err := os.OpenFile(keyFile, os.O_CREATE|os.O_WRONLY, 0600)
-	if err != nil {
-		logbuch.Fatal("failed to open dev keys file, %v", err)
-	}
-	defer file.Close()
-
-	combinedKey := securecookie.GenerateRandomKey(64)
-	if _, err := file.Write(combinedKey); err != nil {
-		logbuch.Fatal("failed to write key to file")
-	}
-	return combinedKey[:32], combinedKey[32:64]
-}

config/sentry.go

@@ -1,152 +0,0 @@
-package config
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/getsentry/sentry-go"
-	"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 uid := getPrincipal(l.req); uid != "" {
-				hub.Scope().SetUser(sentry.User{ID: uid})
-			}
-			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,
-		EnableTracing:    config.EnableTracing,
-		TracesSampler: func(ctx sentry.SamplingContext) float64 {
-			txName := ctx.Span.Name
-			for _, ex := range excludedRoutes {
-				if strings.HasPrefix(txName, ex) {
-					return 0.0
-				}
-			}
-			if txName == "POST /api/heartbeat" {
-				return float64(config.SampleRateHeartbeats)
-			}
-			return float64(config.SampleRate)
-		},
-		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 uid := getPrincipal(req); uid != "" {
-						event.User.ID = uid
-					}
-				}
-			}
-			return event
-		},
-	}); err != nil {
-		logbuch.Fatal("failed to initialized sentry - %v", err)
-	}
-}
-
-// returns a user id
-func getPrincipal(r *http.Request) string {
-	type principalIdentityGetter interface {
-		GetPrincipalIdentity() string
-	}
-
-	if p := r.Context().Value("principal"); p != nil {
-		return p.(principalIdentityGetter).GetPrincipalIdentity()
-	}
-	return ""
-}

config/session.go

@@ -1,14 +0,0 @@
-package config
-
-import "github.com/gorilla/sessions"
-
-// sessions are only used for displaying flash messages
-
-var sessionStore *sessions.CookieStore
-
-func GetSessionStore() *sessions.CookieStore {
-	if sessionStore == nil {
-		sessionStore = sessions.NewCookieStore(Get().Security.SessionKey)
-	}
-	return sessionStore
-}

config/templates.go

@@ -5,9 +5,6 @@ const (
 	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"
-	LeaderboardTemplate   = "leaderboard.tpl.html"
 )

config/utils.go

@@ -0,0 +1,14 @@
+package config
+
+import "strings"
+
+func cloneStringMap(m map[string]string, keysToLower bool) map[string]string {
+	m2 := make(map[string]string)
+	for k, v := range m {
+		if keysToLower {
+			k = strings.ToLower(k)
+		}
+		m2[k] = v
+	}
+	return m2
+}

data/colors.json

@@ -1,351 +1,132 @@
 {
   "languages": {
     "1C Enterprise": "#814CCC",
-    "2-Dimensional Array": "#38761D",
-    "4D": "#004289",
     "ABAP": "#E8274B",
-    "ABAP CDS": "#555e25",
     "ActionScript": "#882B0F",
     "Ada": "#02f88c",
-    "Adblock Filter List": "#800000",
-    "Adobe Font Metrics": "#fa0f00",
     "Agda": "#315665",
     "AGS Script": "#B9D9FF",
-    "AIDL": "#34EB6B",
-    "AL": "#3AA2B5",
     "Alloy": "#64C800",
-    "Alpine Abuild": "#0D597F",
-    "Altium Designer": "#A89663",
     "AMPL": "#E6EFBB",
     "AngelScript": "#C7D7DC",
-    "Ant Build System": "#A9157E",
-    "Antlers": "#ff269e",
     "ANTLR": "#9DC3FF",
-    "ApacheConf": "#d12127",
-    "Apex": "#1797c0",
     "API Blueprint": "#2ACCA8",
     "APL": "#5A8164",
-    "Apollo Guidance Computer": "#0B3D91",
     "AppleScript": "#101F1F",
     "Arc": "#aa2afe",
-    "AsciiDoc": "#73a0c5",
+    "ASP": "#6a40fd",
-    "ASL": null,
-    "ASP.NET": "#9400ff",
     "AspectJ": "#a957b0",
     "Assembly": "#6E4C13",
-    "Astro": "#ff5a03",
+    "Asymptote": "#4a0c0c",
-    "Asymptote": "#ff0000",
     "ATS": "#1ac620",
-    "Augeas": "#9CC134",
     "AutoHotkey": "#6594b9",
     "AutoIt": "#1C3552",
-    "Avro IDL": "#0040FF",
-    "Awk": "#c30e9b",
     "Ballerina": "#FF5000",
-    "BASIC": "#ff0000",
     "Batchfile": "#C1F12E",
-    "Beef": "#a52f4e",
-    "Befunge": null,
-    "Berry": "#15A13C",
-    "BibTeX": "#778899",
-    "Bicep": "#519aba",
-    "Bikeshed": "#5562ac",
-    "Bison": "#6A463F",
-    "BitBake": "#00bce4",
-    "Blade": "#f7523f",
-    "BlitzBasic": "#00FFAE",
     "BlitzMax": "#cd6400",
-    "Bluespec": "#12223c",
     "Boo": "#d4bec1",
-    "Boogie": "#c80fa0",
     "Brainfuck": "#2F2530",
-    "BrighterScript": "#66AABB",
-    "Brightscript": "#662D91",
-    "Browserslist": "#ffd539",
     "C": "#555555",
     "C#": "#178600",
     "C++": "#f34b7d",
-    "C2hs Haskell": null,
-    "Cabal Config": "#483465",
-    "Cadence": "#00ef8b",
-    "Cairo": "#ff4a48",
-    "CameLIGO": "#3be133",
-    "CAP CDS": "#0092d1",
-    "Cap'n Proto": "#c42727",
-    "CartoCSS": null,
     "Ceylon": "#dfa535",
     "Chapel": "#8dc63f",
-    "Charity": null,
-    "ChucK": "#3f8000",
     "Cirru": "#ccccff",
     "Clarion": "#db901e",
-    "Clarity": "#5546ff",
-    "Classic ASP": "#6a40fd",
     "Clean": "#3F85AF",
     "Click": "#E4E6F3",
-    "CLIPS": "#00A300",
     "Clojure": "#db5855",
-    "Closure Templates": "#0d948f",
-    "Cloud Firestore Security Rules": "#FFA000",
-    "CMake": "#DA3434",
-    "COBOL": null,
-    "CodeQL": "#140f46",
     "CoffeeScript": "#244776",
     "ColdFusion": "#ed2cd6",
-    "ColdFusion CFC": "#ed2cd6",
-    "COLLADA": "#F1A42B",
     "Common Lisp": "#3fb68b",
     "Common Workflow Language": "#B5314C",
     "Component Pascal": "#B0CE4E",
-    "Cool": null,
-    "Coq": "#d0b68c",
     "Crystal": "#000100",
-    "CSON": "#244776",
-    "Csound": "#1a1a1a",
-    "Csound Document": "#1a1a1a",
-    "Csound Score": "#1a1a1a",
     "CSS": "#563d7c",
-    "CSV": "#237346",
     "Cuda": "#3A4E3A",
-    "CUE": "#5886E1",
-    "Curry": "#531242",
-    "CWeb": "#00007a",
-    "Cycript": null,
-    "Cypher": "#34c0eb",
-    "Cython": "#fedf5b",
     "D": "#ba595e",
-    "Dafny": "#FFEC25",
-    "Darcs Patch": "#8eff23",
     "Dart": "#00B4AB",
     "DataWeave": "#003a52",
-    "Debian Package Control File": "#D70751",
-    "DenizenScript": "#FBEE96",
-    "Dhall": "#dfafff",
-    "DIGITAL Command Language": null,
-    "DirectX 3D File": "#aace60",
     "DM": "#447265",
     "Dockerfile": "#384d54",
     "Dogescript": "#cca760",
-    "DTrace": null,
     "Dylan": "#6c616e",
     "E": "#ccce35",
-    "Earthly": "#2af0ff",
-    "Easybuild": "#069406",
     "eC": "#913960",
-    "Ecere Projects": "#913960",
     "ECL": "#8a1267",
-    "ECLiPSe": "#001d9d",
+    "Eiffel": "#946d57",
-    "Ecmarkup": "#eb8131",
-    "EditorConfig": "#fff1f2",
-    "Eiffel": "#4d6977",
-    "EJS": "#a91e50",
     "Elixir": "#6e4a7e",
     "Elm": "#60B5CC",
-    "Elvish": "#55BB55",
     "Emacs Lisp": "#c065db",
     "EmberScript": "#FFF4F3",
     "EQ": "#a78649",
     "Erlang": "#B83998",
-    "Euphoria": "#FF790B",
     "F#": "#b845fc",
     "F*": "#572e30",
     "Factor": "#636746",
     "Fancy": "#7b9db4",
     "Fantom": "#14253c",
-    "Faust": "#c37240",
-    "Fennel": "#fff3d7",
-    "FIGlet Font": "#FFDDBB",
-    "Filebench WML": "#F6B900",
-    "Filterscript": null,
-    "fish": "#4aae47",
-    "Fluent": "#ffcc33",
     "FLUX": "#88ccff",
     "Forth": "#341708",
     "Fortran": "#4d41b1",
-    "Fortran Free Form": "#4d41b1",
-    "FreeBasic": "#867db1",
     "FreeMarker": "#0050b2",
     "Frege": "#00cafe",
-    "Futhark": "#5f021f",
-    "G-code": "#D08CF2",
     "Game Maker Language": "#71b417",
-    "GAML": "#FFC766",
-    "GAMS": "#f49a22",
-    "GAP": "#0000cc",
-    "GCC Machine Description": "#FFCFAB",
-    "GDB": null,
     "GDScript": "#355570",
-    "GEDCOM": "#003058",
-    "Gemfile.lock": "#701516",
-    "Gemini": "#ff6900",
-    "Genero": "#63408e",
-    "Genero Forms": "#d8df39",
     "Genie": "#fb855d",
-    "Genshi": "#951531",
-    "Gentoo Ebuild": "#9400ff",
-    "Gentoo Eclass": "#9400ff",
-    "Gerber Image": "#d20b00",
     "Gherkin": "#5B2063",
-    "Git Attributes": "#F44D27",
-    "Git Config": "#F44D27",
-    "Git Revision List": "#F44D27",
-    "Gleam": "#ffaff3",
-    "GLSL": "#5686a5",
     "Glyph": "#c1ac7f",
     "Gnuplot": "#f0a9f0",
     "Go": "#00ADD8",
-    "Go Checksums": "#00ADD8",
-    "Go Module": "#00ADD8",
     "Golo": "#88562A",
     "Gosu": "#82937f",
-    "Grace": "#615f8b",
+    "Grammatical Framework": "#79aa7a",
-    "Gradle": "#02303a",
+    "Groovy": "#e69f56",
-    "Grammatical Framework": "#ff0000",
-    "GraphQL": "#e10098",
-    "Graphviz (DOT)": "#2596be",
-    "Groovy": "#4298b8",
-    "Groovy Server Pages": "#4298b8",
-    "GSC": "#FF6800",
     "Hack": "#878787",
-    "Haml": "#ece2a9",
-    "Handlebars": "#f7931e",
-    "HAProxy": "#106da9",
     "Harbour": "#0e60e3",
     "Haskell": "#5e5086",
     "Haxe": "#df7900",
-    "HCL": null,
     "HiveQL": "#dce200",
-    "HLSL": "#aace60",
-    "HOCON": "#9ff8ee",
-    "HolyC": "#ffefaf",
-    "hoon": "#00b171",
     "HTML": "#e34c26",
-    "HTML+ECR": "#2e1052",
-    "HTML+EEX": "#6e4a7e",
-    "HTML+ERB": "#701516",
-    "HTML+PHP": "#4f5d95",
-    "HTML+Razor": "#512be4",
-    "HTTP": "#005C9C",
-    "HXML": "#f68712",
     "Hy": "#7790B2",
-    "HyPhy": null,
     "IDL": "#a3522f",
     "Idris": "#b30000",
-    "Ignore List": "#000000",
-    "IGOR Pro": "#0000cc",
-    "ImageJ Macro": "#99AAFF",
-    "Imba": "#16cec6",
-    "Inform 7": null,
-    "INI": "#d1dbe0",
-    "Ink": null,
-    "Inno Setup": "#264b99",
     "Io": "#a9188d",
     "Ioke": "#078193",
     "Isabelle": "#FEFE00",
-    "Isabelle ROOT": "#FEFE00",
     "J": "#9EEDFF",
-    "Janet": "#0886a5",
-    "JAR Manifest": "#b07219",
-    "Jasmin": "#d03600",
     "Java": "#b07219",
-    "Java Properties": "#2A6277",
-    "Java Server Pages": "#2A6277",
     "JavaScript": "#f1e05a",
-    "JavaScript+ERB": "#f1e05a",
-    "Jest Snapshot": "#15c213",
-    "JetBrains MPS": "#21D789",
-    "JFlex": "#DBCA00",
-    "Jinja": "#a52a22",
-    "Jison": "#56b3cb",
-    "Jison Lex": "#56b3cb",
     "Jolie": "#843179",
-    "jq": "#c7254e",
-    "JSON": "#292929",
-    "JSON with Comments": "#292929",
-    "JSON5": "#267CB9",
     "JSONiq": "#40d47e",
-    "JSONLD": "#0c479c",
     "Jsonnet": "#0064bd",
     "Julia": "#a270ba",
     "Jupyter Notebook": "#DA5B0B",
-    "just": "#384d54",
+    "Kotlin": "#F18E33",
-    "Kaitai Struct": "#773b37",
-    "KakouneScript": "#6f8042",
-    "KiCad Layout": "#2f4aab",
-    "KiCad Legacy Layout": "#2f4aab",
-    "KiCad Schematic": "#2f4aab",
-    "Kotlin": "#A97BFF",
     "KRL": "#28430A",
-    "kvlang": "#1da6e0",
-    "LabVIEW": "#fede06",
-    "Lark": "#2980B9",
     "Lasso": "#999999",
-    "Latte": "#f2a542",
-    "Lean": null,
-    "Less": "#1d365d",
     "Lex": "#DBCA00",
     "LFE": "#4C3023",
-    "LigoLANG": "#0e74ff",
-    "LilyPond": "#9ccc7c",
-    "Limbo": null,
-    "Liquid": "#67b8de",
-    "Literate Agda": "#315665",
-    "Literate CoffeeScript": "#244776",
-    "Literate Haskell": "#5e5086",
     "LiveScript": "#499886",
     "LLVM": "#185619",
-    "Logos": null,
-    "Logtalk": "#295b9a",
     "LOLCODE": "#cc9900",
     "LookML": "#652B81",
-    "LoomScript": null,
     "LSL": "#3d9970",
     "Lua": "#000080",
-    "M": null,
-    "M4": null,
-    "M4Sugar": null,
-    "Macaulay2": "#d8ffff",
     "Makefile": "#427819",
-    "Mako": "#7e858d",
-    "Markdown": "#083fa1",
-    "Marko": "#42bff2",
     "Mask": "#f97732",
-    "Mathematica": "#dd1100",
     "MATLAB": "#e16737",
     "Max": "#c4a79c",
     "MAXScript": "#00a6a6",
     "mcfunction": "#E22837",
     "Mercury": "#ff2b2b",
-    "Mermaid": "#ff3670",
     "Meson": "#007800",
     "Metal": "#8f14e9",
-    "MiniD": null,
-    "MiniYAML": "#ff1111",
-    "Mint": "#02b046",
     "Mirah": "#c7a938",
-    "mIRC Script": "#3d57c3",
-    "MLIR": "#5EC8DB",
-    "Modelica": "#de1d31",
-    "Modula-2": "#10253f",
     "Modula-3": "#223388",
-    "Module Management System": null,
-    "Monkey": null,
-    "Monkey C": "#8D6747",
-    "Moocode": null,
-    "MoonScript": "#ff4585",
-    "Motoko": "#fbb03b",
-    "Motorola 68K Assembly": "#005daa",
-    "Move": "#4a137a",
     "MQL4": "#62A8D6",
     "MQL5": "#4A76B8",
     "MTML": "#b7e1f4",
-    "MUF": null,
-    "mupad": "#244963",
-    "Mustache": "#724b3b",
-    "Myghty": null,
-    "nanorc": "#2d004d",
-    "Nasal": "#1d2c4e",
-    "NASL": null,
     "NCL": "#28431f",
     "Nearley": "#990000",
     "Nemerle": "#3d3c6e",
@@ -355,314 +136,155 @@
     "NetLogo": "#ff6375",
     "NewLisp": "#87AED7",
     "Nextflow": "#3ac486",
-    "Nginx": "#009639",
+    "Nim": "#37775b",
-    "Nim": "#ffc200",
     "Nit": "#009917",
     "Nix": "#7e7eff",
-    "NPM Config": "#cb3837",
-    "NSIS": null,
     "Nu": "#c9df40",
-    "NumPy": "#9C8AF9",
-    "Nunjucks": "#3d8137",
-    "NWScript": "#111522",
-    "OASv2-json": "#85ea2d",
-    "OASv2-yaml": "#85ea2d",
-    "OASv3-json": "#85ea2d",
-    "OASv3-yaml": "#85ea2d",
     "Objective-C": "#438eff",
     "Objective-C++": "#6866fb",
     "Objective-J": "#ff0c5a",
-    "ObjectScript": "#424893",
     "OCaml": "#3be133",
-    "Odin": "#60AFFE",
     "Omgrofl": "#cabbff",
     "ooc": "#b0b77e",
-    "Opa": null,
     "Opal": "#f7ede0",
-    "Open Policy Agent": "#7d9199",
-    "OpenAPI Specification v2": "#85ea2d",
-    "OpenAPI Specification v3": "#85ea2d",
-    "OpenCL": "#ed2e2d",
-    "OpenEdge ABL": "#5ce600",
-    "OpenQASM": "#AA70FF",
-    "OpenRC runscript": null,
-    "OpenSCAD": "#e5cd45",
-    "Option List": "#476732",
-    "Org": "#77aa99",
-    "Ox": null,
     "Oxygene": "#cdd0e3",
     "Oz": "#fab738",
     "P4": "#7055b5",
     "Pan": "#cc0000",
     "Papyrus": "#6600cc",
     "Parrot": "#f3ca0a",
-    "Parrot Assembly": null,
-    "Parrot Internal Representation": null,
     "Pascal": "#E3F171",
     "Pawn": "#dbb284",
-    "PDDL": "#0d00ff",
-    "PEG.js": "#234d6b",
     "Pep8": "#C76F5B",
     "Perl": "#0298c3",
+    "Perl 6": "#0000fb",
     "PHP": "#4F5D95",
-    "PicoLisp": "#6067af",
     "PigLatin": "#fcd7de",
     "Pike": "#005390",
-    "PLpgSQL": "#336790",
     "PLSQL": "#dad8d8",
     "PogoScript": "#d80074",
-    "Polar": "#ae81ff",
-    "Pony": null,
-    "Portugol": "#f8bd00",
-    "PostCSS": "#dc3a0c",
     "PostScript": "#da291c",
-    "POV-Ray SDL": "#6bac65",
     "PowerBuilder": "#8f0f8d",
     "PowerShell": "#012456",
-    "Prisma": "#0c344b",
     "Processing": "#0096D8",
-    "Procfile": "#3B2F63",
     "Prolog": "#74283c",
-    "Promela": "#de0000",
     "Propeller Spin": "#7fa2a7",
-    "Pug": "#a86454",
     "Puppet": "#302B6D",
     "PureBasic": "#5a6986",
     "PureScript": "#1D222D",
     "Python": "#3572A5",
-    "Python console": "#3572A5",
-    "Python traceback": "#3572A5",
     "q": "#0040cd",
-    "Q#": "#fed659",
-    "QMake": null,
     "QML": "#44a51c",
-    "Qt Script": "#00b841",
     "Quake": "#882233",
     "R": "#198CE7",
     "Racket": "#3c5caa",
     "Ragel": "#9d5200",
-    "Raku": "#0000fb",
     "RAML": "#77d9fb",
     "Rascal": "#fffaa0",
-    "RDoc": "#701516",
-    "REALbasic": null,
-    "Reason": "#ff5847",
-    "ReasonLIGO": "#ff5847",
     "Rebol": "#358a5b",
-    "Record Jar": "#0673ba",
     "Red": "#f50000",
-    "Redcode": null,
-    "Regular Expression": "#009a00",
     "Ren'Py": "#ff7f7f",
-    "RenderScript": null,
-    "ReScript": "#ed5051",
-    "reStructuredText": "#141414",
-    "REXX": "#d90e09",
     "Ring": "#2D54CB",
-    "Riot": "#A71E49",
-    "RMarkdown": "#198ce7",
-    "RobotFramework": "#00c0b5",
     "Roff": "#ecdebe",
-    "Roff Manpage": "#ecdebe",
     "Rouge": "#cc0088",
-    "RouterOS Script": "#DE3941",
-    "RPC": null,
-    "RPGLE": "#2BDE21",
     "Ruby": "#701516",
     "RUNOFF": "#665a4e",
     "Rust": "#dea584",
-    "Sage": null,
     "SaltStack": "#646464",
     "SAS": "#B34936",
-    "Sass": "#a53b70",
     "Scala": "#c22d40",
-    "Scaml": "#bd181a",
-    "Scenic": "#fdc700",
     "Scheme": "#1e4aec",
-    "Scilab": "#ca0f21",
-    "SCSS": "#c6538c",
     "sed": "#64b970",
     "Self": "#0579aa",
-    "ShaderLab": "#222c37",
     "Shell": "#89e051",
-    "ShellCheck Config": "#cecfcb",
-    "ShellSession": null,
     "Shen": "#120F14",
-    "Sieve": null,
-    "Simple File Verification": "#C9BFED",
-    "Singularity": "#64E6AD",
     "Slash": "#007eff",
     "Slice": "#003fa2",
-    "Slim": "#2b2b2b",
-    "Smali": null,
     "Smalltalk": "#596706",
-    "Smarty": "#f0c040",
-    "Smithy": "#c44536",
-    "SmPL": "#c94949",
-    "SMT": null,
     "Solidity": "#AA6746",
-    "SourcePawn": "#f69e1d",
+    "SourcePawn": "#5c7611",
-    "SPARQL": "#0C4597",
     "SQF": "#3F3F3F",
-    "SQL": "#e38c00",
-    "SQLPL": "#e38c00",
     "Squirrel": "#800000",
     "SRecode Template": "#348a34",
     "Stan": "#b2011d",
     "Standard ML": "#dc566d",
-    "Starlark": "#76d275",
-    "Stata": "#1a5f91",
-    "STL": "#373b5e",
-    "StringTemplate": "#3fb34f",
-    "Stylus": "#ff6347",
-    "SubRip Text": "#9e0101",
-    "SugarSS": "#2fcc9f",
     "SuperCollider": "#46390b",
-    "Svelte": "#ff3e00",
+    "Swift": "#ffac45",
-    "SVG": "#ff9900",
-    "Swift": "#F05138",
-    "SWIG": null,
     "SystemVerilog": "#DAE1C2",
-    "Talon": "#333333",
     "Tcl": "#e4cc98",
-    "Tcsh": null,
     "Terra": "#00004c",
     "TeX": "#3D6117",
-    "Textile": "#ffe7ac",
-    "TextMate Properties": "#df66e4",
-    "Thrift": "#D12127",
     "TI Program": "#A0AA87",
-    "TLA": "#4b0079",
-    "TOML": "#9c4221",
-    "TSQL": "#e38c00",
-    "TSV": "#237346",
-    "TSX": "#3178c6",
     "Turing": "#cf142b",
-    "Twig": "#c1d026",
+    "TypeScript": "#2b7489",
-    "TXL": "#0178b8",
-    "TypeScript": "#3178c6",
-    "Unified Parallel C": "#4e3617",
-    "Unity3D Asset": "#222c37",
-    "Unix Assembly": null,
-    "Uno": "#9933cc",
     "UnrealScript": "#a54c4d",
-    "UrWeb": "#ccccee",
+    "Vala": "#fbe5cd",
-    "V": "#4f87c4",
-    "Vala": "#a56de2",
-    "Valve Data Format": "#f26025",
-    "VBA": "#867db1",
-    "VBScript": "#15dcdc",
     "VCL": "#148AA8",
-    "Velocity Template Language": "#507cff",
     "Verilog": "#b2b7f8",
     "VHDL": "#adb2cb",
-    "Vim Help File": "#199f4b",
+    "Vim script": "#199f4b",
-    "Vim Script": "#199f4b",
+    "Visual Basic": "#945db7",
-    "Vim Snippet": "#199f4b",
-    "Visual Basic .NET": "#945db7",
-    "Visual Basic 6.0": "#2c6353",
     "Volt": "#1F1F1F",
-    "Vue": "#41b883",
+    "Vue": "#2c3e50",
-    "Vyper": "#2980b9",
     "wdl": "#42f1f4",
-    "Web Ontology Language": "#5b70bd",
     "WebAssembly": "#04133b",
-    "WebIDL": null,
-    "Whiley": "#d5c397",
-    "Wikitext": "#fc5757",
-    "Windows Registry Entries": "#52d5ff",
     "wisp": "#7582D1",
-    "Witcher Script": "#ff0000",
-    "Wollok": "#a23738",
-    "World of Warcraft Addon Data": "#f7e43f",
-    "Wren": "#383838",
     "X10": "#4B6BEF",
     "xBase": "#403a40",
     "XC": "#99DA07",
-    "XML": "#0060ac",
-    "XML Property List": "#0060ac",
-    "Xojo": "#81bd41",
-    "Xonsh": "#285EEF",
-    "XProc": null,
     "XQuery": "#5232e7",
-    "XS": null,
     "XSLT": "#EB8CEB",
-    "Xtend": "#24255d",
     "Yacc": "#4B6C4B",
-    "YAML": "#cb171e",
     "YARA": "#220000",
     "YASnippet": "#32AB90",
-    "Yul": "#794932",
     "ZAP": "#0d665e",
-    "Zeek": null,
-    "ZenScript": "#00BCD1",
     "Zephir": "#118f9e",
     "Zig": "#ec915c",
-    "ZIL": "#dc75e5",
+    "ZIL": "#dc75e5"
-    "Zimpl": "#d67711"
   },
   "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": "#2876e1",
+    "IntelliJ IDEA": "#237ce2",
-    "IntelliJ": "#2876e1",
+    "IntelliJ": "#237ce2",
     "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",
@@ -673,13 +295,25 @@
     "Visual Studio": "#9460cd",
     "VS Code": "#027acd",
     "VSCode": "#027acd",
-    "WebMatrix": "#aeaeae",
     "WebStorm": "#00c6d7",
-    "Wing": "#b3b3b3",
     "Word": "#0f4091",
     "WPS Office": "#fc6143",
     "Xamarin": "#3598db",
-    "Xcode": "#3fa7e4"
+    "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"
   },
   "operating_systems": {
     "Linux": "#f0b912",

data/data.go

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

docker-compose.yml

@@ -7,11 +7,10 @@ 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: "choose-a-password"
+      WAKAPI_DB_PASSWORD: "CHANGE_ME!!!"
       WAKAPI_DB_HOST: "db"
       WAKAPI_DB_PORT: "5432"
       ENVIRONMENT: "prod"
@@ -20,10 +19,5 @@ services:
     image: postgres:12.3
     environment:
       POSTGRES_USER: "wakapi"
-      POSTGRES_PASSWORD: "choose-a-password"
+      POSTGRES_PASSWORD: "CHANGE_ME!!!"
       POSTGRES_DB: "wakapi"
-    volumes:
-      - wakapi-db-data:/var/lib/postgresql/data
-
-volumes:
-  wakapi-db-data: {}

docs/advanced_setup.md

@@ -0,0 +1,47 @@
+# 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

@@ -1,8 +0,0 @@
-#!/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

@@ -1,26 +0,0 @@
-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

@@ -1,54 +0,0 @@
-[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
-RuntimeDirectory=wakapi  # creates /run/wakapi, useful to place your socket file there
-
-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,80 +1,30 @@
 module github.com/muety/wakapi
 
-go 1.19
+go 1.13
 
 require (
-	codeberg.org/Codeberg/avatars v1.0.0
+	github.com/emvi/logbuch v1.1.1
-	github.com/duke-git/lancet/v2 v2.2.3
+	github.com/go-co-op/gocron v0.3.3
-	github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
+	github.com/gorilla/handlers v1.4.2
-	github.com/emersion/go-smtp v0.17.0
+	github.com/gorilla/mux v1.7.3
-	github.com/emvi/logbuch v1.2.0
+	github.com/gorilla/schema v1.1.0
-	github.com/getsentry/sentry-go v0.22.0
-	github.com/glebarez/sqlite v1.8.0
-	github.com/go-chi/chi/v5 v5.0.8
-	github.com/gorilla/schema v1.2.0
 	github.com/gorilla/securecookie v1.1.1
-	github.com/gorilla/sessions v1.2.1
+	github.com/jinzhu/configor v1.2.0
-	github.com/hashicorp/golang-lru v0.5.4
+	github.com/kr/text v0.2.0 // indirect
-	github.com/jinzhu/configor v1.2.1
+	github.com/markbates/pkger v0.17.1
-	github.com/leandro-lugaresi/hub v1.1.1
+	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
-	github.com/lpar/gzipped/v2 v2.1.0
+	github.com/mitchellh/hashstructure/v2 v2.0.1
-	github.com/mitchellh/hashstructure/v2 v2.0.2
+	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
-	github.com/muety/artifex/v2 v2.0.1-0.20221201142708-74e7d3f6feaf
-	github.com/narqo/go-badge v0.0.0-20221212191103-ba83bed45a1a
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/robfig/cron/v3 v3.0.1
+	github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc
 	github.com/satori/go.uuid v1.2.0
-	github.com/stretchr/testify v1.8.2
+	github.com/stretchr/testify v1.6.1
-	github.com/stripe/stripe-go/v74 v74.25.0
+	go.uber.org/atomic v1.6.0
-	github.com/swaggo/http-swagger v1.3.4
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
-	github.com/swaggo/swag v1.16.1
+	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	go.uber.org/atomic v1.11.0
+	gopkg.in/yaml.v2 v2.2.8 // indirect
-	golang.org/x/crypto v0.11.0
+	gorm.io/driver/mysql v1.0.3
-	golang.org/x/sync v0.3.0
+	gorm.io/driver/postgres v1.0.5
-	gorm.io/driver/mysql v1.5.1
+	gorm.io/driver/sqlite v1.1.3
-	gorm.io/driver/postgres v1.5.2
+	gorm.io/gorm v1.20.11
-	gorm.io/driver/sqlite v1.5.2
-	gorm.io/gorm v1.25.2
-)
-
-require (
-	github.com/BurntSushi/toml v1.3.2 // indirect
-	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/alexedwards/argon2id v0.0.0-20230305115115-4b3c3280a736 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/glebarez/go-sqlite v1.21.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
-	github.com/go-openapi/jsonreference v0.20.2 // indirect
-	github.com/go-openapi/spec v0.20.9 // indirect
-	github.com/go-openapi/swag v0.22.4 // indirect
-	github.com/go-sql-driver/mysql v1.7.1 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.4.1 // 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-isatty v0.0.19 // indirect
-	github.com/mattn/go-sqlite3 v1.14.17 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/swaggo/files v1.0.1 // indirect
-	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
-	golang.org/x/image v0.9.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	golang.org/x/tools v0.11.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.22.5 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
-	modernc.org/sqlite v1.23.1 // indirect
 )

go.sum

@@ -1,300 +1,586 @@
-codeberg.org/Codeberg/avatars v1.0.0 h1:MRx5QxuT/oVCcPvC5rXwgwWKD7hc6J0GnZ0Kl67lYEM=
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-codeberg.org/Codeberg/avatars v1.0.0/go.mod h1:ML/htpPRb3+owhkm4+qG2ZrXnk5WXaQLASOZ5GLCPi8=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
+github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
-github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
-github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
+github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c=
-github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alexedwards/argon2id v0.0.0-20230305115115-4b3c3280a736 h1:qZaEtLxnqY5mJ0fVKbk31NVhlgi0yrKm51Pq/I5wcz4=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alexedwards/argon2id v0.0.0-20230305115115-4b3c3280a736/go.mod h1:mTeFRcTdnpzOlRjMoFYC/80HwVUreupyAiqPkCZQOXc=
+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/duke-git/lancet/v2 v2.1.18 h1:S5dsxDRFhMNTlhuoJZnK3PiiGfE8psPejsEUjfuQwtQ=
+github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
-github.com/duke-git/lancet/v2 v2.1.18/go.mod h1:hNcc06mV7qr+crH/0nP+rlC3TB0Q9g5OrVnO8/TGD4c=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/duke-git/lancet/v2 v2.2.3 h1:Lj4iWgvEbgktEjAfqxE1G2BoGm1mL7l3QHBlXRYptjE=
+github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/duke-git/lancet/v2 v2.2.3/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc=
+github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
-github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
-github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
-github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
+github.com/emvi/logbuch v1.1.1 h1:poBGNbHy/nB95oNoqLKAaJoBrcKxTO0W9DhMijKEkkU=
-github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
+github.com/emvi/logbuch v1.1.1/go.mod h1:J2Wgbr3BuSc1JO+D2MBVh6q3WPVSK5GzktwWz8pvkKw=
-github.com/emersion/go-smtp v0.16.0 h1:eB9CY9527WdEZSs5sWisTmilDX7gG+Q/2IdRcmubpa8=
+github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
-github.com/emersion/go-smtp v0.16.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/emersion/go-smtp v0.17.0 h1:tq90evlrcyqRfE6DSXaWVH54oX6OuZOQECEmhWBMEtI=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/emersion/go-smtp v0.17.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/emvi/logbuch v1.2.0 h1:Bw0jQH1Dbs+oIygZBNx/2Ub1igXRFtKQrIMRrZdVFJM=
+github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
-github.com/emvi/logbuch v1.2.0/go.mod h1:hFxe0XQOFl76SkE/f0Pt5oQbXRZtyGa8EroBrrbQHuc=
+github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
-github.com/getsentry/sentry-go v0.17.0 h1:UustVWnOoDFHBS7IJUB2QK/nB5pap748ZEp0swnQJak=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/getsentry/sentry-go v0.17.0/go.mod h1:B82dxtBvxG0KaPD8/hfSV+VcHD+Lg/xUS4JuQn1P4cM=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/getsentry/sentry-go v0.22.0 h1:XNX9zKbv7baSEI65l+H1GEJgSeIC1c7EN5kluWaP6dM=
+github.com/go-co-op/gocron v0.3.3 h1:QnarcMZWWKrEP25uCbtDiLsnnGw+PhCjL3wNITdWJOs=
-github.com/getsentry/sentry-go v0.22.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
+github.com/go-co-op/gocron v0.3.3/go.mod h1:Y9PWlYqDChf2Nbgg7kfS+ZsXHDTZbMZYPEQ0MILqH+M=
-github.com/glebarez/go-sqlite v1.21.1 h1:7MZyUPh2XTrHS7xNEHQbrhfMZuPSzhkm2A1qgg0y5NY=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/glebarez/go-sqlite v1.21.1/go.mod h1:ISs8MF6yk5cL4n/43rSOmVMGJJjHYr7L2MbZZ5Q4E2E=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
+github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=
-github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/glebarez/sqlite v1.7.0 h1:A7Xj/KN2Lvie4Z4rrgQHY8MsbebX3NyWsL3n2i82MVI=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/glebarez/sqlite v1.7.0/go.mod h1:PkeevrRlF/1BhQBCnzcMWzgrIk7IOop+qS2jUYLfHhk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
-github.com/glebarez/sqlite v1.8.0 h1:02X12E2I/4C1n+v90yTqrjRa8yuo7c3KeHI3FRznCvc=
+github.com/go-redis/redis v6.15.5+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
-github.com/glebarez/sqlite v1.8.0/go.mod h1:bpET16h1za2KOOMb8+jCp6UBP/iahDpfPQqSaYLTLx8=
+github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
+github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
-github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
-github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8=
-github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
-github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
+github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
-github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
-github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg=
-github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU=
+github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
-github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
-github.com/go-openapi/spec v0.20.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8=
+github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
-github.com/go-openapi/spec v0.20.9/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
-github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg=
-github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
-github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
+github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
-github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
+github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
-github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
+github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
+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/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg=
+github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
+github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw=
+github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/gorilla/schema v1.1.0 h1:CamqUDOFUBqzrvxuz2vEwo8+SUdwsluFh7IlzJh30LY=
+github.com/gorilla/schema v1.1.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
+github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
+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/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
+github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
+github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
+github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
+github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
+github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
+github.com/jackc/pgconn v1.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/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/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
-github.com/jackc/pgx/v5 v5.3.0/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
-github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU=
+github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
-github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgx/v5 v5.4.1 h1:oKfB/FhuVtit1bBM3zNRRsZ925ZkMN3HXL+LgLUM9lE=
+github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgx/v5 v5.4.1/go.mod h1:q6iHT8uDNXWiFNOlRqJzBTaSH3+2xCXkokxHZC5qWFY=
+github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jackc/pgproto3/v2 v2.0.5 h1:NUbEWPmCQZbMmYlTjVoNPhc0CfnYyz2bfUAh6A5ZVJM=
-github.com/jinzhu/configor v1.2.1 h1:OKk9dsR8i6HPOCZR8BcMtcEImAFjIhbJFZNyn5GCZko=
+github.com/jackc/pgproto3/v2 v2.0.5/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jinzhu/configor v1.2.1/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
+github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+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/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/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/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
-github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
-github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43 h1:Pdirg1gwhEcGjMLyuSxGn9664p+P8J9SrfMgpFwrDyg=
+github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43/go.mod h1:ahLMuLCUyDdXqtqGyuwGev7/PGtO7r7ocvdwDuEN/3E=
+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/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/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/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/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/leandro-lugaresi/hub v1.1.1/go.mod h1:XEFWanhHv6Rt3XlteHMxuNDYi8dJcpJjodpqkU+BtIo=
+github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lpar/gzipped/v2 v2.1.0 h1:87/ug239roEqXLVOnXZg6NjDfFvMwmkGTKnFWJPUA9U=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lpar/gzipped/v2 v2.1.0/go.mod h1:G3UlFoFYzjCx6NV4zDmD1BIWMNBaJuKoUvxrEWJuZ3Y=
+github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno=
-github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-oci8 v0.0.7/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI=
+github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.14.3/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U=
 github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
+github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/muety/artifex/v2 v2.0.1-0.20221201142708-74e7d3f6feaf h1:zd7IU9rxVMl2FBwSwiWCUh6s0TkPKgOU6GyVBciNdlo=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/muety/artifex/v2 v2.0.1-0.20221201142708-74e7d3f6feaf/go.mod h1:eElbcdMwTDc7Wzl7A46IopgkC6a9nV7jOB6Mw8r0waE=
+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/narqo/go-badge v0.0.0-20221212191103-ba83bed45a1a h1:G6Kjw+HNpJUZY1bfBkd8XOZ7nuDWmXLaJukeiM2Xv7o=
+github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/narqo/go-badge v0.0.0-20221212191103-ba83bed45a1a/go.mod h1:m9BzkaxwU4IfPQi9ko23cmuFltayFe8iS0dlRlnEWiM=
+github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
+github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
+github.com/mitchellh/hashstructure/v2 v2.0.1 h1:L60q1+q7cXE4JeEJJKMnh2brFIe3rZxCihYAB61ypAY=
+github.com/mitchellh/hashstructure/v2 v2.0.1/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
+github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
+github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
+github.com/nats-io/jwt v0.3.2/go.mod h1:/euKqTS1ZD+zzjYrY7pseZrTtWQSjujC7xjPc8wL6eU=
+github.com/nats-io/nats-server/v2 v2.1.2/go.mod h1:Afk+wRZqkMQs/p45uXdrVLuab3gwv3Z8C4HTBu8GD/k=
+github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
+github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
+github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
+github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/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/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+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/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/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
-github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
-github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
+github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.4.0 h1:LUa41nrWTQNGhzdsZ5lTnkwbNjj6rXTdazA1cSdjkOY=
+github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
+github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
+github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc h1:+2DdDcxVYlarHjYcZTt8dZ4Ec8cXZirzL5ko0mkKPjU=
+github.com/rubenv/sql-migrate v0.0.0-20200402132117-435005d389bc/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg=
+github.com/russross/blackfriday v1.5.2/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/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.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
-github.com/stripe/stripe-go/v74 v74.15.0 h1:P3ZYrY4CdZeV8Pc/205utqjur+5gcTef+9hgtj8P8IY=
+github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-github.com/stripe/stripe-go/v74 v74.15.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
+github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
-github.com/stripe/stripe-go/v74 v74.25.0 h1:mGJp9L1ymxjFvq5MlmG6ynv/fAGX6LLU8MyMVsiRAMY=
+github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
-github.com/stripe/stripe-go/v74 v74.25.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
+go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
+go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
-github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
+go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-github.com/swaggo/http-swagger v1.3.4 h1:q7t/XLx0n15H1Q9/tk3Y9L4n210XzJF5WtnDX64a5ww=
+go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
-github.com/swaggo/http-swagger v1.3.4/go.mod h1:9dAh0unqMBAlbp1uE2Uc2mQTxNMU/ha4UbucIg1MFkQ=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-github.com/swaggo/swag v1.8.12 h1:pctzkNPu0AlQP2royqX3apjKCQonAnf7KGoxeO4y64w=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-github.com/swaggo/swag v1.8.12/go.mod h1:lNfm6Gg+oAq3zRJQNEMBE66LIJKM44mxFqhEEgy2its=
+go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-github.com/swaggo/swag v1.16.1 h1:fTNRhKstPKxcnoKsytm4sahr8FaYzUcT7i1/3nd/fBg=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-github.com/swaggo/swag v1.16.1/go.mod h1:9/LMvHycG3NFHfR6LwvikHv5iFvmPADQ359cKikGxto=
+go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
+golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
+golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
-golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/image v0.9.0 h1:QrzfX26snvCM20hIhBwuHI/ThTg18b/+kcKdXHvnR+g=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/image v0.9.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0=
+golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+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/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-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+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-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
-golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
+golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
+golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
+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-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+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=
 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/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 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.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+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.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/mysql v1.0.3 h1:+JKBYPfn1tygR1/of/Fh2T8iwuVwzt+PEJmKaXzMQXg=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gorm.io/driver/mysql v1.0.3/go.mod h1:twGxftLBlFgNVNakL7F+P/x9oYqoymG3YYT8cAfI9oI=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/postgres v1.0.5 h1:raX6ezL/ciUmaYTvOq48jq1GE95aMC0CmxQYbxQ4Ufw=
-gorm.io/driver/mysql v1.4.7 h1:rY46lkCspzGHn7+IYsNpSfEv9tA+SU4SkkB+GFX125Y=
+gorm.io/driver/postgres v1.0.5/go.mod h1:qrD92UurYzNctBMVCJ8C3VQEjffEuphycXtxOudXNCA=
-gorm.io/driver/mysql v1.4.7/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc=
+gorm.io/driver/sqlite v1.1.3 h1:BYfdVuZB5He/u9dt4qDpZqiqDJ6KhPqs5QUqsr/Eeuc=
-gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
+gorm.io/driver/sqlite v1.1.3/go.mod h1:AKDgRWk8lcSQSw+9kxCJnX/yySj8G3rdwYlU57cB45c=
-gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
+gorm.io/gorm v1.20.1/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U=
+gorm.io/gorm v1.20.4/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A=
+gorm.io/gorm v1.20.11 h1:jYHQ0LLUViV85V8dM1TP9VBBkfzKTnuTXDjYObkI6yc=
-gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0=
+gorm.io/gorm v1.20.11/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gorm.io/driver/sqlite v1.4.4 h1:gIufGoR0dQzjkyqDyYSCvsYR6fba1Gw5YKDqKeChxFc=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
+honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-gorm.io/driver/sqlite v1.5.2 h1:TpQ+/dqCY4uCigCFyrfnrJnrW9zjpelWVoEVNy5qJkc=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-gorm.io/driver/sqlite v1.5.2/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
+sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
-gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11 h1:9qNbmu21nNThCNnF5i2R3kw2aL27U8ZwbzccNjOmW0g=
-gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
-gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY=
-modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw=
-modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
-modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
-modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM=
-modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak=
-modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
-modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
-modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
-modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
-modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/memory v1.6.0 h1:i6mzavxrE9a30whzMfwf7XWVODx2r5OYXvU46cirX7o=
-modernc.org/memory v1.6.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/sqlite v1.21.1 h1:GyDFqNnESLOhwwDRaHGdp2jKLDzpyT/rNLglX3ZkMSU=
-modernc.org/sqlite v1.21.1/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI=
-modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
-modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=

helpers/date.go

@@ -1,49 +0,0 @@
-package helpers
-
-import (
-	"fmt"
-	"github.com/muety/wakapi/config"
-	"time"
-)
-
-// ParseDateTimeTZ attempts to parse the given date string from multiple formats.
-// First, a time-zoned date-time string (e.g. 2006-01-02T15:04:05+02:00) is tried
-// Second, a non-time-zoned date-time string (e.g. 2006-01-02 15:04:05) is tried at the given zone
-// Third, a non-time-zoned date string (e.g. 2006-01-02) is tried at the given zone
-// Example:
-// - Server runs in CEST (UTC+2), requesting user lives in PDT (UTC-7).
-// - 2021-04-25T10:30:00Z, 2021-04-25T3:30:00-0100 and 2021-04-25T12:30:00+0200 are equivalent, they represent the same point in time
-// - When user requests non-time-zoned range (e.g. 2021-04-25T00:00:00), but has their time zone properly configured, this will resolve to 2021-04-25T09:00:00
-func ParseDateTimeTZ(date string, tz *time.Location) (time.Time, error) {
-	if t, err := time.Parse(time.RFC3339, date); err == nil {
-		return t, nil
-	}
-	if t, err := time.ParseInLocation(config.SimpleDateTimeFormat, date, tz); err == nil {
-		return t, nil
-	}
-	return time.ParseInLocation(config.SimpleDateFormat, date, tz)
-}
-
-func FormatDate(date time.Time) string {
-	return date.Format(config.SimpleDateFormat)
-}
-
-func FormatDateTime(date time.Time) string {
-	return date.Format(config.SimpleDateTimeFormat)
-}
-
-func FormatDateTimeHuman(date time.Time) string {
-	return date.Format("Mon, 02 Jan 2006 15:04")
-}
-
-func FormatDateHuman(date time.Time) string {
-	return date.Format("Mon, 02 Jan 2006")
-}
-
-func FmtWakatimeDuration(d time.Duration) string {
-	d = d.Round(time.Minute)
-	h := d / time.Hour
-	d -= h * time.Hour
-	m := d / time.Minute
-	return fmt.Sprintf("%d hrs %d mins", h, m)
-}

helpers/helpers.go

@@ -1,4 +0,0 @@
-package helpers
-
-// helpers are different from utils in that they contain wakapi-specific utility functions
-// also, helpers may depend on the config package, while utils must be entirely static

helpers/http.go

@@ -1,30 +0,0 @@
-package helpers
-
-import (
-	"encoding/json"
-	"errors"
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"net/http"
-)
-
-func ExtractCookieAuth(r *http.Request, config *config.Config) (username *string, err error) {
-	cookie, err := r.Cookie(models.AuthCookieKey)
-	if err != nil {
-		return nil, errors.New("missing authentication")
-	}
-
-	if err := config.Security.SecureCookie.Decode(models.AuthCookieKey, cookie.Value, &username); err != nil {
-		return nil, errors.New("cookie is invalid")
-	}
-
-	return username, nil
-}
-
-func RespondJSON(w http.ResponseWriter, r *http.Request, status int, object interface{}) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(status)
-	if err := json.NewEncoder(w).Encode(object); err != nil {
-		config.Log().Request(r).Error("error while writing json response: %v", err)
-	}
-}

helpers/summary.go

@@ -1,150 +0,0 @@
-package helpers
-
-import (
-	"errors"
-	"github.com/muety/wakapi/models"
-	"github.com/muety/wakapi/utils"
-	"net/http"
-	"time"
-)
-
-func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {
-	user := extractUser(r)
-	params := r.URL.Query()
-
-	var err error
-	var from, to time.Time
-
-	if interval := params.Get("interval"); interval != "" {
-		err, from, to = ResolveIntervalRawTZ(interval, user.TZ())
-	} else if start := params.Get("start"); start != "" {
-		err, from, to = ResolveIntervalRawTZ(start, user.TZ())
-	} else {
-		from, err = ParseDateTimeTZ(params.Get("from"), user.TZ())
-		if err != nil {
-			return nil, errors.New("missing or invalid 'from' parameter")
-		}
-
-		to, err = ParseDateTimeTZ(params.Get("to"), user.TZ())
-		if err != nil {
-			return nil, errors.New("missing or invalid 'to' parameter")
-		}
-	}
-
-	recompute := params.Get("recompute") != "" && params.Get("recompute") != "false"
-
-	filters := ParseSummaryFilters(r)
-
-	return &models.SummaryParams{
-		From:      from,
-		To:        to,
-		User:      user,
-		Recompute: recompute,
-		Filters:   filters,
-	}, nil
-}
-
-func ParseSummaryFilters(r *http.Request) *models.Filters {
-	filters := &models.Filters{}
-	if q := r.URL.Query().Get("project"); q != "" {
-		filters.With(models.SummaryProject, q)
-	}
-	if q := r.URL.Query().Get("language"); q != "" {
-		filters.With(models.SummaryLanguage, q)
-	}
-	if q := r.URL.Query().Get("editor"); q != "" {
-		filters.With(models.SummaryEditor, q)
-	}
-	if q := r.URL.Query().Get("machine"); q != "" {
-		filters.With(models.SummaryMachine, q)
-	}
-	if q := r.URL.Query().Get("operating_system"); q != "" {
-		filters.With(models.SummaryOS, q)
-	}
-	if q := r.URL.Query().Get("label"); q != "" {
-		filters.With(models.SummaryLabel, q)
-	}
-	if q := r.URL.Query().Get("branch"); q != "" {
-		filters.With(models.SummaryBranch, q)
-	}
-	if q := r.URL.Query().Get("entity"); q != "" {
-		filters.With(models.SummaryBranch, q)
-	}
-	return filters
-}
-
-func extractUser(r *http.Request) *models.User {
-	type principalGetter interface {
-		GetPrincipal() *models.User
-	}
-	if p := r.Context().Value("principal"); p != nil {
-		return p.(principalGetter).GetPrincipal()
-	}
-	return nil
-}
-
-func ParseInterval(interval string) (*models.IntervalKey, error) {
-	for _, i := range models.AllIntervals {
-		if i.HasAlias(interval) {
-			return i, nil
-		}
-	}
-	return nil, errors.New("not a valid interval")
-}
-
-func MustResolveIntervalRawTZ(interval string, tz *time.Location) (from, to time.Time) {
-	_, from, to = ResolveIntervalRawTZ(interval, tz)
-	return from, to
-}
-
-func ResolveIntervalRawTZ(interval string, tz *time.Location) (err error, from, to time.Time) {
-	parsed, err := ParseInterval(interval)
-	if err != nil {
-		return err, time.Time{}, time.Time{}
-	}
-	return ResolveIntervalTZ(parsed, tz)
-}
-
-func ResolveIntervalTZ(interval *models.IntervalKey, tz *time.Location) (err error, from, to time.Time) {
-	now := time.Now().In(tz)
-	to = now
-
-	switch interval {
-	case models.IntervalToday:
-		from = utils.BeginOfToday(tz)
-	case models.IntervalYesterday:
-		from = utils.BeginOfToday(tz).Add(-24 * time.Hour)
-		to = utils.BeginOfToday(tz)
-	case models.IntervalThisWeek:
-		from = utils.BeginOfThisWeek(tz)
-	case models.IntervalLastWeek:
-		from = utils.BeginOfThisWeek(tz).AddDate(0, 0, -7)
-		to = utils.BeginOfThisWeek(tz)
-	case models.IntervalThisMonth:
-		from = utils.BeginOfThisMonth(tz)
-	case models.IntervalLastMonth:
-		from = utils.BeginOfThisMonth(tz).AddDate(0, -1, 0)
-		to = utils.BeginOfThisMonth(tz)
-	case models.IntervalThisYear:
-		from = utils.BeginOfThisYear(tz)
-	case models.IntervalPast7Days:
-		from = now.AddDate(0, 0, -7)
-	case models.IntervalPast7DaysYesterday:
-		from = utils.BeginOfToday(tz).AddDate(0, 0, -1).AddDate(0, 0, -7)
-		to = utils.BeginOfToday(tz).AddDate(0, 0, -1)
-	case models.IntervalPast14Days:
-		from = now.AddDate(0, 0, -14)
-	case models.IntervalPast30Days:
-		from = now.AddDate(0, 0, -30)
-	case models.IntervalPast6Months:
-		from = now.AddDate(0, -6, 0)
-	case models.IntervalPast12Months:
-		from = now.AddDate(0, -12, 0)
-	case models.IntervalAny:
-		from = time.Time{}
-	default:
-		err = errors.New("invalid interval")
-	}
-
-	return err, from, to
-}

main.go

@@ -1,52 +1,34 @@
 package main
 
+//go:generate $GOPATH/bin/pkger
+
 import (
-	"embed"
+	"github.com/emvi/logbuch"
-	"flag"
+	"github.com/gorilla/handlers"
-	"io/fs"
+	"github.com/markbates/pkger"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/migrations"
+	"github.com/muety/wakapi/repositories"
+	"gorm.io/gorm/logger"
 	"log"
-	"net"
 	"net/http"
 	"os"
 	"strconv"
 	"time"
 
-	"github.com/emvi/logbuch"
+	"github.com/gorilla/mux"
-	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/middlewares"
-	middleware "github.com/go-chi/chi/v5/middleware"
+	customMiddleware "github.com/muety/wakapi/middlewares/custom"
-	"github.com/lpar/gzipped/v2"
+	"github.com/muety/wakapi/routes"
-	httpSwagger "github.com/swaggo/http-swagger"
+	shieldsV1Routes "github.com/muety/wakapi/routes/compat/shields/v1"
+	wtV1Routes "github.com/muety/wakapi/routes/compat/wakatime/v1"
+	"github.com/muety/wakapi/services"
 	_ "gorm.io/driver/mysql"
 	_ "gorm.io/driver/postgres"
 	_ "gorm.io/driver/sqlite"
 	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-
-	conf "github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/middlewares"
-	"github.com/muety/wakapi/migrations"
-	"github.com/muety/wakapi/repositories"
-	"github.com/muety/wakapi/routes"
-	"github.com/muety/wakapi/routes/api"
-	shieldsV1Routes "github.com/muety/wakapi/routes/compat/shields/v1"
-	wtV1Routes "github.com/muety/wakapi/routes/compat/wakatime/v1"
-	"github.com/muety/wakapi/routes/relay"
-	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/services/mail"
-	docs "github.com/muety/wakapi/static/docs"
-	fsutils "github.com/muety/wakapi/utils/fs"
 )
 
-// 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
@@ -57,12 +39,8 @@ var (
 	heartbeatRepository       repositories.IHeartbeatRepository
 	userRepository            repositories.IUserRepository
 	languageMappingRepository repositories.ILanguageMappingRepository
-	projectLabelRepository    repositories.IProjectLabelRepository
 	summaryRepository         repositories.ISummaryRepository
-	leaderboardRepository     *repositories.LeaderboardRepository
 	keyValueRepository        repositories.IKeyValueRepository
-	diagnosticsRepository     repositories.IDiagnosticsRepository
-	metricsRepository         *repositories.MetricsRepository
 )
 
 var (
@@ -70,53 +48,16 @@ var (
 	heartbeatService       services.IHeartbeatService
 	userService            services.IUserService
 	languageMappingService services.ILanguageMappingService
-	projectLabelService    services.IProjectLabelService
-	durationService        services.IDurationService
 	summaryService         services.ISummaryService
-	leaderboardService     services.ILeaderboardService
 	aggregationService     services.IAggregationService
-	mailService            services.IMailService
 	keyValueService        services.IKeyValueService
-	reportService          services.IReportService
-	diagnosticsService     services.IDiagnosticsService
-	housekeepingService    services.IHousekeepingService
 	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
-
 func main() {
-	var versionFlag = flag.Bool("version", false, "print version")
+	config = conf.Load()
-	var configFlag = flag.String("config", conf.DefaultConfigPath, "config file location")
-	flag.Parse()
-
-	if *versionFlag {
-		print(version)
-		os.Exit(0)
-	}
-	config = conf.Load(*configFlag, version)
-
-	// Configure Swagger docs
-	docs.SwaggerInfo.BasePath = config.Server.BasePath + "/api"
 
 	// Set log level
 	if config.IsDev() {
@@ -124,7 +65,6 @@ func main() {
 	} else {
 		logbuch.SetLevel(logbuch.LevelInfo)
 	}
-	logbuch.Info("Wakapi " + version)
 
 	// Set up GORM
 	gormLogger := logger.New(
@@ -138,17 +78,15 @@ func main() {
 
 	// Connect to database
 	var err error
-	logbuch.Info("starting with %s database", config.Db.Dialect)
+	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger})
-	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger}, conf.GetWakapiDBOpts(&config.Db))
+	if config.Db.Dialect == "sqlite3" {
-	if err != nil {
+		db.Raw("PRAGMA foreign_keys = ON;")
-		logbuch.Error(err.Error())
-		logbuch.Fatal("could not open database")
 	}
 
 	if config.IsDev() {
 		db = db.Debug()
 	}
-	sqlDb, err := db.DB()
+	sqlDb, _ := db.DB()
 	sqlDb.SetMaxIdleConns(int(config.Db.MaxConn))
 	sqlDb.SetMaxOpenConns(int(config.Db.MaxConn))
 	if err != nil {
@@ -158,201 +96,131 @@ func main() {
 	defer sqlDb.Close()
 
 	// Migrate database schema
-	if !config.SkipMigrations {
+	migrations.RunPreMigrations(db, config)
-		migrations.Run(db, config)
+	runDatabaseMigrations()
-	}
+	migrations.RunCustomPostMigrations(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)
-	leaderboardRepository = repositories.NewLeaderboardRepository(db)
 	keyValueRepository = repositories.NewKeyValueRepository(db)
-	diagnosticsRepository = repositories.NewDiagnosticsRepository(db)
-	metricsRepository = repositories.NewMetricsRepository(db)
 
 	// Services
-	mailService = mail.NewMailService()
 	aliasService = services.NewAliasService(aliasRepository)
-	userService = services.NewUserService(mailService, userRepository)
+	userService = services.NewUserService(userRepository)
 	languageMappingService = services.NewLanguageMappingService(languageMappingRepository)
-	projectLabelService = services.NewProjectLabelService(projectLabelRepository)
 	heartbeatService = services.NewHeartbeatService(heartbeatRepository, languageMappingService)
-	durationService = services.NewDurationService(heartbeatService)
+	summaryService = services.NewSummaryService(summaryRepository, heartbeatService, aliasService)
-	summaryService = services.NewSummaryService(summaryRepository, durationService, aliasService, projectLabelService)
-	leaderboardService = services.NewLeaderboardService(leaderboardRepository, summaryService, userService)
 	aggregationService = services.NewAggregationService(userService, summaryService, heartbeatService)
 	keyValueService = services.NewKeyValueService(keyValueRepository)
-	reportService = services.NewReportService(summaryService, userService, mailService)
+	miscService = services.NewMiscService(userService, summaryService, keyValueService)
-	diagnosticsService = services.NewDiagnosticsService(diagnosticsRepository)
-	housekeepingService = services.NewHousekeepingService(userService, heartbeatService, summaryService)
-	miscService = services.NewMiscService(userService, heartbeatService, summaryService, keyValueService, mailService)
 
 	// Schedule background tasks
-	go conf.StartJobs()
 	go aggregationService.Schedule()
-	go leaderboardService.Schedule()
+	go miscService.ScheduleCountTotalTime()
-	go reportService.Schedule()
+
-	go housekeepingService.Schedule()
+	// TODO: move endpoint registration to the respective routes files
-	go miscService.Schedule()
 
 	routes.Init()
 
-	// API Handlers
+	// Handlers
-	healthApiHandler := api.NewHealthApiHandler(db)
+	summaryHandler := routes.NewSummaryHandler(summaryService)
-	heartbeatApiHandler := api.NewHeartbeatApiHandler(userService, heartbeatService, languageMappingService)
+	healthHandler := routes.NewHealthHandler(db)
-	summaryApiHandler := api.NewSummaryApiHandler(userService, summaryService)
+	heartbeatHandler := routes.NewHeartbeatHandler(heartbeatService, languageMappingService)
-	metricsHandler := api.NewMetricsHandler(userService, summaryService, heartbeatService, keyValueService, metricsRepository)
+	settingsHandler := routes.NewSettingsHandler(userService, summaryService, aliasService, aggregationService, languageMappingService)
-	diagnosticsHandler := api.NewDiagnosticsApiHandler(userService, diagnosticsService)
+	homeHandler := routes.NewHomeHandler(keyValueService)
-	avatarHandler := api.NewAvatarHandler()
+	loginHandler := routes.NewLoginHandler(userService)
-	badgeHandler := api.NewBadgeHandler(userService, summaryService)
+	imprintHandler := routes.NewImprintHandler(keyValueService)
-
+	wakatimeV1AllHandler := wtV1Routes.NewAllTimeHandler(summaryService)
-	// Compat Handlers
+	wakatimeV1SummariesHandler := wtV1Routes.NewSummariesHandler(summaryService)
-	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
+	// Setup Routers
-	summaryHandler := routes.NewSummaryHandler(summaryService, userService, keyValueService)
+	router := mux.NewRouter()
-	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, projectLabelService, keyValueService, mailService)
+	publicRouter := router.PathPrefix("/").Subrouter()
-	subscriptionHandler := routes.NewSubscriptionHandler(userService, mailService, keyValueService)
+	settingsRouter := publicRouter.PathPrefix("/settings").Subrouter()
-	leaderboardHandler := routes.NewLeaderboardHandler(userService, leaderboardService)
+	summaryRouter := publicRouter.PathPrefix("/summary").Subrouter()
-	homeHandler := routes.NewHomeHandler(keyValueService)
+	apiRouter := router.PathPrefix("/api").Subrouter()
-	loginHandler := routes.NewLoginHandler(userService, mailService)
+	summaryApiRouter := apiRouter.PathPrefix("/summary").Subrouter()
-	imprintHandler := routes.NewImprintHandler(keyValueService)
+	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()
 
-	// Other Handlers
+	// Middlewares
-	relayHandler := relay.NewRelayHandler()
+	recoveryMiddleware := handlers.RecoveryHandler()
-
+	loggingMiddleware := middlewares.NewLoggingMiddleware(
-	// Setup Routing
+		// Use logbuch here once https://github.com/emvi/logbuch/issues/4 is realized
-	router := chi.NewRouter()
+		log.New(os.Stdout, "", log.LstdFlags),
-	router.Use(
-		middleware.CleanPath,
-		middleware.StripSlashes,
-		middleware.Recoverer,
-		middlewares.NewPrincipalMiddleware(),
-		middlewares.NewLoggingMiddleware(logbuch.Info, []string{
-			"/assets",
-			"/favicon",
-			"/service-worker.js",
-			"/api/health",
-			"/api/avatar",
-		}),
 	)
-	if config.Sentry.Dsn != "" {
+	corsMiddleware := handlers.CORS()
-		router.Use(middlewares.NewSentryMiddleware())
+	authenticateMiddleware := middlewares.NewAuthenticateMiddleware(
-	}
+		userService,
+		[]string{"/api/health", "/api/compat/shields/v1"},
+	).Handler
+	wakatimeRelayMiddleware := customMiddleware.NewWakatimeRelayMiddleware().Handler
 
-	// Setup Sub Routers
+	// Router configs
-	rootRouter := chi.NewRouter()
+	router.Use(loggingMiddleware, recoveryMiddleware)
-	rootRouter.Use(middlewares.NewSecurityMiddleware())
+	summaryRouter.Use(authenticateMiddleware)
-
+	settingsRouter.Use(authenticateMiddleware)
-	apiRouter := chi.NewRouter()
+	apiRouter.Use(corsMiddleware, authenticateMiddleware)
-
+	heartbeatApiRouter.Use(wakatimeRelayMiddleware)
-	// Hook sub routers
-	router.Mount("/", rootRouter)
-	router.Mount("/api", apiRouter)
 
 	// Route registrations
-	homeHandler.RegisterRoutes(rootRouter)
+	homeHandler.RegisterRoutes(publicRouter)
-	loginHandler.RegisterRoutes(rootRouter)
+	loginHandler.RegisterRoutes(publicRouter)
-	imprintHandler.RegisterRoutes(rootRouter)
+	imprintHandler.RegisterRoutes(publicRouter)
-	summaryHandler.RegisterRoutes(rootRouter)
+	summaryHandler.RegisterRoutes(summaryRouter)
-	leaderboardHandler.RegisterRoutes(rootRouter)
+	settingsHandler.RegisterRoutes(settingsRouter)
-	settingsHandler.RegisterRoutes(rootRouter)
-	subscriptionHandler.RegisterRoutes(rootRouter)
-	relayHandler.RegisterRoutes(rootRouter)
 
-	// API route registrations
+	// API Route registrations
-	summaryApiHandler.RegisterRoutes(apiRouter)
+	summaryHandler.RegisterAPIRoutes(summaryApiRouter)
-	healthApiHandler.RegisterRoutes(apiRouter)
+	healthHandler.RegisterAPIRoutes(healthApiRouter)
-	heartbeatApiHandler.RegisterRoutes(apiRouter)
+	heartbeatHandler.RegisterAPIRoutes(heartbeatApiRouter)
-	metricsHandler.RegisterRoutes(apiRouter)
+	wakatimeV1AllHandler.RegisterAPIRoutes(wakatimeV1Router)
-	diagnosticsHandler.RegisterRoutes(apiRouter)
+	wakatimeV1SummariesHandler.RegisterAPIRoutes(wakatimeV1Router)
-	avatarHandler.RegisterRoutes(apiRouter)
+	shieldV1BadgeHandler.RegisterAPIRoutes(shieldsV1Router)
-	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
-	// https://github.com/golang/go/issues/43431
+	router.PathPrefix("/assets").Handler(http.FileServer(pkger.Dir("/static")))
-	embeddedStatic, _ := fs.Sub(staticFiles, "static")
-	static := conf.ChooseFS("static", embeddedStatic)
-
-	assetsStaticFs := fsutils.NewExistsHttpFS(fsutils.NewExistsFS(static).WithCache(!config.IsDev()))
-	assetsFileServer := http.FileServer(assetsStaticFs)
-	if !config.IsDev() {
-		assetsFileServer = gzipped.FileServer(assetsStaticFs)
-	}
-	staticFileServer := http.FileServer(http.FS(fsutils.NeuteredFileSystem{FS: static}))
-
-	router.Get("/contribute.json", staticFileServer.ServeHTTP)
-	router.Get("/assets/*", assetsFileServer.ServeHTTP)
-	router.Get("/swagger-ui", http.RedirectHandler("swagger-ui/", http.StatusMovedPermanently).ServeHTTP) // https://github.com/swaggo/http-swagger/issues/44
-	router.Get("/swagger-ui/*", httpSwagger.WrapHandler)
 
 	// Listen HTTP
 	listen(router)
 }
 
 func listen(handler http.Handler) {
-	var s4, s6, sSocket *http.Server
+	var s4, s6 *http.Server
 
 	// IPv4
-	if config.Server.ListenIpV4 != "-" && config.Server.ListenIpV4 != "" {
+	if config.Server.ListenIpV4 != "" {
 		bindString4 := config.Server.ListenIpV4 + ":" + strconv.Itoa(config.Server.Port)
 		s4 = &http.Server{
 			Handler:      handler,
 			Addr:         bindString4,
-			ReadTimeout:  time.Duration(config.Server.TimeoutSec) * time.Second,
+			ReadTimeout:  10 * time.Second,
-			WriteTimeout: time.Duration(config.Server.TimeoutSec) * time.Second,
+			WriteTimeout: 10 * time.Second,
 		}
 	}
 
 	// IPv6
-	if config.Server.ListenIpV6 != "-" && config.Server.ListenIpV6 != "" {
+	if config.Server.ListenIpV6 != "" {
 		bindString6 := "[" + config.Server.ListenIpV6 + "]:" + strconv.Itoa(config.Server.Port)
 		s6 = &http.Server{
 			Handler:      handler,
 			Addr:         bindString6,
-			ReadTimeout:  time.Duration(config.Server.TimeoutSec) * time.Second,
+			ReadTimeout:  10 * time.Second,
-			WriteTimeout: time.Duration(config.Server.TimeoutSec) * time.Second,
+			WriteTimeout: 10 * time.Second,
-		}
-	}
-
-	// UNIX domain socket
-	if config.Server.ListenSocket != "-" && 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,
 		}
 	}
 
 	if config.UseTLS() {
 		if s4 != nil {
-			logbuch.Info("👉 Listening for HTTPS on %s... ✅", s4.Addr)
+			logbuch.Info("--> Listening for HTTPS on %s... ✅", s4.Addr)
 			go func() {
 				if err := s4.ListenAndServeTLS(config.Server.TlsCertPath, config.Server.TlsKeyPath); err != nil {
 					logbuch.Fatal(err.Error())
@@ -360,31 +228,16 @@ func listen(handler http.Handler) {
 			}()
 		}
 		if s6 != nil {
-			logbuch.Info("👉 Listening for HTTPS on %s... ✅", s6.Addr)
+			logbuch.Info("--> Listening for HTTPS on %s... ✅", s6.Addr)
 			go func() {
 				if err := s6.ListenAndServeTLS(config.Server.TlsCertPath, config.Server.TlsKeyPath); err != nil {
 					logbuch.Fatal(err.Error())
 				}
 			}()
 		}
-		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 := os.Chmod(config.Server.ListenSocket, os.FileMode(config.Server.ListenSocketMode)); err != nil {
-					logbuch.Warn("failed to set user permissions for unix socket, %v", err)
-				}
-				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)
+			logbuch.Info("--> Listening for HTTP on %s... ✅", s4.Addr)
 			go func() {
 				if err := s4.ListenAndServe(); err != nil {
 					logbuch.Fatal(err.Error())
@@ -392,29 +245,20 @@ func listen(handler http.Handler) {
 			}()
 		}
 		if s6 != nil {
-			logbuch.Info("👉 Listening for HTTP on %s... ✅", s6.Addr)
+			logbuch.Info("--> Listening for HTTP on %s... ✅", s6.Addr)
 			go func() {
 				if err := s6.ListenAndServe(); err != nil {
 					logbuch.Fatal(err.Error())
 				}
 			}()
 		}
-		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 := os.Chmod(config.Server.ListenSocket, os.FileMode(config.Server.ListenSocketMode)); err != nil {
-					logbuch.Warn("failed to set user permissions for unix socket, %v", err)
-				}
-				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,57 +1,30 @@
 package middlewares
 
 import (
+	"context"
 	"fmt"
-	"github.com/muety/wakapi/helpers"
-	"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
-	optionalForPaths     []string
+	whitelistPaths []string
-	redirectTarget       string // optional
-	redirectErrorMessage string // optional
 }
 
-func NewAuthenticateMiddleware(userService services.IUserService) *AuthenticateMiddleware {
+func NewAuthenticateMiddleware(userService services.IUserService, whitelistPaths []string) *AuthenticateMiddleware {
 	return &AuthenticateMiddleware{
 		config:         conf.Get(),
 		userSrvc:       userService,
-		optionalForPaths: []string{},
+		whitelistPaths: whitelistPaths,
 	}
 }
 
-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) WithRedirectErrorMessage(message string) *AuthenticateMiddleware {
-	m.redirectErrorMessage = message
-	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)
@@ -59,51 +32,35 @@ 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.tryGetUserByApiKeyHeader(r)
+		user, err = m.tryGetUserByApiKey(r)
 	}
+
 	if err != nil {
-		user, err = m.tryGetUserByApiKeyQuery(r)
+		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 {
-			if m.redirectErrorMessage != "" {
+			http.SetCookie(w, m.config.GetClearCookie(models.AuthCookieKey, "/"))
-				session, _ := conf.GetSessionStore().Get(r, conf.SessionKeyDefault)
+			http.Redirect(w, r, fmt.Sprintf("%s/?error=unauthorized", m.config.Server.BasePath), http.StatusFound)
-				session.AddFlash(m.redirectErrorMessage, "error")
-				session.Save(r, w)
-			}
-			http.SetCookie(w, m.config.GetClearCookie(models.AuthCookieKey))
-			http.Redirect(w, r, m.redirectTarget, http.StatusFound)
 		}
 		return
 	}
 
-	SetPrincipal(r, user)
+	ctx := context.WithValue(r.Context(), models.UserKey, user)
-	next(w, r)
+	next(w, r.WithContext(ctx))
 }
 
-func (m *AuthenticateMiddleware) isOptional(requestPath string) bool {
+func (m *AuthenticateMiddleware) tryGetUserByApiKey(r *http.Request) (*models.User, error) {
-	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
@@ -118,22 +75,8 @@ func (m *AuthenticateMiddleware) tryGetUserByApiKeyHeader(r *http.Request) (*mod
 	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 := helpers.ExtractCookieAuth(r, m.config)
+	username, err := utils.ExtractCookieAuth(r, m.config)
 	if err != nil {
 		return nil, err
 	}

middlewares/authenticate_test.go

@@ -3,16 +3,14 @@ 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_tryGetUserByApiKeyHeader_Success(t *testing.T) {
+func TestAuthenticateMiddleware_tryGetUserByApiKey_Success(t *testing.T) {
 	testApiKey := "z5uig69cn9ut93n"
 	testToken := base64.StdEncoding.EncodeToString([]byte(testApiKey))
 	testUser := &models.User{ApiKey: testApiKey}
@@ -26,15 +24,15 @@ func TestAuthenticateMiddleware_tryGetUserByApiKeyHeader_Success(t *testing.T) {
 	userServiceMock := new(mocks.UserServiceMock)
 	userServiceMock.On("GetUserByKey", testApiKey).Return(testUser, nil)
 
-	sut := NewAuthenticateMiddleware(userServiceMock)
+	sut := NewAuthenticateMiddleware(userServiceMock, []string{})
 
-	result, err := sut.tryGetUserByApiKeyHeader(mockRequest)
+	result, err := sut.tryGetUserByApiKey(mockRequest)
 
 	assert.Nil(t, err)
 	assert.Equal(t, testUser, result)
 }
 
-func TestAuthenticateMiddleware_tryGetUserByApiKeyHeader_Invalid(t *testing.T) {
+func TestAuthenticateMiddleware_tryGetUserByApiKey_InvalidHeader(t *testing.T) {
 	testApiKey := "z5uig69cn9ut93n"
 	testToken := base64.StdEncoding.EncodeToString([]byte(testApiKey))
 
@@ -47,57 +45,12 @@ func TestAuthenticateMiddleware_tryGetUserByApiKeyHeader_Invalid(t *testing.T) {
 
 	userServiceMock := new(mocks.UserServiceMock)
 
-	sut := NewAuthenticateMiddleware(userServiceMock)
+	sut := NewAuthenticateMiddleware(userServiceMock, []string{})
 
-	result, err := sut.tryGetUserByApiKeyHeader(mockRequest)
+	result, err := sut.tryGetUserByApiKey(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,30 +3,19 @@ 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"
 )
 
-const maxFailuresPerDay = 100
+/* Middleware to conditionally relay heartbeats to Wakatime */
-
-// WakatimeRelayMiddleware is a middleware to conditionally relay heartbeats to Wakatime (and other compatible services)
 type WakatimeRelayMiddleware struct {
 	httpClient *http.Client
-	hashCache    *cache.Cache
-	failureCache *cache.Cache
-	eventBus     *hub.Hub
 }
 
 func NewWakatimeRelayMiddleware() *WakatimeRelayMiddleware {
@@ -34,9 +23,6 @@ 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(),
 	}
 }
 
@@ -49,34 +35,19 @@ 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)
 
-	ownInstanceId := config.Get().InstanceId
+	if r.Method != http.MethodPost {
-	originInstanceId := r.Header.Get("X-Origin-Instance")
-
-	if r.Method != http.MethodPost || originInstanceId == ownInstanceId {
 		return
 	}
 
-	user := middlewares.GetPrincipal(r)
+	user := r.Context().Value(models.UserKey).(*models.User)
 	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"),
@@ -85,27 +56,23 @@ 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,
-		url,
+		config.WakatimeApiUrl+config.WakatimeApiHeartbeatsEndpoint,
 		bytes.NewReader(body),
 		headers,
-		user,
 	)
 }
 
-func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, headers http.Header, forUser *models.User) {
+func (m *WakatimeRelayMiddleware) send(method, url string, body io.Reader, headers http.Header) {
 	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
 	}
 
@@ -117,80 +84,11 @@ 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 for user %s, got status %d", forUser.ID, response.StatusCode)
+		logbuch.Warn("failed to relay request, got status %d", 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))
-
-	process := func(heartbeat *models.Heartbeat, rawData interface{}) {
-		heartbeat = heartbeat.Hashed()
-		// we didn't see this particular heartbeat before
-		if _, found := m.hashCache.Get(heartbeat.Hash); !found {
-			m.hashCache.SetDefault(heartbeat.Hash, true)
-			newData = append(newData, rawData)
-		}
-	}
-
-	if _, isList := rawData.([]interface{}); isList {
-		for i, hb := range heartbeats {
-			process(hb, rawData.([]interface{})[i])
-		}
-	} else if len(heartbeats) > 0 {
-		process(heartbeats[0], rawData.(interface{}))
-	}
-
-	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

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

@@ -1,71 +0,0 @@
-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
-}
-
-func (c *PrincipalContainer) GetPrincipalIdentity() string {
-	if c.principal == nil {
-		return ""
-	}
-	return c.principal.Identity()
-}
-
-// 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

@@ -1,32 +0,0 @@
-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' *.stripe.com; 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

@@ -1,31 +0,0 @@
-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/00000000_apply_fixtures.go

@@ -0,0 +1,17 @@
+package migrations
+
+import (
+	"github.com/muety/wakapi/config"
+	"gorm.io/gorm"
+)
+
+func init() {
+	f := migrationFunc{
+		name: "000-apply_fixtures",
+		f: func(db *gorm.DB, cfg *config.Config) error {
+			return cfg.GetFixturesFunc(cfg.Db.Dialect)(db)
+		},
+	}
+
+	registerPostMigration(f)
+}

migrations/20201106_migration_cascade_constraints.go

@@ -31,7 +31,13 @@ func init() {
 				return nil
 			}
 
-			if hasRun(name, db) {
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
 				return nil
 			}
 
@@ -58,7 +64,13 @@ func init() {
 				}
 			}
 
-			setHasRun(name, db)
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
 			return nil
 		},
 	}

migrations/20210202_fix_cascade_for_alias_user_constraint.go

@@ -26,7 +26,13 @@ func init() {
 				return nil
 			}
 
-			if hasRun(name, db) {
+			condition := "key = ?"
+			if cfg.Db.Dialect == config.SQLDialectMysql {
+				condition = "`key` = ?"
+			}
+			lookupResult := db.Where(condition, name).First(&models.KeyStringValue{})
+			if lookupResult.Error == nil && lookupResult.RowsAffected > 0 {
+				logbuch.Info("no need to migrate '%s'", name)
 				return nil
 			}
 
@@ -37,7 +43,13 @@ func init() {
 				}
 			}
 
-			setHasRun(name, db)
+			if err := db.Create(&models.KeyStringValue{
+				Key:   name,
+				Value: "done",
+			}).Error; err != nil {
+				return err
+			}
+
 			return nil
 		},
 	}

migrations/20210206_drop_badges_column_add_sharing_flags.go

@@ -1,55 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,37 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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/20220930_drop_heartbeats_entity_idx.go

@@ -1,24 +0,0 @@
-package migrations
-
-import (
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-)
-
-func init() {
-	const name = "20220930-drop_heartbeats_entity_idx"
-	const idxName = "idx_entity"
-
-	f := migrationFunc{
-		name: name,
-		f: func(db *gorm.DB, cfg *config.Config) error {
-			if !db.Migrator().HasTable(&models.Heartbeat{}) || !db.Migrator().HasIndex(&models.Heartbeat{}, idxName) {
-				return nil
-			}
-			return db.Migrator().DropIndex(&models.Heartbeat{}, idxName)
-		},
-	}
-
-	registerPreMigration(f)
-}

migrations/20221002_fix_summary_id_types.go

@@ -1,88 +0,0 @@
-package migrations
-
-import (
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-	"strings"
-)
-
-// fix for https://github.com/muety/wakapi/issues/416
-
-func init() {
-	const name = "20221002-fix_summary_id_types"
-
-	f := migrationFunc{
-		name: name,
-		f: func(db *gorm.DB, cfg *config.Config) error {
-			if cfg.Db.Dialect != config.SQLDialectMysql {
-				return nil
-			}
-
-			if !db.Migrator().HasTable(&models.Summary{}) || !db.Migrator().HasTable(&models.SummaryItem{}) {
-				return nil
-			}
-
-			var currentType string
-			if err := db.
-				Table("information_schema.columns").
-				Select("data_type").
-				Where("table_name = ?", "summary_items").
-				Where("column_name = ?", "summary_id").
-				Limit(1).
-				Row().Scan(&currentType); err != nil {
-				return err
-			}
-
-			if strings.ToLower(currentType) != "int" {
-				if db.Migrator().HasConstraint(&models.SummaryItem{}, "fk_summaries_editors") {
-					if err := db.Migrator().DropConstraint(&models.SummaryItem{}, "fk_summaries_editors"); err != nil {
-						return err
-					}
-				}
-				if db.Migrator().HasConstraint(&models.SummaryItem{}, "fk_summaries_languages") {
-					if err := db.Migrator().DropConstraint(&models.SummaryItem{}, "fk_summaries_languages"); err != nil {
-						return err
-					}
-				}
-				if db.Migrator().HasConstraint(&models.SummaryItem{}, "fk_summaries_machines") {
-					if err := db.Migrator().DropConstraint(&models.SummaryItem{}, "fk_summaries_machines"); err != nil {
-						return err
-					}
-				}
-				if db.Migrator().HasConstraint(&models.SummaryItem{}, "fk_summaries_operating_systems") {
-					if err := db.Migrator().DropConstraint(&models.SummaryItem{}, "fk_summaries_operating_systems"); err != nil {
-						return err
-					}
-				}
-				if db.Migrator().HasConstraint(&models.SummaryItem{}, "fk_summaries_projects") {
-					if err := db.Migrator().DropConstraint(&models.SummaryItem{}, "fk_summaries_projects"); err != nil {
-						return err
-					}
-				}
-				// https://github.com/muety/wakapi/issues/416#issuecomment-1271674792
-				if db.Migrator().HasConstraint(&models.SummaryItem{}, "fk_summary_items_summary") {
-					if err := db.Migrator().DropConstraint(&models.SummaryItem{}, "fk_summary_items_summary"); err != nil {
-						return err
-					}
-				}
-				if db.Migrator().HasConstraint(&models.SummaryItem{}, "fk_summaries_labels") {
-					if err := db.Migrator().DropConstraint(&models.SummaryItem{}, "fk_summaries_labels"); err != nil {
-						return err
-					}
-				}
-
-				if err := db.Migrator().AlterColumn(&models.Summary{}, "id"); err != nil {
-					return err
-				}
-				if err := db.Migrator().AlterColumn(&models.SummaryItem{}, "summary_id"); err != nil {
-					return err
-				}
-			}
-
-			return nil
-		},
-	}
-
-	registerPreMigration(f)
-}

migrations/20221016_drop_rank_column.go

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

migrations/20221028_fix_heartbeats_time_user_idx.go

@@ -1,71 +0,0 @@
-package migrations
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-	"regexp"
-	"strings"
-)
-
-// due to an error in the model definition, idx_time_user used to only cover 'user_id', but not time column
-// if that's the case in the current state of the database, drop the index and let it be recreated by auto migration afterwards
-func init() {
-	const name = "20221028-fix_heartbeats_time_user_idx"
-	f := migrationFunc{
-		name: name,
-		f: func(db *gorm.DB, cfg *config.Config) error {
-			migrator := db.Migrator()
-
-			if !migrator.HasTable(&models.Heartbeat{}) {
-				return nil
-			}
-
-			var drop bool
-			if cfg.Db.IsSQLite() {
-				// sqlite migrator doesn't support GetIndexes() currently
-				var ddl string
-				if err := db.
-					Table("sqlite_schema").
-					Select("sql").
-					Where("type = 'index'").
-					Where("tbl_name = 'heartbeats'").
-					Where("name = 'idx_time_user'").
-					Scan(&ddl).Error; err != nil {
-					return err
-				}
-
-				matches := regexp.MustCompile("(?i)\\((.+)\\)$").FindStringSubmatch(ddl)
-				if len(matches) > 0 && !strings.Contains(matches[0], "`user_id`") || !strings.Contains(matches[0], "`time`") {
-					drop = true
-				}
-			} else {
-				indexes, err := migrator.GetIndexes(&models.Heartbeat{})
-				if err != nil {
-					return err
-				}
-
-				for _, idx := range indexes {
-					if idx.Table() == "heartbeats" && idx.Name() == "idx_time_user" && len(idx.Columns()) == 1 {
-						drop = true
-						break
-					}
-				}
-			}
-
-			if !drop {
-				return nil
-			}
-
-			if err := migrator.DropIndex(&models.Heartbeat{}, "idx_time_user"); err != nil {
-				return err
-			}
-			logbuch.Info("index 'idx_time_user' needs to be recreated, this may take a while")
-
-			return nil
-		},
-	}
-
-	registerPreMigration(f)
-}

migrations/20230219_add_astro_language.go

@@ -1,30 +0,0 @@
-package migrations
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/muety/wakapi/config"
-	"gorm.io/gorm"
-)
-
-func init() {
-	const name = "20230219-add_astro_language"
-	f := migrationFunc{
-		name: name,
-		f: func(db *gorm.DB, cfg *config.Config) error {
-			if hasRun(name, db) {
-				return nil
-			}
-
-			logbuch.Info("running migration '%s'", name)
-
-			if err := db.Exec("UPDATE heartbeats SET language = 'Astro' where language = '' and entity like '%.astro'").Error; err != nil {
-				return err
-			}
-
-			setHasRun(name, db)
-			return nil
-		},
-	}
-
-	registerPostMigration(f)
-}

migrations/20230219_add_subscription_renewal.go

@@ -1,35 +0,0 @@
-package migrations
-
-import (
-	"github.com/emvi/logbuch"
-	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
-	"gorm.io/gorm"
-)
-
-func init() {
-	const name = "20230219-add_subscription_renewal"
-	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.User{}, "subscription_renewal") {
-				logbuch.Info("running migration '%s'", name)
-
-				if err := db.Exec("UPDATE users SET subscription_renewal = subscribed_until WHERE subscribed_until is not null").Error; err != nil {
-					return err
-				}
-			}
-
-			setHasRun(name, db)
-			return nil
-		},
-	}
-
-	registerPostMigration(f)
-}

migrations/fixtures/1_imprint_content.sql

@@ -0,0 +1,8 @@
+-- +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/migrations.go

@@ -3,14 +3,11 @@ package migrations
 import (
 	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
 	"sort"
 	"strings"
 )
 
-type gormMigrationFunc func(db *gorm.DB) error
-
 type migrationFunc struct {
 	f    func(db *gorm.DB, cfg *config.Config) error
 	name string
@@ -23,45 +20,6 @@ var (
 	postMigrations migrationFuncs
 )
 
-func GetMigrationFunc(cfg *config.Config) gormMigrationFunc {
-	switch cfg.Db.Dialect {
-	default:
-		return func(db *gorm.DB) error {
-			if err := db.AutoMigrate(&models.User{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.KeyStringValue{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Alias{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Heartbeat{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Summary{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.SummaryItem{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.LanguageMapping{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.ProjectLabel{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Diagnostics{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.LeaderboardItem{}); err != nil && !cfg.Db.AutoMigrateFailSilently {
-				return err
-			}
-			return nil
-		}
-	}
-}
-
 func registerPreMigration(f migrationFunc) {
 	preMigrations = append(preMigrations, f)
 }
@@ -70,17 +28,9 @@ func registerPostMigration(f migrationFunc) {
 	postMigrations = append(postMigrations, f)
 }
 
-func Run(db *gorm.DB, cfg *config.Config) {
+// NOTE: Currently, migrations themselves keep track
-	RunPreMigrations(db, cfg)
+// of whether they have run, yet or not, because some
-	RunSchemaMigrations(db, cfg)
+// simply run on every start.
-	RunPostMigrations(db, cfg)
-}
-
-func RunSchemaMigrations(db *gorm.DB, cfg *config.Config) {
-	if err := GetMigrationFunc(cfg)(db); err != nil {
-		logbuch.Fatal(err.Error())
-	}
-}
 
 func RunPreMigrations(db *gorm.DB, cfg *config.Config) {
 	sort.Sort(preMigrations)
@@ -88,18 +38,18 @@ func RunPreMigrations(db *gorm.DB, cfg *config.Config) {
 	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)
+			logbuch.Fatal("migration '%s' failed – %v", m.name, err)
 		}
 	}
 }
 
-func RunPostMigrations(db *gorm.DB, cfg *config.Config) {
+func RunCustomPostMigrations(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)
+			logbuch.Fatal("migration '%s' failed – %v", m.name, err)
 		}
 	}
 }

migrations/shared.go

@@ -1,30 +0,0 @@
-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,11 +9,6 @@ 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,11 +29,6 @@ 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

@@ -1,16 +0,0 @@
-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,72 +10,22 @@ type HeartbeatServiceMock struct {
 	mock.Mock
 }
 
-func (m *HeartbeatServiceMock) Insert(h *models.Heartbeat) error {
+func (m *HeartbeatServiceMock) InsertBatch(heartbeats []*models.Heartbeat) error {
-	args := m.Called(h)
+	args := m.Called(heartbeats)
 	return args.Error(0)
 }
 
-func (m *HeartbeatServiceMock) InsertBatch(h []*models.Heartbeat) error {
-	args := m.Called(h)
-	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)
-}
-
-func (m *HeartbeatServiceMock) DeleteByUserBefore(u *models.User, t time.Time) error {
-	args := m.Called(u, t)
-	return args.Error(0)
-}

mocks/project_label_service.go

@@ -1,40 +0,0 @@
-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

@@ -10,18 +10,13 @@ type SummaryRepositoryMock struct {
 	mock.Mock
 }
 
-func (m *SummaryRepositoryMock) Insert(s *models.Summary) error {
+func (m *SummaryRepositoryMock) Insert(summary *models.Summary) error {
-	args := m.Called(s)
+	args := m.Called(summary)
 	return args.Error(0)
 }
 
-func (m *SummaryRepositoryMock) GetAll() ([]*models.Summary, error) {
+func (m *SummaryRepositoryMock) GetByUserWithin(user *models.User, time time.Time, time2 time.Time) ([]*models.Summary, error) {
-	args := m.Called()
+	args := m.Called(user, time, time2)
-	return args.Get(0).([]*models.Summary), args.Error(1)
-}
-
-func (m *SummaryRepositoryMock) GetByUserWithin(u *models.User, t1 time.Time, t2 time.Time) ([]*models.Summary, error) {
-	args := m.Called(u, t1, t2)
 	return args.Get(0).([]*models.Summary), args.Error(1)
 }
 
@@ -34,8 +29,3 @@ func (m *SummaryRepositoryMock) DeleteByUser(s string) error {
 	args := m.Called(s)
 	return args.Error(0)
 }
-
-func (m *SummaryRepositoryMock) DeleteByUserBefore(s string, t time.Time) error {
-	args := m.Called(s, t)
-	return args.Error(0)
-}

mocks/summary_service.go

@@ -1,47 +0,0 @@
-package mocks
-
-import (
-	"github.com/muety/wakapi/models"
-	"github.com/muety/wakapi/models/types"
-	"github.com/stretchr/testify/mock"
-	"time"
-)
-
-type SummaryServiceMock struct {
-	mock.Mock
-}
-
-func (m *SummaryServiceMock) Aliased(t time.Time, t2 time.Time, u *models.User, r types.SummaryRetriever, f *models.Filters, b bool) (*models.Summary, error) {
-	args := m.Called(t, t2, u, r, f)
-	return args.Get(0).(*models.Summary), args.Error(1)
-}
-
-func (m *SummaryServiceMock) Retrieve(t time.Time, t2 time.Time, u *models.User, f *models.Filters) (*models.Summary, error) {
-	args := m.Called(t, t2, u, f)
-	return args.Get(0).(*models.Summary), args.Error(1)
-}
-
-func (m *SummaryServiceMock) Summarize(t time.Time, t2 time.Time, u *models.User, f *models.Filters) (*models.Summary, error) {
-	args := m.Called(t, t2, u, f)
-	return args.Get(0).(*models.Summary), args.Error(1)
-}
-
-func (m *SummaryServiceMock) GetLatestByUser() ([]*models.TimeByUser, error) {
-	args := m.Called()
-	return args.Get(0).([]*models.TimeByUser), args.Error(1)
-}
-
-func (m *SummaryServiceMock) DeleteByUser(s string) error {
-	args := m.Called(s)
-	return args.Error(0)
-}
-
-func (m *SummaryServiceMock) DeleteByUserBefore(s string, t time.Time) error {
-	args := m.Called(s, t)
-	return args.Error(0)
-}
-
-func (m *SummaryServiceMock) Insert(s *models.Summary) error {
-	args := m.Called(s)
-	return args.Error(0)
-}

mocks/user_service.go

@@ -19,58 +19,13 @@ 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) GetMany(s []string) ([]*models.User, error) {
+func (m *UserServiceMock) CreateOrGet(signup *models.Signup) (*models.User, bool, error) {
-	args := m.Called(s)
+	args := m.Called(signup)
-	return args.Get(0).([]*models.User), args.Error(1)
-}
-
-func (m *UserServiceMock) GetManyMapped(s []string) (map[string]*models.User, error) {
-	args := m.Called()
-	return args.Get(0).(map[string]*models.User), args.Error(1)
-}
-
-func (m *UserServiceMock) GetAllByLeaderboard(b bool) ([]*models.User, error) {
-	//TODO implement me
-	panic("implement me")
-}
-
-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) GetUserByStripeCustomerId(s string) (*models.User, error) {
-	args := m.Called(s)
-	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)
 }
 
@@ -94,20 +49,12 @@ func (m *UserServiceMock) ToggleBadges(user *models.User) (*models.User, error)
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
-func (m *UserServiceMock) SetWakatimeApiCredentials(user *models.User, s1, s2 string) (*models.User, error) {
+func (m *UserServiceMock) SetWakatimeApiKey(user *models.User, s string) (*models.User, error) {
-	args := m.Called(user, s1, s2)
+	args := m.Called(user, s)
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
-func (m *UserServiceMock) GenerateResetToken(user *models.User) (*models.User, error) {
+func (m *UserServiceMock) MigrateMd5Password(user *models.User, login *models.Login) (*models.User, error) {
-	args := m.Called(user)
+	args := m.Called(user, login)
 	return args.Get(0).(*models.User), args.Error(1)
 }
-
-func (m *UserServiceMock) FlushCache() {
-	m.Called()
-}
-
-func (m *UserServiceMock) FlushUserCache(s string) {
-	m.Called(s)
-}

models/alias.go

@@ -1,11 +1,5 @@
 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"`

models/compat/shields/v1/badge.go

@@ -1,15 +1,16 @@
 package v1
 
 import (
-	"github.com/muety/wakapi/helpers"
 	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/utils"
+	"time"
 )
 
 // https://shields.io/endpoint
 
 const (
-	defaultLabel = "wakapi.dev"
+	defaultLabel = "coding time"
-	defaultColor = "2F855A"
+	defaultColor = "#2D3748" // not working
 )
 
 type BadgeData struct {
@@ -19,11 +20,18 @@ type BadgeData struct {
 	Color         string `json:"color"`
 }
 
-func NewBadgeDataFrom(summary *models.Summary) *BadgeData {
+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()
+	}
+
 	return &BadgeData{
 		SchemaVersion: 1,
 		Label:         defaultLabel,
-		Message:       helpers.FmtWakatimeDuration(summary.TotalTime()),
+		Message:       utils.FmtWakatimeDuration(total),
 		Color:         defaultColor,
 	}
 }

models/compat/wakatime/v1/all_time.go

@@ -1,47 +1,36 @@
 package v1
 
 import (
-	"github.com/muety/wakapi/helpers"
 	"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 {
+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"`
 }
 
-type AllTimeRange struct {
+func NewAllTimeFrom(summary *models.Summary, filters *models.Filters) *AllTimeViewModel {
-	End       string `json:"end"`
+	var total time.Duration
-	EndDate   string `json:"end_date"`
+	if key := filters.Project; key != "" {
-	Start     string `json:"start"`
+		total = summary.TotalTimeByFilters(filters)
-	StartDate string `json:"start_date"`
+	} else {
-	Timezone  string `json:"timezone"`
+		total = summary.TotalTime()
-}
+	}
 
-func NewAllTimeFrom(summary *models.Summary) *AllTimeViewModel {
-	total := summary.TotalTime()
-	tzName, _ := summary.FromTime.T().Zone()
 	return &AllTimeViewModel{
-		Data: &AllTimeData{
+		Data: &allTimeData{
 			TotalSeconds: float32(total.Seconds()),
-			Text:         helpers.FmtWakatimeDuration(total),
+			Text:         utils.FmtWakatimeDuration(total),
 			IsUpToDate:   true,
-			Range: &AllTimeRange{
-				End:       summary.ToTime.T().Format(time.RFC3339),
-				EndDate:   helpers.FormatDate(summary.ToTime.T()),
-				Start:     summary.FromTime.T().Format(time.RFC3339),
-				StartDate: helpers.FormatDate(summary.FromTime.T()),
-				Timezone:  tzName,
-			},
 		},
 	}
 }

models/compat/wakatime/v1/heartbeat.go

@@ -1,54 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,96 +0,0 @@
-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))
-	}
-
-	// entities omitted intentionally
-
-	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

@@ -2,8 +2,8 @@ package v1
 
 import (
 	"fmt"
-	"github.com/muety/wakapi/helpers"
 	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/utils"
 	"math"
 	"sync"
 	"time"
@@ -13,34 +13,24 @@ 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"`
-	CumulativeTotal *SummariesCumulativeTotal `json:"cummulative_total"` // typo is intended
 }
 
-type SummariesCumulativeTotal struct {
+type summariesData struct {
-	Decimal string  `json:"decimal"`
+	Categories       []*summariesEntry    `json:"categories"`
-	Digital string  `json:"digital"`
+	Dependencies     []*summariesEntry    `json:"dependencies"`
-	Seconds float64 `json:"seconds"`
+	Editors          []*summariesEntry    `json:"editors"`
-	Text    string  `json:"text"`
+	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 {
+type summariesEntry 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"`
-	Entities         []*SummariesEntry    `json:"entities,omitempty"`
-	GrandTotal       *SummariesGrandTotal `json:"grand_total"`
-	Range            *SummariesRange      `json:"range"`
-}
-
-type SummariesEntry struct {
 	Digital      string  `json:"digital"`
 	Hours        int     `json:"hours"`
 	Minutes      int     `json:"minutes"`
@@ -51,7 +41,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"`
@@ -59,7 +49,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"`
@@ -67,8 +57,8 @@ type SummariesRange struct {
 	Timezone string    `json:"timezone"`
 }
 
-func NewSummariesFrom(summaries []*models.Summary) *SummariesViewModel {
+func NewSummariesFrom(summaries []*models.Summary, filters *models.Filters) *SummariesViewModel {
-	data := make([]*SummariesData, len(summaries))
+	data := make([]*summariesData, len(summaries))
 	minDate, maxDate := time.Now().Add(1*time.Second), time.Time{}
 
 	for i, s := range summaries {
@@ -82,48 +72,34 @@ func NewSummariesFrom(summaries []*models.Summary) *SummariesViewModel {
 		}
 	}
 
-	var totalTime time.Duration
-	for _, s := range summaries {
-		totalTime += s.TotalTime()
-	}
-
-	totalHrs, totalMins, totalSecs := totalTime.Hours(), (totalTime - time.Duration(totalTime.Hours())*time.Hour).Minutes(), totalTime.Seconds()
-
 	return &SummariesViewModel{
 		Data:  data,
 		End:   maxDate,
 		Start: minDate,
-		CumulativeTotal: &SummariesCumulativeTotal{
-			Decimal: fmt.Sprintf("%.2f", totalHrs),
-			Digital: fmt.Sprintf("%d:%d", int(totalHrs), int(totalMins)),
-			Seconds: totalSecs,
-			Text:    helpers.FmtWakatimeDuration(totalTime),
-		},
 	}
 }
 
-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{
+	data := &summariesData{
-		Categories:       make([]*SummariesEntry, 0),
+		Categories:       make([]*summariesEntry, 0),
-		Dependencies:     make([]*SummariesEntry, 0),
+		Dependencies:     make([]*summariesEntry, 0),
-		Editors:          make([]*SummariesEntry, len(s.Editors)),
+		Editors:          make([]*summariesEntry, len(s.Editors)),
-		Languages:        make([]*SummariesEntry, len(s.Languages)),
+		Languages:        make([]*summariesEntry, len(s.Languages)),
-		Machines:         make([]*SummariesEntry, len(s.Machines)),
+		Machines:         make([]*summariesEntry, len(s.Machines)),
-		OperatingSystems: make([]*SummariesEntry, len(s.OperatingSystems)),
+		OperatingSystems: make([]*summariesEntry, len(s.OperatingSystems)),
-		Projects:         make([]*SummariesEntry, len(s.Projects)),
+		Projects:         make([]*summariesEntry, len(s.Projects)),
-		Branches:         make([]*SummariesEntry, len(s.Branches)),
+		GrandTotal: &summariesGrandTotal{
-		GrandTotal: &SummariesGrandTotal{
 			Digital:      fmt.Sprintf("%d:%d", totalHrs, totalMins),
 			Hours:        totalHrs,
 			Minutes:      totalMins,
-			Text:         helpers.FmtWakatimeDuration(total),
+			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(),
@@ -133,76 +109,52 @@ func newDataFrom(s *models.Summary) *SummariesData {
 	}
 
 	var wg sync.WaitGroup
+	wg.Add(5)
 
-	wg.Add(1)
+	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)
 
-	wg.Add(1)
+	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)
 
-	wg.Add(1)
+	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)
 
-	wg.Add(1)
+	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)
 
-	wg.Add(1)
+	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)
 
-	wg.Add(1)
-	go func(data *SummariesData) {
-		defer wg.Done()
-		for i, e := range s.Branches {
-			data.Branches[i] = convertEntry(e, s.TotalTimeBy(models.SummaryBranch))
-		}
-	}(data)
-
-	wg.Add(1)
-	go func(data *SummariesData) {
-		defer wg.Done()
-		for i, e := range s.Entities {
-			data.Entities[i] = convertEntry(e, s.TotalTimeBy(models.SummaryEntity))
-		}
-	}(data)
-
-	if s.Branches == nil {
-		data.Branches = nil
-	}
-	if s.Entities == nil {
-		data.Entities = nil
-	}
-
 	wg.Wait()
 	return data
 }
 
-func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *SummariesEntry {
+func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *summariesEntry {
-	total := e.TotalFixed()
+	// 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
 	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())
@@ -211,14 +163,14 @@ 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,
 		Name:         e.Key,
 		Percent:      percentage,
 		Seconds:      secs,
-		Text:         helpers.FmtWakatimeDuration(total),
+		Text:         utils.FmtWakatimeDuration(total),
 		TotalSeconds: total.Seconds(),
 	}
 }

models/compat/wakatime/v1/user.go

@@ -1,55 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,95 +0,0 @@
-package models
-
-import (
-	"fmt"
-	"github.com/emvi/logbuch"
-	"github.com/mitchellh/hashstructure/v2"
-	"time"
-	"unicode"
-)
-
-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"`
-	Entity          string        `json:"entity"`
-	NumHeartbeats   int           `json:"-" hash:"ignore"`
-	GroupHash       string        `json:"-" hash:"ignore"`
-	excludeEntity   bool          `json:"-" hash:"ignore"`
-}
-
-func (d *Duration) HashInclude(field string, v interface{}) (bool, error) {
-	if field == "Entity" {
-		return !d.excludeEntity, nil
-	}
-	if field == "Time" ||
-		field == "Duration" ||
-		field == "NumHeartbeats" ||
-		field == "GroupHash" ||
-		unicode.IsLower(rune(field[0])) {
-		return false, nil
-	}
-	return true, nil
-}
-
-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,
-		Entity:          h.Entity,
-		NumHeartbeats:   1,
-	}
-	return d.Hashed()
-}
-
-func (d *Duration) WithEntityIgnored() *Duration {
-	d.excludeEntity = true
-	return d
-}
-
-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
-	case SummaryEntity:
-		key = d.Entity
-	}
-
-	if key == "" {
-		key = UnknownSummaryKey
-	}
-
-	return key
-}

models/durations.go

@@ -1,46 +0,0 @@
-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,235 +1,45 @@
 package models
 
-import (
-	"fmt"
-	"github.com/emvi/logbuch"
-	"github.com/mitchellh/hashstructure/v2"
-)
-
 type Filters struct {
-	Project  OrFilter
+	Project  string
-	OS       OrFilter
+	OS       string
-	Language OrFilter
+	Language string
-	Editor   OrFilter
+	Editor   string
-	Machine  OrFilter
+	Machine  string
-	Label    OrFilter
-	Branch   OrFilter
-	Entity   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 || (s == "-" && search == "") {
-			return true
-		}
-	}
-	return false
 }
 
 type FilterElement struct {
-	entity uint8
+	Type uint8
-	filter OrFilter
+	Key  string
 }
 
 func NewFiltersWith(entity uint8, key string) *Filters {
-	return NewFilterWithMultiple(entity, []string{key})
-}
-
-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...)
+		return &Filters{Project: key}
 	case SummaryOS:
-		f.OS = append(f.OS, keys...)
+		return &Filters{OS: key}
 	case SummaryLanguage:
-		f.Language = append(f.Language, keys...)
+		return &Filters{Language: key}
 	case SummaryEditor:
-		f.Editor = append(f.Editor, keys...)
+		return &Filters{Editor: key}
 	case SummaryMachine:
-		f.Machine = append(f.Machine, keys...)
+		return &Filters{Machine: key}
-	case SummaryLabel:
-		f.Label = append(f.Label, keys...)
-	case SummaryBranch:
-		f.Branch = append(f.Branch, keys...)
-	case SummaryEntity:
-		f.Entity = append(f.Entity, keys...)
 	}
-	return f
+	return &Filters{}
 }
 
-func (f *Filters) One() (bool, uint8, OrFilter) {
+func (f *Filters) One() (bool, uint8, string) {
-	if f.Project != nil && f.Project.Exists() {
+	if f.Project != "" {
 		return true, SummaryProject, f.Project
-	} else if f.OS != nil && f.OS.Exists() {
+	} else if f.OS != "" {
 		return true, SummaryOS, f.OS
-	} else if f.Language != nil && f.Language.Exists() {
+	} else if f.Language != "" {
 		return true, SummaryLanguage, f.Language
-	} else if f.Editor != nil && f.Editor.Exists() {
+	} else if f.Editor != "" {
 		return true, SummaryEditor, f.Editor
-	} else if f.Machine != nil && f.Machine.Exists() {
+	} else if f.Machine != "" {
 		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
-	} else if f.Entity != nil && f.Entity.Exists() {
-		return true, SummaryEntity, f.Entity
 	}
-	return false, 0, OrFilter{}
+	return false, 0, ""
-}
-
-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 <= SummaryEntity; 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 <= SummaryEntity; 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
-	case SummaryEntity:
-		return &f.Entity
-	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
-	}
-	// no aliases for entites / files
-	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
-}
-
-func (f *Filters) IsProjectDetails() bool {
-	return f != nil && f.Project != nil && f.Project.Exists()
 }

models/filters_test.go

@@ -1,160 +0,0 @@
-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,49 +4,46 @@ import (
 	"fmt"
 	"github.com/emvi/logbuch"
 	"github.com/mitchellh/hashstructure/v2"
-	"strings"
+	"regexp"
 	"time"
 )
 
 type Heartbeat struct {
-	ID              uint64     `gorm:"primary_key" hash:"ignore"`
+	ID              uint           `gorm:"primary_key" hash:"ignore"`
 	User            *User          `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE;" hash:"ignore"`
-	UserID          string     `json:"-" gorm:"not null; index:idx_time_user; index:idx_user_project"` // idx_user_project is for quickly fetching a user's project list (settings page)
+	UserID          string         `json:"-" gorm:"not null; index:idx_time_user"`
-	Entity          string     `json:"entity" gorm:"not null"`
+	Entity          string         `json:"entity" gorm:"not null; index:idx_entity"`
-	Type            string     `json:"type" gorm:"size:255"`
+	Type            string         `json:"type"`
-	Category        string     `json:"category" gorm:"size:255"`
+	Category        string         `json:"category"`
-	Project         string     `json:"project" gorm:"index:idx_project; index:idx_user_project"`
+	Project         string         `json:"project"`
-	Branch          string     `json:"branch" gorm:"index:idx_branch"`
+	Branch          string         `json:"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
+	Editor          string         `json:"editor"`
-	OperatingSystem string     `json:"operating_system" gorm:"index:idx_operating_system" hash:"ignore"` // ignored because os might be parsed differently by wakatime
+	OperatingSystem string         `json:"operating_system"`
-	Machine         string     `json:"machine" gorm:"index:idx_machine" hash:"ignore"`                   // ignored because wakatime api doesn't return machines currently
+	Machine         string         `json:"machine"`
-	UserAgent       string     `json:"user_agent" hash:"ignore" gorm:"type:varchar(255)"`
+	Time            CustomTime     `json:"time" gorm:"type:timestamp; default:CURRENT_TIMESTAMP; index:idx_time,idx_time_user"`
-	Time            CustomTime `json:"time" gorm:"type:timestamp(3); index:idx_time; index:idx_time_user" swaggertype:"primitive,number"`
 	Hash            string         `json:"-" gorm:"type:varchar(17); uniqueIndex"`
-	Origin          string     `json:"-" hash:"ignore" gorm:"type:varchar(255)"`
+	languageRegex   *regexp.Regexp `hash:"ignore"`
-	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) {
-	maxPrec := -1 // precision / mapping complexity -> more concrete ones shall take precedence
+	if h.languageRegex == nil {
-	for ending, value := range languageMappings {
+		h.languageRegex = regexp.MustCompile(`^.+\.(.+)$`)
-		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) {
@@ -61,10 +58,6 @@ func (h *Heartbeat) GetKey(t uint8) (key string) {
 		key = h.OperatingSystem
 	case SummaryMachine:
 		key = h.Machine
-	case SummaryBranch:
-		key = h.Branch
-	case SummaryEntity:
-		key = h.Entity
 	}
 
 	if key == "" {
@@ -101,20 +94,8 @@ 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

@@ -27,29 +27,16 @@ func TestHeartbeat_Valid_MissingUser(t *testing.T) {
 func TestHeartbeat_Augment(t *testing.T) {
 	testMappings := map[string]string{
 		"py": "Python3",
-		"foo":       "Foo Script",
-		"php":       "PHP 8",
-		"blade.php": "Blade",
 	}
 
-	sut1, sut2, sut3 := &Heartbeat{
+	sut := &Heartbeat{
 		Entity:   "~/dev/file.py",
 		Language: "Python",
-	}, &Heartbeat{
-		Entity:   "~/dev/file.blade.php",
-		Language: "unknown",
-	}, &Heartbeat{
-		Entity:   "~/dev/file.php",
-		Language: "PHP",
 	}
 
-	sut1.Augment(testMappings)
+	sut.Augment(testMappings)
-	sut2.Augment(testMappings)
-	sut3.Augment(testMappings)
 
-	assert.Equal(t, "Python3", sut1.Language)
+	assert.Equal(t, "Python3", sut.Language)
-	assert.Equal(t, "Blade", sut2.Language)
-	assert.Equal(t, "PHP 8", sut3.Language)
 }
 
 func TestHeartbeat_GetKey(t *testing.T) {
@@ -64,42 +51,3 @@ func TestHeartbeat_GetKey(t *testing.T) {
 	assert.Equal(t, UnknownSummaryKey, sut.GetKey(SummaryEditor))
 	assert.Equal(t, UnknownSummaryKey, sut.GetKey(255))
 }
-
-func TestHeartbeat_Hashed(t *testing.T) {
-	var sut1, sut2 *Heartbeat
-
-	// same hash if only non-hashed fields are different
-	sut1 = &Heartbeat{Entity: "file1", Editor: "vscode", Time: CustomTime(time.Unix(1673810732, 0))}
-	sut2 = &Heartbeat{Entity: "file1", Editor: "goland", Time: CustomTime(time.Unix(1673810732, 0))}
-	assert.Equal(t, sut1.Hashed().Hash, sut2.Hashed().Hash)
-
-	// different hash if time is different
-	sut1 = &Heartbeat{Entity: "file1", Editor: "vscode", Time: CustomTime(time.Unix(1673810732, 0))}
-	sut2 = &Heartbeat{Entity: "file1", Editor: "goland", Time: CustomTime(time.Unix(1673810733, 0))}
-	assert.NotEqual(t, sut1.Hashed().Hash, sut2.Hashed().Hash)
-
-	// different hash if any other hashed field is different
-	sut1 = &Heartbeat{Entity: "file1", Editor: "vscode", Time: CustomTime(time.Unix(1673810732, 0))}
-	sut2 = &Heartbeat{Entity: "file2", Editor: "goland", Time: CustomTime(time.Unix(1673810732, 0))}
-	assert.NotEqual(t, sut1.Hashed().Hash, sut2.Hashed().Hash)
-}
-
-func TestHeartbeat_Hashed_NoCollision(t *testing.T) {
-	hashes := map[string]bool{}
-
-	for i := 0; i < 2500; i++ {
-		sut := &Heartbeat{
-			UserID:   "gopher",
-			Entity:   "~/dev/wakapi",
-			Type:     "file",
-			Category: "coding",
-			Project:  "wakapi",
-			Branch:   "master",
-			Language: "go",
-			IsWrite:  false,
-			Time:     CustomTime(time.Unix(1673810732+int64(i), 0)),
-		}
-		assert.NotContains(t, hashes, sut.Hashed().Hash)
-		hashes[sut.Hash] = true
-	}
-}