chore: exclude avatar routes from logging [skip ci]

Non-root user for Docker

.dockerignore

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

.github/workflows/ci.yml

@@ -10,19 +10,19 @@ jobs:
     steps:
 
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.18
+        go-version: ^1.19
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Get dependencies
       run: go get
 
     - name: Unit Tests
-      run: go test ./... -run ./...
+      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: |
@@ -37,12 +37,12 @@ jobs:
 
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.18
+        go-version: ^1.19
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Get dependencies
       run: go get
@@ -71,7 +71,7 @@ jobs:
           Authorization: Basic dGVzdC1hcGkta2V5
 
     - name: Upload SARIF file
-      uses: github/codeql-action/upload-sarif@v1
+      uses: github/codeql-action/upload-sarif@v2
       with:
         sarif_file: mapi.sarif
 
@@ -88,16 +88,37 @@ jobs:
 
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.18
+        go-version: ^1.19
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      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/release.yml

@@ -32,13 +32,13 @@ jobs:
     steps:
 
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.18
+        go-version: ^1.19
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set version
       shell: bash

.gitignore

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

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine AS build-env
+FROM golang:1.19-alpine 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 && \
@@ -16,7 +16,8 @@ RUN mkdir ./data ./app && \
     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/
+    cp /src/entrypoint.sh app/ && \
+    chown 1000:1000 ./data
 
 # Run Stage
 
@@ -27,7 +28,9 @@ RUN mkdir ./data ./app && \
 FROM alpine:3
 WORKDIR /app
 
-RUN apk add --no-cache bash ca-certificates tzdata
+RUN addgroup -g 1000 app && \
+    adduser -u 1000 -G app -s /bin/sh -D app && \
+    apk add --no-cache bash ca-certificates tzdata
 
 # See README.md and config.default.yml for all config options
 ENV ENVIRONMENT=prod \
@@ -42,6 +45,7 @@ ENV ENVIRONMENT=prod \
     WAKAPI_ALLOW_SIGNUP='true'
 
 COPY --from=build-env /staging /
+USER app
 
 EXPOSE 3000
 

LICENSE

@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- 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.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-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>.
+The MIT License (MIT)
+
+Copyright (c) 2016 
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+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
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -4,7 +4,6 @@
 
 <p align="center">
   <img src="https://badges.fw-web.space/github/license/muety/wakapi">
-  <a href="#-treeware"><img src="https://badges.fw-web.space:/treeware/trees/muety/wakapi?color=%234EC820&label=%F0%9F%8C%B3%20trees"></a>
   <a href="https://liberapay.com/muety/"><img src="https://badges.fw-web.space/liberapay/receives/muety.svg?logo=liberapay"></a>
   <img src="https://wakapi.dev/api/badge/n1try/interval:any/project:wakapi?label=wakapi">
   <img src="https://badges.fw-web.space/github/languages/code-size/muety/wakapi">
@@ -36,7 +35,7 @@ Installation instructions can be found below and in the [Wiki](https://github.co
 
 ## 🚀 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
@@ -109,7 +108,7 @@ $ ./wakapi -config wakapi.yml
 
 **Note:** Check the comments in `config.yml` for best practices regarding security configuration and more.
 
-💡 When running Wakapi standalone (without Docker), it is recommended to run it as a [SystemD service](etc/wakapi.service). 
+💡 When running Wakapi standalone (without Docker), it is recommended to run it as a [SystemD service](etc/wakapi.service).
 
 ### 💻 Client setup
 
@@ -137,17 +136,22 @@ You can specify configuration options either via a config file (default: `config
 | YAML key / Env. variable                                                     | Default                                          | Description                                                                                                                                                              |
 |------------------------------------------------------------------------------|--------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `env` /<br>`ENVIRONMENT`                                                     | `dev`                                            | Whether to use development- or production settings                                                                                                                       |
-| `app.aggregation_time` /<br>`WAKAPI_AGGREGATION_TIME`                        | `02:15`                                          | Time of day at which to periodically run summary generation for all users                                                                                                |
-| `app.report_time_weekly` /<br>`WAKAPI_REPORT_TIME_WEEKLY`                    | `fri,18:00`                                      | Week day and time at which to send e-mail reports                                                                                                                        |
+| `app.aggregation_time` /<br>`WAKAPI_AGGREGATION_TIME`                        | `0 15 2 * * *`                                   | Time of day at which to periodically run summary generation for all users                                                                                                |
+| `app.report_time_weekly` /<br>`WAKAPI_REPORT_TIME_WEEKLY`                    | `0 0 18 * * 5`                                   | Week day and time at which to send e-mail reports                                                                                                                        |
+| `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                                                                                                    |
+| `app.data_cleanup_time` /<br>`WAKAPI_DATA_CLEANUP_TIME`                      | `0 0 6 * * 0`                                    | When to perform data cleanup operations (see `app.data_retention_months`)                                                                                                |
 | `app.import_batch_size` /<br>`WAKAPI_IMPORT_BATCH_SIZE`                      | `50`                                             | Size of batches of heartbeats to insert to the database during importing from external services                                                                          |
 | `app.inactive_days` /<br>`WAKAPI_INACTIVE_DAYS`                              | `7`                                              | Number of days after which to consider a user inactive (only for metrics)                                                                                                |
 | `app.heartbeat_max_age /`<br>`WAKAPI_HEARTBEAT_MAX_AGE`                      | `4320h`                                          | Maximum acceptable age of a heartbeat (see [`ParseDuration`](https://pkg.go.dev/time#ParseDuration))                                                                     |
 | `app.custom_languages`                                                       | -                                                | Map from file endings to language names                                                                                                                                  |
 | `app.avatar_url_template` /<br>`WAKAPI_AVATAR_URL_TEMPLATE`                  | (see [`config.default.yml`](config.default.yml)) | URL template for external user avatar images (e.g. from [Dicebear](https://dicebear.com) or [Gravatar](https://gravatar.com))                                            |
+| `app.support_contact` /<br>`WAKAPI_SUPPORT_CONTACT`                          | `hostmaster@wakapi.dev`                          | E-Mail address to display as a support contact on the page                                                                                                               |
+| `app.data_retention_months` /<br>`WAKAPI_DATA_RETENTION_MONTHS`              | `-1`                                             | Maximum retention period in months for user data (heartbeats) (-1 for unlimited)                                                                                         |
 | `server.port` /<br> `WAKAPI_PORT`                                            | `3000`                                           | Port to listen on                                                                                                                                                        |
 | `server.listen_ipv4` /<br> `WAKAPI_LISTEN_IPV4`                              | `127.0.0.1`                                      | IPv4 network address to listen on (leave blank to disable IPv4)                                                                                                          |
 | `server.listen_ipv6` /<br> `WAKAPI_LISTEN_IPV6`                              | `::1`                                            | IPv6 network address to listen on (leave blank to disable IPv6)                                                                                                          |
 | `server.listen_socket` /<br> `WAKAPI_LISTEN_SOCKET`                          | -                                                | UNIX socket to listen on (leave blank to disable UNIX socket)                                                                                                            |
+| `server.listen_socket_mode` /<br> `WAKAPI_LISTEN_SOCKET_MODE`                | `0666`                                           | Permission mode to create UNIX socket with                                                                                                                               |
 | `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)                                                                                                            |
@@ -157,9 +161,11 @@ You can specify configuration options either via a config file (default: `config
 | `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                                                                                                                                                            |
@@ -250,7 +256,7 @@ Wakapi plays well together with [WakaTime](https://wakatime.com). For one thing,
 
 ### 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.
+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)
 
@@ -266,7 +272,7 @@ Wakapi also integrates with [GitHub Readme Stats](https://github.com/anuraghazra
 
 ### 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.
+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:
 
@@ -302,12 +308,13 @@ However, if you want to expose your wakapi instance to the public anyway, you ne
 
 ### 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 -json -coverprofile=coverage/coverage.out ./... -run ./...
+$ CGO_ENABLED=0 go test `go list ./... | grep -v 'github.com/muety/wakapi/scripts'` -json -coverprofile=coverage/coverage.out ./... -run ./...
 ```
 
 ### API tests
@@ -441,10 +448,6 @@ It is unclear how to handle the three minutes in between. Did the developer do a
 Wakapi adds a "padding" of two minutes before the third heartbeat. This is why total times will slightly vary between Wakapi and WakaTime.
 </details>
 
-## 🌳 Treeware
-
-This package is [Treeware](https://treeware.earth). If you use it in production, then we ask that you [**buy the world a tree**](https://plant.treeware.earth/muety/wakapi) to thank us for our work. By contributing to the Treeware forest you’ll be creating employment for local families and restoring wildlife habitats.
-
 ## 👏 Support
 
 Coding in open source is my passion and I would love to do it on a full-time basis and make a living from it one day. So if you like this project, please consider supporting it 🙂. You can donate either through [buying me a coffee](https://buymeacoff.ee/n1try) or becoming a GitHub sponsor. Every little donation is highly appreciated and boosts my motivation to keep improving Wakapi!
@@ -453,9 +456,9 @@ Coding in open source is my passion and I would love to do it on a full-time bas
 
 I highly appreciate the efforts of **[@alanhamlett](https://github.com/alanhamlett)** and the WakaTime team and am thankful for their software being open source.
 
-Moreover, thanks to **[JetBrains](https://jb.gg/OpenSource)** for supporting this project as part of their open-source program.
+Moreover, thanks to **[Frachtwerk](https://frachtwerk.de)** for sponsoring server infrastructure for Wakapi.dev.
 
-![](static/assets/images/jetbrains-logo.png)
+![](.github/assets/frachtwerk_logo.png)
 
 ## 📓 License
 

config.default.yml

@@ -1,9 +1,12 @@
 env: production
+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
@@ -12,16 +15,22 @@ server:
   public_url: http://localhost:3000   # required for links (e.g. password reset) in e-mail
 
 app:
-  aggregation_time: '02:15'                   # time at which to run daily aggregation batch jobs
-  leaderboard_generation_time: '06:00;18:00'  # time at which to run daily aggregation batch jobs
-  report_time_weekly: 'fri,18:00'             # time at which to fan out weekly reports (format: '<weekday)>,<daytime>')
-  inactive_days: 7                            # time of previous days within a user must have logged in to be considered active
-  import_batch_size: 50                       # maximum number of heartbeats to insert into the database within one transaction
-  heartbeat_max_age: '4320h'                  # maximum acceptable age of a heartbeat (see https://pkg.go.dev/time#ParseDuration)
+  aggregation_time: '0 15 2 * * *'                          # 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
+  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
@@ -31,6 +40,7 @@ app:
 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)
@@ -38,13 +48,14 @@ db:
   charset: utf8mb4                    # only used for mysql connections
   max_conn: 2                         # maximum number of concurrent connections to maintain
   ssl: false                          # whether to use tls for db connection (must be true for cockroachdb) (ignored for mysql and sqlite)
-  automgirate_fail_silently: false    # whether to ignore schema auto-migration failures when starting up
+  automigrate_fail_silently: false    # whether to ignore schema auto-migration failures when starting up
 
 security:
   password_salt:                      # change this
   insecure_cookies: true              # should be set to 'false', except when not running with HTTPS (e.g. on localhost)
   cookie_max_age: 172800
   allow_signup: true
+  disable_frontpage: false
   expose_metrics: false
   enable_proxy: false                 # only intended for production instance at wakapi.dev
 
@@ -54,6 +65,15 @@ sentry:
   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']
@@ -71,7 +91,4 @@ mail:
   mailwhale:
     url:
     client_id:
-    client_secret:
-
-quick_start: false                  # whether to skip initial tasks on application startup, like summary generation
-skip_migrations: false              # whether to intentionally not run database migrations, only use for dev purposes
+    client_secret:

config/config.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"github.com/robfig/cron/v3"
 	"io/ioutil"
 	"net/http"
-	"os"
 	"regexp"
+	"strconv"
 	"strings"
 	"time"
 
@@ -15,9 +16,8 @@ import (
 	"github.com/gorilla/securecookie"
 	"github.com/jinzhu/configor"
 	"github.com/muety/wakapi/data"
-	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/utils"
 	uuid "github.com/satori/go.uuid"
-	"gorm.io/gorm"
 )
 
 const (
@@ -27,10 +27,14 @@ const (
 	SQLDialectPostgres = "postgres"
 	SQLDialectSqlite   = "sqlite3"
 
-	KeyLatestTotalTime  = "latest_total_time"
-	KeyLatestTotalUsers = "latest_total_users"
-	KeyLastImportImport = "last_import"
-	KeyNewsbox          = "newsbox"
+	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"
@@ -65,32 +69,39 @@ var cFlag = flag.String("config", defaultConfigPath, "config file location")
 var env string
 
 type appConfig struct {
-	AggregationTime           string                       `yaml:"aggregation_time" default:"02:15" env:"WAKAPI_AGGREGATION_TIME"`
-	LeaderboardGenerationTime string                       `yaml:"leaderboard_generation_time" default:"06:00;18:00" env:"WAKAPI_LEADERBOARD_GENERATION_TIME"`
-	ReportTimeWeekly          string                       `yaml:"report_time_weekly" default:"fri,18:00" env:"WAKAPI_REPORT_TIME_WEEKLY"`
+	AggregationTime           string                       `yaml:"aggregation_time" default:"0 15 2 * * *" env:"WAKAPI_AGGREGATION_TIME"`
+	LeaderboardGenerationTime string                       `yaml:"leaderboard_generation_time" default:"0 0 6 * * *,0 0 18 * * *" env:"WAKAPI_LEADERBOARD_GENERATION_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
+	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"`
@@ -98,21 +109,33 @@ type dbConfig struct {
 	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"`
-	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"`
+	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 {
@@ -154,6 +177,7 @@ type Config struct {
 	Security       securityConfig
 	Db             dbConfig
 	Server         serverConfig
+	Subscriptions  subscriptionsConfig
 	Sentry         sentryConfig
 	Mail           mailConfig
 }
@@ -174,7 +198,7 @@ func (c *Config) createCookie(name, value, path string, maxAge int) *http.Cookie
 		MaxAge:   maxAge,
 		Secure:   !c.Security.InsecureCookies,
 		HttpOnly: true,
-		SameSite: http.SameSiteStrictMode,
+		SameSite: http.SameSiteLaxMode,
 	}
 }
 
@@ -186,68 +210,97 @@ 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 {
-			if err := db.AutoMigrate(&models.User{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.KeyStringValue{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Alias{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Heartbeat{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Summary{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.SummaryItem{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.LanguageMapping{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.ProjectLabel{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.Diagnostics{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			if err := db.AutoMigrate(&models.LeaderboardItem{}); err != nil && !c.Db.AutoMigrateFailSilently {
-				return err
-			}
-			return nil
-		}
-	}
-}
-
 func (c *appConfig) GetCustomLanguages() map[string]string {
-	return cloneStringMap(c.CustomLanguages, false)
+	return utils.CloneStringMap(c.CustomLanguages, false)
 }
 
 func (c *appConfig) GetLanguageColors() map[string]string {
-	return cloneStringMap(c.Colors["languages"], true)
+	return utils.CloneStringMap(c.Colors["languages"], true)
 }
 
 func (c *appConfig) GetEditorColors() map[string]string {
-	return cloneStringMap(c.Colors["editors"], true)
+	return utils.CloneStringMap(c.Colors["editors"], true)
 }
 
 func (c *appConfig) GetOSColors() map[string]string {
-	return cloneStringMap(c.Colors["operating_systems"], true)
+	return utils.CloneStringMap(c.Colors["operating_systems"], true)
 }
 
-func (c *appConfig) GetWeeklyReportDay() time.Weekday {
-	s := strings.Split(c.ReportTimeWeekly, ",")[0]
-	return parseWeekday(s)
+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) GetWeeklyReportTime() string {
-	return strings.Split(c.ReportTimeWeekly, ",")[1]
+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 {
@@ -302,13 +355,6 @@ func readColors() map[string]map[string]string {
 	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"
@@ -322,35 +368,6 @@ func resolveDbDialect(dbType string) string {
 	return dbType
 }
 
-func findString(needle string, haystack []string, defaultVal string) string {
-	for _, s := range haystack {
-		if s == needle {
-			return s
-		}
-	}
-	return defaultVal
-}
-
-func parseWeekday(s string) time.Weekday {
-	switch strings.ToLower(s) {
-	case "mon", strings.ToLower(time.Monday.String()):
-		return time.Monday
-	case "tue", strings.ToLower(time.Tuesday.String()):
-		return time.Tuesday
-	case "wed", strings.ToLower(time.Wednesday.String()):
-		return time.Wednesday
-	case "thu", strings.ToLower(time.Thursday.String()):
-		return time.Thursday
-	case "fri", strings.ToLower(time.Friday.String()):
-		return time.Friday
-	case "sat", strings.ToLower(time.Saturday.String()):
-		return time.Saturday
-	case "sun", strings.ToLower(time.Sunday.String()):
-		return time.Sunday
-	}
-	return time.Monday
-}
-
 func Set(config *Config) {
 	cfg = config
 }
@@ -364,7 +381,7 @@ func Load(version string) *Config {
 
 	flag.Parse()
 
-	if err := configor.New(&configor.Config{}).Load(config, mustReadConfigLocation()); err != nil {
+	if err := configor.New(&configor.Config{}).Load(config, *cFlag); err != nil {
 		logbuch.Fatal("failed to read config: %v", err)
 	}
 
@@ -379,10 +396,19 @@ func Load(version string) *Config {
 	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)
+	blockKey := securecookie.GenerateRandomKey(32)
+	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
 
 	if strings.HasSuffix(config.Server.BasePath, "/") {
 		config.Server.BasePath = config.Server.BasePath[:len(config.Server.BasePath)-1]
@@ -399,8 +425,18 @@ func Load(version string) *Config {
 		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 == "" {
+	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 {
@@ -410,19 +446,38 @@ func Load(version string) *Config {
 		logbuch.Warn("with sqlite, only a single connection is supported") // otherwise 'PRAGMA foreign_keys=ON' would somehow have to be set for every connection in the pool
 		config.Db.MaxConn = 1
 	}
-	if config.Mail.Provider != "" && findString(config.Mail.Provider, emailProviders, "") == "" {
+	if config.Mail.Provider != "" && utils.FindString(config.Mail.Provider, emailProviders, "") == "" {
 		logbuch.Fatal("unknown mail provider '%s'", config.Mail.Provider)
 	}
-	if _, err := time.Parse("15:04", config.App.GetWeeklyReportTime()); err != nil {
-		logbuch.Fatal("invalid interval set for report_time_weekly")
-	}
-	if _, err := time.Parse("15:04", config.App.AggregationTime); err != nil {
-		logbuch.Fatal("invalid interval set for aggregation_time")
-	}
 	if _, err := time.ParseDuration(config.App.HeartbeatMaxAge); err != nil {
 		logbuch.Fatal("invalid duration set for heartbeat_max_age")
 	}
 
+	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,8 +2,9 @@ package config
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestConfig_IsDev(t *testing.T) {
@@ -37,6 +38,28 @@ 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

@@ -2,6 +2,7 @@ package config
 
 import (
 	"fmt"
+
 	"github.com/glebarez/sqlite"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
@@ -54,11 +55,16 @@ func (c *dbConfig) GetDialector() gorm.Dialector {
 }
 
 func mysqlConnectionString(config *dbConfig) string {
-	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=%s&parseTime=true&loc=%s&sql_mode=ANSI_QUOTES",
+	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,
-		config.Host,
-		config.Port,
+		host,
 		config.Name,
 		config.Charset,
 		"Local",
@@ -66,6 +72,10 @@ func mysqlConnectionString(config *dbConfig) string {
 }
 
 func postgresConnectionString(config *dbConfig) string {
+	if len(config.DSN) > 0 {
+		return config.DSN
+	}
+
 	sslmode := "disable"
 	if config.Ssl {
 		sslmode = "require"

config/db_opts.go

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

@@ -0,0 +1,85 @@
+package config
+
+import (
+	"fmt"
+	"github.com/emvi/logbuch"
+	"github.com/muety/artifex/v2"
+	"math"
+	"runtime"
+)
+
+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)
+
+	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

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

@@ -3,7 +3,6 @@ package config
 import (
 	"github.com/emvi/logbuch"
 	"github.com/getsentry/sentry-go"
-	"github.com/muety/wakapi/models"
 	"io"
 	"net/http"
 	"os"
@@ -89,8 +88,8 @@ func (l *SentryWrapperLogger) log(msg string, level sentry.Level) {
 		if h := l.req.Context().Value(sentry.HubContextKey); h != nil {
 			hub := h.(*sentry.Hub)
 			hub.Scope().SetRequest(l.req)
-			if u := getPrincipal(l.req); u != nil {
-				hub.Scope().SetUser(sentry.User{ID: u.ID})
+			if uid := getPrincipal(l.req); uid != "" {
+				hub.Scope().SetUser(sentry.User{ID: uid})
 			}
 			hub.CaptureEvent(event)
 			return
@@ -112,29 +111,25 @@ func initSentry(config sentryConfig, debug bool) {
 		Dsn:              config.Dsn,
 		Debug:            debug,
 		AttachStacktrace: true,
-		TracesSampler: sentry.TracesSamplerFunc(func(ctx sentry.SamplingContext) sentry.Sampled {
-			if !config.EnableTracing {
-				return sentry.SampledFalse
-			}
-
+		EnableTracing:    config.EnableTracing,
+		TracesSampler: func(ctx sentry.SamplingContext) float64 {
 			hub := sentry.GetHubFromContext(ctx.Span.Context())
 			txName := hub.Scope().Transaction()
-
 			for _, ex := range excludedRoutes {
 				if strings.HasPrefix(txName, ex) {
-					return sentry.SampledFalse
+					return 0.0
 				}
 			}
 			if txName == "POST /api/heartbeat" {
-				return sentry.UniformTracesSampler(config.SampleRateHeartbeats).Sample(ctx)
+				return float64(config.SampleRateHeartbeats)
 			}
-			return sentry.UniformTracesSampler(config.SampleRate).Sample(ctx)
-		}),
+			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 u := getPrincipal(req); u != nil {
-						event.User.ID = u.ID
+					if uid := getPrincipal(req); uid != "" {
+						event.User.ID = uid
 					}
 				}
 			}
@@ -145,12 +140,14 @@ func initSentry(config sentryConfig, debug bool) {
 	}
 }
 
-func getPrincipal(r *http.Request) *models.User {
-	type principalGetter interface {
-		GetPrincipal() *models.User
+// 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.(principalGetter).GetPrincipal()
+		return p.(principalIdentityGetter).GetPrincipalIdentity()
 	}
-	return nil
+	return ""
 }

config/session.go

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

@@ -1,14 +0,0 @@
-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,334 +1,605 @@
 {
   "languages": {
     "1C Enterprise": "#814CCC",
+    "2-Dimensional Array": "#38761D",
+    "4D": "#004289",
     "ABAP": "#E8274B",
-    "AGS Script": "#B9D9FF",
-    "AL": "#3AA2B5",
-    "AMPL": "#E6EFBB",
-    "ANTLR": "#9DC3FF",
-    "API Blueprint": "#2ACCA8",
-    "APL": "#8a0707",
-    "ASP.NET": "#9400ff",
-    "ATS": "#1ac620",
-    "ActionScript": "#e3491a",
+    "ABAP CDS": "#555e25",
+    "ActionScript": "#882B0F",
     "Ada": "#02f88c",
-    "Agda": "#467C91",
-    "Alloy": "#cc5c24",
+    "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": "#ca2afe",
-    "Arduino": "#bd79d1",
-    "AspectJ": "#1957b0",
+    "Arc": "#aa2afe",
+    "AsciiDoc": "#73a0c5",
+    "ASL": null,
+    "ASP.NET": "#9400ff",
+    "AspectJ": "#a957b0",
     "Assembly": "#6E4C13",
+    "Astro": "#ff5a03",
     "Asymptote": "#ff0000",
-    "Augeas": "#62331f",
+    "ATS": "#1ac620",
+    "Augeas": "#9CC134",
     "AutoHotkey": "#6594b9",
-    "AutoIt": "#36699B",
+    "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 Sharp": "#178600",
-    "C#": "#5a25a2",
+    "C#": "#178600",
     "C++": "#f34b7d",
-    "CSON": "#244776",
-    "CSS": "#563d7c",
+    "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",
-    "Cirru": "#aaaaff",
+    "Charity": null,
+    "ChucK": "#3f8000",
+    "Cirru": "#ccccff",
     "Clarion": "#db901e",
+    "Clarity": "#5546ff",
     "Classic ASP": "#6a40fd",
-    "Clean": "#3a81ad",
+    "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",
+    "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",
-    "D": "#fcd46d",
-    "DM": "#075ff1",
+    "CUE": "#5886E1",
+    "Curry": "#531242",
+    "CWeb": "#00007a",
+    "Cycript": null,
+    "Cypher": "#34c0eb",
+    "Cython": "#fedf5b",
+    "D": "#ba595e",
     "Dafny": "#FFEC25",
-    "Dart": "#98BAD6",
+    "Darcs Patch": "#8eff23",
+    "Dart": "#00B4AB",
     "DataWeave": "#003a52",
-    "Denizen": "#faf094",
+    "Debian Package Control File": "#D70751",
+    "DenizenScript": "#FBEE96",
     "Dhall": "#dfafff",
+    "DIGITAL Command Language": null,
+    "DirectX 3D File": "#aace60",
+    "DM": "#447265",
     "Dockerfile": "#384d54",
     "Dogescript": "#cca760",
-    "Dylan": "#3ebc27",
+    "DTrace": null,
+    "Dylan": "#6c616e",
     "E": "#ccce35",
+    "Earthly": "#2af0ff",
+    "Easybuild": "#069406",
+    "eC": "#913960",
+    "Ecere Projects": "#913960",
     "ECL": "#8a1267",
+    "ECLiPSe": "#001d9d",
+    "Ecmarkup": "#eb8131",
+    "EditorConfig": "#fff1f2",
+    "Eiffel": "#4d6977",
     "EJS": "#a91e50",
-    "EQ": "#a78649",
-    "Eagle": "#3994bc",
-    "Eiffel": "#946d57",
     "Elixir": "#6e4a7e",
     "Elm": "#60B5CC",
+    "Elvish": "#55BB55",
     "Emacs Lisp": "#c065db",
-    "EmberScript": "#f64e3e",
-    "Erlang": "#0faf8d",
+    "EmberScript": "#FFF4F3",
+    "EQ": "#a78649",
+    "Erlang": "#B83998",
+    "Euphoria": "#FF790B",
     "F#": "#b845fc",
     "F*": "#572e30",
-    "FLUX": "#33CCFF",
-    "FORTRAN": "#4d41b1",
     "Factor": "#636746",
     "Fancy": "#7b9db4",
-    "Fantom": "#dbded5",
+    "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",
-    "Game Maker Language": "#8ad353",
+    "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",
-    "Glyph": "#e4cc98",
+    "Git Attributes": "#F44D27",
+    "Git Config": "#F44D27",
+    "Git Revision List": "#F44D27",
+    "Gleam": "#ffaff3",
+    "GLSL": "#5686a5",
+    "Glyph": "#c1ac7f",
     "Gnuplot": "#f0a9f0",
-    "Go": "#375eab",
-    "Golo": "#f6a51f",
+    "Go": "#00ADD8",
+    "Go Checksums": "#00ADD8",
+    "Go Module": "#00ADD8",
+    "Golo": "#88562A",
     "Gosu": "#82937f",
+    "Grace": "#615f8b",
+    "Gradle": "#02303a",
     "Grammatical Framework": "#ff0000",
     "GraphQL": "#e10098",
-    "Groovy": "#e69f56",
-    "HTML": "#e44b23",
+    "Graphviz (DOT)": "#2596be",
+    "Groovy": "#4298b8",
+    "Groovy Server Pages": "#4298b8",
+    "GSC": "#FF6800",
     "Hack": "#878787",
     "Haml": "#ece2a9",
     "Handlebars": "#f7931e",
+    "HAProxy": "#106da9",
     "Harbour": "#0e60e3",
-    "Haskell": "#29b544",
-    "Haxe": "#f7941e",
+    "Haskell": "#5e5086",
+    "Haxe": "#df7900",
+    "HCL": null,
     "HiveQL": "#dce200",
+    "HLSL": "#aace60",
+    "HOCON": "#9ff8ee",
     "HolyC": "#ffefaf",
-    "Hy": "#7891b1",
-    "IDL": "#e3592c",
-    "IGOR Pro": "#0000cc",
+    "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": "#fdcd00",
+    "Isabelle": "#FEFE00",
+    "Isabelle ROOT": "#FEFE00",
     "J": "#9EEDFF",
-    "JFlex": "#DBCA00",
-    "JSONiq": "#40d47e",
+    "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",
-    "KRL": "#f5c800",
+    "just": "#384d54",
     "Kaitai Struct": "#773b37",
-    "Kotlin": "#F18E33",
-    "LFE": "#004200",
-    "LLVM": "#185619",
-    "LOLCODE": "#cc9900",
-    "LSL": "#3d9970",
-    "Lark": "#0b130f",
-    "Lasso": "#2584c3",
-    "Latte": "#A8FF97",
+    "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",
-    "Lua": "#fa1fa1",
-    "MATLAB": "#e16737",
-    "MAXScript": "#00a6a6",
-    "MLIR": "#5EC8DB",
-    "MQL4": "#62A8D6",
-    "MQL5": "#4A76B8",
-    "MTML": "#0095d9",
+    "LoomScript": null,
+    "LSL": "#3d9970",
+    "Lua": "#000080",
+    "M": null,
+    "M4": null,
+    "M4Sugar": null,
     "Macaulay2": "#d8ffff",
     "Makefile": "#427819",
+    "Mako": "#7e858d",
     "Markdown": "#083fa1",
     "Marko": "#42bff2",
     "Mask": "#f97732",
-    "Matlab": "#bb92ac",
-    "Max": "#ce279c",
-    "Mercury": "#abcdef",
+    "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",
-    "NWScript": "#111522",
     "Nearley": "#990000",
-    "Nemerle": "#0d3c6e",
+    "Nemerle": "#3d3c6e",
+    "nesC": "#94B0C7",
     "NetLinx": "#0aa0ff",
     "NetLinx+ERB": "#747faa",
-    "NetLogo": "#ff2b2b",
-    "NewLisp": "#eedd66",
+    "NetLogo": "#ff6375",
+    "NewLisp": "#87AED7",
     "Nextflow": "#3ac486",
+    "Nginx": "#009639",
     "Nim": "#ffc200",
-    "Nimrod": "#37775b",
-    "Nit": "#0d8921",
-    "Nix": "#7070ff",
+    "Nit": "#009917",
+    "Nix": "#7e7eff",
+    "NPM Config": "#cb3837",
+    "NSIS": null,
     "Nu": "#c9df40",
     "NumPy": "#9C8AF9",
     "Nunjucks": "#3d8137",
-    "OCaml": "#3be133",
-    "ObjectScript": "#424893",
+    "NWScript": "#111522",
+    "OASv2-json": "#85ea2d",
+    "OASv2-yaml": "#85ea2d",
+    "OASv3-json": "#85ea2d",
+    "OASv3-yaml": "#85ea2d",
     "Objective-C": "#438eff",
-    "Objective-C++": "#4886FC",
+    "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",
-    "Oxygene": "#5a63a3",
-    "Oz": "#fcaf3e",
+    "Ox": null,
+    "Oxygene": "#cdd0e3",
+    "Oz": "#fab738",
     "P4": "#7055b5",
-    "PAWN": "#dbb284",
-    "PHP": "#4F5D95",
-    "PLSQL": "#dad8d8",
     "Pan": "#cc0000",
     "Papyrus": "#6600cc",
     "Parrot": "#f3ca0a",
-    "Pascal": "#b0ce4e",
+    "Parrot Assembly": null,
+    "Parrot Internal Representation": null,
+    "Pascal": "#E3F171",
     "Pawn": "#dbb284",
+    "PDDL": "#0d00ff",
+    "PEG.js": "#234d6b",
     "Pep8": "#C76F5B",
     "Perl": "#0298c3",
-    "Perl6": "#0298c3",
+    "PHP": "#4F5D95",
+    "PicoLisp": "#6067af",
     "PigLatin": "#fcd7de",
-    "Pike": "#066ab2",
+    "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": "#2779ab",
+    "Processing": "#0096D8",
+    "Procfile": "#3B2F63",
     "Prolog": "#74283c",
-    "Propeller Spin": "#2b446d",
+    "Promela": "#de0000",
+    "Propeller Spin": "#7fa2a7",
     "Pug": "#a86454",
-    "Puppet": "#cc5555",
-    "Pure Data": "#91de79",
+    "Puppet": "#302B6D",
     "PureBasic": "#5a6986",
-    "PureScript": "#bcdc53",
-    "Python": "#3581ba",
+    "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",
-    "RAML": "#77d9fb",
-    "RUNOFF": "#665a4e",
-    "Racket": "#ae17ff",
+    "R": "#198CE7",
+    "Racket": "#3c5caa",
     "Ragel": "#9d5200",
-    "Ragel in Ruby Host": "#ff9c2e",
     "Raku": "#0000fb",
+    "RAML": "#77d9fb",
     "Rascal": "#fffaa0",
-    "ReScript": "#ed5051",
+    "RDoc": "#701516",
+    "REALbasic": null,
     "Reason": "#ff5847",
+    "ReasonLIGO": "#ff5847",
     "Rebol": "#358a5b",
     "Record Jar": "#0673ba",
-    "Red": "#ee0000",
+    "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",
-    "SAS": "#1E90FF",
-    "SCSS": "#c6538c",
-    "SQF": "#FFCB1F",
-    "SRecode Template": "#348a34",
-    "SVG": "#ff9900",
+    "Sage": null,
     "SaltStack": "#646464",
+    "SAS": "#B34936",
     "Sass": "#a53b70",
-    "Scala": "#7dd3b0",
+    "Scala": "#c22d40",
     "Scaml": "#bd181a",
+    "Scenic": "#fdc700",
     "Scheme": "#1e4aec",
+    "Scilab": "#ca0f21",
+    "SCSS": "#c6538c",
+    "sed": "#64b970",
     "Self": "#0579aa",
-    "Shell": "#5861ce",
+    "ShaderLab": "#222c37",
+    "Shell": "#89e051",
+    "ShellCheck Config": "#cecfcb",
+    "ShellSession": null,
     "Shen": "#120F14",
+    "Sieve": null,
+    "Simple File Verification": "#C9BFED",
+    "Singularity": "#64E6AD",
     "Slash": "#007eff",
     "Slice": "#003fa2",
-    "Slim": "#ff8877",
-    "SmPL": "#c94949",
+    "Slim": "#2b2b2b",
+    "Smali": null,
     "Smalltalk": "#596706",
+    "Smarty": "#f0c040",
+    "Smithy": "#c44536",
+    "SmPL": "#c94949",
+    "SMT": null,
     "Solidity": "#AA6746",
     "SourcePawn": "#f69e1d",
+    "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",
-    "SystemVerilog": "#343761",
-    "TI Program": "#A0AA87",
+    "SVG": "#ff9900",
+    "Swift": "#F05138",
+    "SWIG": null,
+    "SystemVerilog": "#DAE1C2",
+    "Talon": "#333333",
     "Tcl": "#e4cc98",
-    "TeX": "#3D6117",
+    "Tcsh": null,
     "Terra": "#00004c",
-    "Turing": "#45f715",
+    "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": "#31859c",
-    "Unified Parallel C": "#755223",
+    "TXL": "#0178b8",
+    "TypeScript": "#3178c6",
+    "Unified Parallel C": "#4e3617",
+    "Unity3D Asset": "#222c37",
+    "Unix Assembly": null,
     "Uno": "#9933cc",
     "UnrealScript": "#a54c4d",
+    "UrWeb": "#ccccee",
     "V": "#4f87c4",
+    "Vala": "#a56de2",
+    "Valve Data Format": "#f26025",
     "VBA": "#867db1",
     "VBScript": "#15dcdc",
-    "VCL": "#0298c3",
-    "VHDL": "#543978",
-    "Vala": "#ee7d06",
-    "Verilog": "#848bf3",
-    "Vim script": "#199f4b",
-    "VimL": "#199c4b",
-    "Visual Basic": "#945db7",
+    "VCL": "#148AA8",
+    "Velocity Template Language": "#507cff",
+    "Verilog": "#b2b7f8",
+    "VHDL": "#adb2cb",
+    "Vim Help File": "#199f4b",
+    "Vim Script": "#199f4b",
+    "Vim Snippet": "#199f4b",
     "Visual Basic .NET": "#945db7",
-    "Volt": "#0098db",
-    "Vue": "#2c3e50",
-    "Web Ontology Language": "#3994bc",
+    "Visual Basic 6.0": "#2c6353",
+    "Volt": "#1F1F1F",
+    "Vue": "#41b883",
+    "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",
-    "XQuery": "#2700e2",
+    "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",
-    "Yacc": "#4B6C4B",
+    "Yul": "#794932",
     "ZAP": "#0d665e",
-    "ZIL": "#dc75e5",
+    "Zeek": null,
     "ZenScript": "#00BCD1",
     "Zephir": "#118f9e",
     "Zig": "#ec915c",
-    "cpp": "#f34b7d",
-    "eC": "#913960",
-    "edn": "#db5855",
-    "mIRC Script": "#3d57c3",
-    "mcfunction": "#E22837",
-    "nesC": "#ffce3b",
-    "ooc": "#b0b77e",
-    "q": "#0040cd",
-    "sed": "#64b970",
-    "wdl": "#42f1f4",
-    "wisp": "#7582D1",
-    "xBase": "#3a4040",
-    "Other": "#1f9aef"
+    "ZIL": "#dc75e5",
+    "Zimpl": "#d67711"
   },
   "editors": {
     "Adobe XD": "#fd27bc",

etc/wakapi.service

@@ -28,6 +28,7 @@ Environment=WAKAPI_PASSWORD_SALT=somerandomstring
 # 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
@@ -50,4 +51,4 @@ ProtectHostname=true
 ProtectProc=invisible
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target

go.mod

@@ -1,82 +1,79 @@
 module github.com/muety/wakapi
 
-go 1.18
+go 1.19
 
 require (
 	codeberg.org/Codeberg/avatars v1.0.0
-	github.com/duke-git/lancet/v2 v2.1.6
+	github.com/duke-git/lancet/v2 v2.1.13
 	github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
-	github.com/emersion/go-smtp v0.15.0
+	github.com/emersion/go-smtp v0.16.0
 	github.com/emvi/logbuch v1.2.0
-	github.com/getsentry/sentry-go v0.13.0
-	github.com/glebarez/sqlite v1.4.7
-	github.com/go-co-op/gocron v1.17.0
-	github.com/gorilla/handlers v1.5.1
-	github.com/gorilla/mux v1.8.0
+	github.com/getsentry/sentry-go v0.17.0
+	github.com/glebarez/sqlite v1.6.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/hashicorp/golang-lru v0.5.4
 	github.com/jinzhu/configor v1.2.1
 	github.com/leandro-lugaresi/hub v1.1.1
 	github.com/lpar/gzipped/v2 v2.1.0
 	github.com/mitchellh/hashstructure/v2 v2.0.2
-	github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e
+	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/satori/go.uuid v1.2.0
-	github.com/stretchr/testify v1.8.0
+	github.com/stretchr/testify v1.8.1
+	github.com/stripe/stripe-go/v74 v74.6.0
 	github.com/swaggo/http-swagger v1.3.3
-	github.com/swaggo/swag v1.8.6
+	github.com/swaggo/swag v1.8.10
 	go.uber.org/atomic v1.10.0
-	golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
-	golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0
-	gorm.io/driver/mysql v1.3.6
-	gorm.io/driver/postgres v1.3.10
-	gorm.io/driver/sqlite v1.3.6
-	gorm.io/gorm v1.23.10
+	golang.org/x/crypto v0.5.0
+	golang.org/x/sync v0.1.0
+	gorm.io/driver/mysql v1.4.5
+	gorm.io/driver/postgres v1.4.6
+	gorm.io/driver/sqlite v1.4.4
+	gorm.io/gorm v1.24.3
 )
 
 require (
-	github.com/BurntSushi/toml v1.2.0 // indirect
+	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
-	github.com/glebarez/go-sqlite v1.18.2 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/spec v0.20.7 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/glebarez/go-sqlite v1.20.0 // 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.8 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.13.0 // indirect
-	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.1 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.12.0 // indirect
-	github.com/jackc/pgx/v4 v4.17.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgx/v5 v5.2.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
-	github.com/robfig/cron/v3 v3.0.1 // indirect
-	github.com/stretchr/objx v0.4.0 // indirect
-	github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a // indirect
-	golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 // indirect
-	golang.org/x/net v0.0.0-20220927171203-f486391704dc // indirect
-	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/swaggo/files v1.0.0 // indirect
+	golang.org/x/exp v0.0.0-20230125214544-b3c2aaf6208d // indirect
+	golang.org/x/image v0.3.0 // indirect
+	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/tools v0.5.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.20.0 // indirect
+	modernc.org/libc v1.22.2 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.4.0 // indirect
-	modernc.org/sqlite v1.19.1 // indirect
+	modernc.org/memory v1.5.0 // indirect
+	modernc.org/sqlite v1.20.3 // indirect
 )

go.sum

@@ -1,125 +1,78 @@
 codeberg.org/Codeberg/avatars v1.0.0 h1:MRx5QxuT/oVCcPvC5rXwgwWKD7hc6J0GnZ0Kl67lYEM=
 codeberg.org/Codeberg/avatars v1.0.0/go.mod h1:ML/htpPRb3+owhkm4+qG2ZrXnk5WXaQLASOZ5GLCPi8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0=
-github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
+github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
-github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
-github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
-github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
-github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
-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/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
+github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
+github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 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.6 h1:zRWZkK3IAoGnzEonbrkmUP2NyHqtH9qIlW0AaSQrzmY=
-github.com/duke-git/lancet/v2 v2.1.6/go.mod h1:5Nawyf/bK783rCiHyVkZLx+jj8028oVVjLOrC21ZONA=
+github.com/duke-git/lancet/v2 v2.1.13 h1:KOCCVrfh4pjuwl6td5MQ4OqvV73qFdoGxv20HWmyPaM=
+github.com/duke-git/lancet/v2 v2.1.13/go.mod h1:hNcc06mV7qr+crH/0nP+rlC3TB0Q9g5OrVnO8/TGD4c=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
 github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead h1:fI1Jck0vUrXT8bnphprS1EoVRe2Q5CKCX8iDlpqjQ/Y=
 github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead/go.mod h1:iL2twTeMvZnrg54ZoPDNfJaJaqy0xIQFuBdrLsmspwQ=
-github.com/emersion/go-smtp v0.15.0 h1:3+hMGMGrqP/lqd7qoxZc1hTU8LY8gHV9RFGWlqSDmP8=
-github.com/emersion/go-smtp v0.15.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
+github.com/emersion/go-smtp v0.16.0 h1:eB9CY9527WdEZSs5sWisTmilDX7gG+Q/2IdRcmubpa8=
+github.com/emersion/go-smtp v0.16.0/go.mod h1:qm27SGYgoIPRot6ubfQ/GpiPy/g3PaZAVRxiO/sDUgQ=
 github.com/emvi/logbuch v1.2.0 h1:Bw0jQH1Dbs+oIygZBNx/2Ub1igXRFtKQrIMRrZdVFJM=
 github.com/emvi/logbuch v1.2.0/go.mod h1:hFxe0XQOFl76SkE/f0Pt5oQbXRZtyGa8EroBrrbQHuc=
-github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
-github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
-github.com/getsentry/sentry-go v0.13.0 h1:20dgTiUSfxRB/EhMPtxcL9ZEbM1ZdR+W/7f7NWD+xWo=
-github.com/getsentry/sentry-go v0.13.0/go.mod h1:EOsfu5ZdvKPfeHYV6pTVQnsjfp30+XA7//UooKNumH0=
-github.com/glebarez/go-sqlite v1.18.2 h1:ck3PQVaEzzzapP0g7pfhzbB3Jw4rNk+IldLMy/lgdeQ=
-github.com/glebarez/go-sqlite v1.18.2/go.mod h1:/kOdnnt5T0ztYXqBPdjRVM8JwMpFtyAQp1mtRoNxziM=
-github.com/glebarez/sqlite v1.4.7 h1:tIBxEWLJOPkekuQcwfenNfh13itj9GoVJYxp7GidJAo=
-github.com/glebarez/sqlite v1.4.7/go.mod h1:UY1smw9rBTSGnJE0He8pVRPvlxCP1C8hlB8Z24K8fG4=
-github.com/go-co-op/gocron v1.17.0 h1:IixLXsti+Qo0wMvmn6Kmjp2csk2ykpkcL+EmHmST18w=
-github.com/go-co-op/gocron v1.17.0/go.mod h1:IpDBSaJOVfFw7hXZuTag3SCSkqazXBBUkbQ1m1aesBs=
-github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/getsentry/sentry-go v0.17.0 h1:UustVWnOoDFHBS7IJUB2QK/nB5pap748ZEp0swnQJak=
+github.com/getsentry/sentry-go v0.17.0/go.mod h1:B82dxtBvxG0KaPD8/hfSV+VcHD+Lg/xUS4JuQn1P4cM=
+github.com/glebarez/go-sqlite v1.20.0 h1:6D9uRXq3Kd+W7At+hOU2eIAeahv6qcYfO8jzmvb4Dr8=
+github.com/glebarez/go-sqlite v1.20.0/go.mod h1:uTnJoqtwMQjlULmljLT73Cg7HB+2X6evsBHODyyq1ak=
+github.com/glebarez/sqlite v1.6.0 h1:ZpvDLv4zBi2cuuQPitRiVz/5Uh6sXa5d8eBu0xNTpAo=
+github.com/glebarez/sqlite v1.6.0/go.mod h1:6D6zPU/HTrFlYmVDKqBJlmQvma90P6r7sRRdkUUZOYk=
+github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
 github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo=
-github.com/go-openapi/spec v0.20.7 h1:1Rlu/ZrOCCob0n+JKKJAWhNWMPW8bOZRg8FJaY+0SKI=
-github.com/go-openapi/spec v0.20.7/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/spec v0.20.8 h1:ubHmXNY3FCIOinT8RNrrPfGc9t7I1qhPtdOGoG2AxRU=
+github.com/go-openapi/spec v0.20.8/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
-github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
-github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
-github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
-github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
-github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/schema v1.2.0 h1:YufUaxZYCKGFuAq3c96BOhjgd5nmXiOY9NGzF247Tsc=
 github.com/gorilla/schema v1.2.0/go.mod h1:kgLaKoK1FELgZqMAVxx/5cbj0kT+57qxUrAlIO2eleU=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
-github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
-github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
-github.com/jackc/pgconn v0.0.0-20190420214824-7e0022ef6ba3/go.mod h1:jkELnwuX+w9qN5YIfX0fl88Ehu4XC3keFuOJJk9pcnA=
-github.com/jackc/pgconn v0.0.0-20190824142844-760dd75542eb/go.mod h1:lLjNuW/+OfW9/pnVKPazfWOgNfH2aPem8YQ7ilXGvJE=
-github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsUgOEh9hBm+xYTstcNHg7UPMVJqRfQxq4s=
-github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
-github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
-github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
-github.com/jackc/pgconn v1.13.0 h1:3L1XMNV2Zvca/8BYhzcRFS70Lr0WlDg16Di6SFGAbys=
-github.com/jackc/pgconn v1.13.0/go.mod h1:AnowpAqO4CMIIJNZl2VJp+KrkAZciAkhEl0W0JIobpI=
-github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
-github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
-github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
-github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
-github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
-github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
+github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA=
-github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
-github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.3.1 h1:nwj7qwf0S+Q7ISFfBndqeLwSwxs+4DPsbRFjECT1Y4Y=
-github.com/jackc/pgproto3/v2 v2.3.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
-github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
-github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
-github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
-github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
-github.com/jackc/pgtype v1.12.0 h1:Dlq8Qvcch7kiehm8wPGIW0W3KsCCHJnRacKW0UM8n5w=
-github.com/jackc/pgtype v1.12.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
-github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
-github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
-github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
-github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
-github.com/jackc/pgx/v4 v4.17.2 h1:0Ut0rpeKwvIVbMQ1KbMBU4h6wxehBI535LK6Flheh8E=
-github.com/jackc/pgx/v4 v4.17.2/go.mod h1:lcxIZN44yMIrWI78a5CpucdD14hX0SBDbNRvjDBItsw=
-github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.2.0 h1:NdPpngX0Y6z6XDFKqmFQaE+bCtkqzvQIOt1wvBlAqs8=
+github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0S4nk=
+github.com/jackc/puddle/v2 v2.1.2/go.mod h1:2lpufsF5mRHO6SuZkm0fNYxM6SWHfvyFj62KwNzgels=
 github.com/jinzhu/configor v1.2.1 h1:OKk9dsR8i6HPOCZR8BcMtcEImAFjIhbJFZNyn5GCZko=
 github.com/jinzhu/configor v1.2.1/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -132,23 +85,16 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43 h1:Pdirg1gwhEcGjMLyuSxGn9664p+P8J9SrfMgpFwrDyg=
 github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43/go.mod h1:ahLMuLCUyDdXqtqGyuwGev7/PGtO7r7ocvdwDuEN/3E=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 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/leandro-lugaresi/hub v1.1.1/go.mod h1:XEFWanhHv6Rt3XlteHMxuNDYi8dJcpJjodpqkU+BtIo=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
-github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lpar/gzipped/v2 v2.1.0 h1:87/ug239roEqXLVOnXZg6NjDfFvMwmkGTKnFWJPUA9U=
 github.com/lpar/gzipped/v2 v2.1.0/go.mod h1:G3UlFoFYzjCx6NV4zDmD1BIWMNBaJuKoUvxrEWJuZ3Y=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -156,165 +102,135 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-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.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 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/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
-github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e h1:bR8DQ4ZfItytLJwRlrLOPUHd5z18V6tECwYQFy8W+8g=
-github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e/go.mod h1:m9BzkaxwU4IfPQi9ko23cmuFltayFe8iS0dlRlnEWiM=
+github.com/muety/artifex/v2 v2.0.1-0.20221201142708-74e7d3f6feaf h1:zd7IU9rxVMl2FBwSwiWCUh6s0TkPKgOU6GyVBciNdlo=
+github.com/muety/artifex/v2 v2.0.1-0.20221201142708-74e7d3f6feaf/go.mod h1:eElbcdMwTDc7Wzl7A46IopgkC6a9nV7jOB6Mw8r0waE=
+github.com/narqo/go-badge v0.0.0-20221212191103-ba83bed45a1a h1:G6Kjw+HNpJUZY1bfBkd8XOZ7nuDWmXLaJukeiM2Xv7o=
+github.com/narqo/go-badge v0.0.0-20221212191103-ba83bed45a1a/go.mod h1:m9BzkaxwU4IfPQi9ko23cmuFltayFe8iS0dlRlnEWiM=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 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/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/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 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/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa h1:tEkEyxYeZ43TR55QU/hsIt9aRGBxbgGuz9CGykjvogY=
-github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 h1:VstopitMQi3hZP0fzvnsLmzXZdQGc4bEcgu24cp+d4M=
+github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/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/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
-github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
-github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 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/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a h1:kAe4YSu0O0UFn1DowNo2MY5p6xzqtJ/wQ7LZynSvGaY=
-github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a/go.mod h1:lKJPbtWzJ9JhsTN1k1gZgleJWY/cqq0psdoMmaThG3w=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stripe/stripe-go/v74 v74.6.0 h1:IQTT+psxj1hkXo6onQsyfw5Eopj7p6e0oltkWLlf0Tw=
+github.com/stripe/stripe-go/v74 v74.6.0/go.mod h1:5PoXNp30AJ3tGq57ZcFuaMylzNi8KpwlrYAFmO1fHZw=
+github.com/swaggo/files v1.0.0 h1:1gGXVIeUFCS/dta17rnP0iOpr6CXFwKD7EO5ID233e4=
+github.com/swaggo/files v1.0.0/go.mod h1:N59U6URJLyU1PQgFqPM7wXLMhJx7QAolnvfQkqO13kc=
 github.com/swaggo/http-swagger v1.3.3 h1:Hu5Z0L9ssyBLofaama21iYaF2VbWyA8jdohaaCGpHsc=
 github.com/swaggo/http-swagger v1.3.3/go.mod h1:sE+4PjD89IxMPm77FnkDz0sdO+p5lbXzrVWT6OTVVGo=
-github.com/swaggo/swag v1.8.6 h1:2rgOaLbonWu1PLP6G+/rYjSvPg0jQE0HtrEKuE380eg=
-github.com/swaggo/swag v1.8.6/go.mod h1:jMLeXOOmYyjk8PvHTsXBdrubsNd9gUJTTCzL5iBnseg=
+github.com/swaggo/swag v1.8.10 h1:eExW4bFa52WOjqRzRD58bgWsWfdFJso50lpbeTcmTfo=
+github.com/swaggo/swag v1.8.10/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9enSk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A=
-golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/image v0.0.0-20220902085622-e7cb96979f69 h1:Lj6HJGCSn5AjxRAH2+r35Mir4icalbqku+CLUtjnvXY=
-golang.org/x/image v0.0.0-20220902085622-e7cb96979f69/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
-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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/exp v0.0.0-20230125214544-b3c2aaf6208d h1:9Bio0JlZpJ1P4NXsK5i8Rf2MclrRzMGzJWOIkhZ5Um8=
+golang.org/x/exp v0.0.0-20230125214544-b3c2aaf6208d/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg=
+golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ=
-golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 h1:cu5kTvlzcw1Q5S9f5ip1/cpiB4nXvw1XYzFPGgzLUOY=
-golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
+golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA=
 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/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
+golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
 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/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+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/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s=
 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.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
@@ -322,57 +238,48 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/mysql v1.3.6 h1:BhX1Y/RyALb+T9bZ3t07wLnPZBukt+IRkMn8UZSNbGM=
-gorm.io/driver/mysql v1.3.6/go.mod h1:sSIebwZAVPiT+27jK9HIwvsqOGKx3YMPmrA3mBJR10c=
-gorm.io/driver/postgres v1.3.10 h1:Fsd+pQpFMGlGxxVMUPJhNo8gG8B1lKtk8QQ4/VZZAJw=
-gorm.io/driver/postgres v1.3.10/go.mod h1:whNfh5WhhHs96honoLjBAMwJGYEuA3m1hvgUbNXhPCw=
-gorm.io/driver/sqlite v1.3.6 h1:Fi8xNYCUplOqWiPa3/GuCeowRNBRGTf62DEmhMDHeQQ=
-gorm.io/driver/sqlite v1.3.6/go.mod h1:Sg1/pvnKtbQ7jLXxfZa+jSHvoX8hoZA8cn4xllOMTgE=
-gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.23.7/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
+gorm.io/driver/mysql v1.4.5 h1:u1lytId4+o9dDaNcPCFzNv7h6wvmc92UjNk3z8enSBU=
+gorm.io/driver/mysql v1.4.5/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc=
+gorm.io/driver/postgres v1.4.6 h1:1FPESNXqIKG5JmraaH2bfCVlMQ7paLoCreFxDtqzwdc=
+gorm.io/driver/postgres v1.4.6/go.mod h1:UJChCNLFKeBqQRE+HrkFUbKbq9idPXmTOk2u4Wok8S4=
+gorm.io/driver/sqlite v1.4.4 h1:gIufGoR0dQzjkyqDyYSCvsYR6fba1Gw5YKDqKeChxFc=
+gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.23.10 h1:4Ne9ZbzID9GUxRkllxN4WjJKpsHx8YbKvekVdgyWh24=
-gorm.io/gorm v1.23.10/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+gorm.io/gorm v1.24.3 h1:WL2ifUmzR/SLp85CSURAfybcHnGZ+yLSGSxgYXlFBHg=
+gorm.io/gorm v1.24.3/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20=
-modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc=
-modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw=
+modernc.org/cc/v3 v3.38.1/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20=
+modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
 modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI=
-modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.8/go.mod h1:zNjwkizS+fIFDrDjIAgBSCLkWbJuHF+ar3QRn+Z9aws=
-modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
+modernc.org/ccgo/v3 v3.0.0-20220910160915-348f15de615a/go.mod h1:8p47QxPkdugex9J4n9P2tLZ9bK01yngIVp00g4nomW0=
+modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g=
+modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
 modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
-modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
-modernc.org/libc v1.16.17/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
-modernc.org/libc v1.16.19/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.17.0/go.mod h1:XsgLldpP4aWlPlsjqKRdHPqCxCjISdHfM/yeWC5GyW0=
 modernc.org/libc v1.17.4/go.mod h1:WNg2ZH56rDEwdropAJeZPQkXmDwh+JCA1s/htl6r2fA=
 modernc.org/libc v1.18.0/go.mod h1:vj6zehR5bfc98ipowQOM2nIDUZnVew/wNC/2tOGS+q0=
-modernc.org/libc v1.20.0 h1:MEbCfCKpuDC/LRb3HOCM9fZOqnPx8le3kzTJVmUGDbU=
-modernc.org/libc v1.20.0/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/libc v1.19.0/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0=
+modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0=
+modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
+modernc.org/libc v1.21.5/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
+modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
+modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
 modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
 modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/memory v1.2.0/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/memory v1.3.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
-modernc.org/memory v1.4.0 h1:crykUfNSnMAXaOJnnxcSzbUGMqkLWjklJKkBK2nwZwk=
 modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
+modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.18.2/go.mod h1:kvrTLEWgxUcHa2GfHBQtanR1H9ht3hTJNtKpzH9k1u0=
-modernc.org/sqlite v1.19.1 h1:8xmS5oLnZtAK//vnd4aTVj8VOeTAccEFOtUnIzfSw+4=
-modernc.org/sqlite v1.19.1/go.mod h1:UfQ83woKMaPW/ZBruK0T7YaFCrI+IE0LeWVY6pmnVms=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.20.0/go.mod h1:EsYz8rfOvLCiYTy5ZFsOYzoCcRMu98YYkwAcCw5YIYw=
+modernc.org/sqlite v1.20.3 h1:SqGJMMxjj1PHusLxdYxeQSodg7Jxn9WWkaAQjKrntZs=
+modernc.org/sqlite v1.20.3/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
 modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
-modernc.org/tcl v1.13.2/go.mod h1:7CLiGIPo1M8Rv1Mitpv5akc2+8fxUd2y2UzC/MfMzy0=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/tcl v1.15.0/go.mod h1:xRoGotBZ6dU+Zo2tca+2EqVEeMmOUBzHnhIwq4YrVnE=
 modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8=
+modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ=

helpers/date.go

@@ -1,9 +1,8 @@
-package utils
+package helpers
 
 import (
-	"errors"
+	"fmt"
 	"github.com/muety/wakapi/config"
-	"regexp"
 	"time"
 )
 
@@ -41,22 +40,10 @@ func FormatDateHuman(date time.Time) string {
 	return date.Format("Mon, 02 Jan 2006")
 }
 
-func Add(i, j int) int {
-	return i + j
-}
-
-func ParseUserAgent(ua string) (string, string, error) {
-	re := regexp.MustCompile(`(?iU)^wakatime\/(?:v?[\d+.]+|unset)\s\((\w+)-.*\)\s.+\s([^\/\s]+)-wakatime\/.+$`)
-	groups := re.FindAllStringSubmatch(ua, -1)
-	if len(groups) == 0 || len(groups[0]) != 3 {
-		return "", "", errors.New("failed to parse user agent string")
-	}
-	return groups[0][1], groups[0][2], nil
-}
-
-func SubSlice[T any](slice []T, from, to uint) []T {
-	if int(to) > len(slice) {
-		to = uint(len(slice))
-	}
-	return slice[from:int(to)]
+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

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

@@ -0,0 +1,30 @@
+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,78 +1,13 @@
-package utils
+package helpers
 
 import (
 	"errors"
 	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/utils"
 	"net/http"
 	"time"
 )
 
-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 = BeginOfToday(tz)
-	case models.IntervalYesterday:
-		from = BeginOfToday(tz).Add(-24 * time.Hour)
-		to = BeginOfToday(tz)
-	case models.IntervalThisWeek:
-		from = BeginOfThisWeek(tz)
-	case models.IntervalLastWeek:
-		from = BeginOfThisWeek(tz).AddDate(0, 0, -7)
-		to = BeginOfThisWeek(tz)
-	case models.IntervalThisMonth:
-		from = BeginOfThisMonth(tz)
-	case models.IntervalLastMonth:
-		from = BeginOfThisMonth(tz).AddDate(0, -1, 0)
-		to = BeginOfThisMonth(tz)
-	case models.IntervalThisYear:
-		from = BeginOfThisYear(tz)
-	case models.IntervalPast7Days:
-		from = now.AddDate(0, 0, -7)
-	case models.IntervalPast7DaysYesterday:
-		from = BeginOfToday(tz).AddDate(0, 0, -1).AddDate(0, 0, -7)
-		to = 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
-}
-
 func ParseSummaryParams(r *http.Request) (*models.SummaryParams, error) {
 	user := extractUser(r)
 	params := r.URL.Query()
@@ -132,6 +67,9 @@ func ParseSummaryFilters(r *http.Request) *models.Filters {
 	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
 }
 
@@ -144,3 +82,69 @@ func extractUser(r *http.Request) *models.User {
 	}
 	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

@@ -2,7 +2,15 @@ package main
 
 import (
 	"embed"
-	"github.com/muety/wakapi/static/docs"
+	"github.com/go-chi/chi/v5"
+	middleware "github.com/go-chi/chi/v5/middleware"
+	"github.com/lpar/gzipped/v2"
+	"github.com/muety/wakapi/middlewares"
+	shieldsV1Routes "github.com/muety/wakapi/routes/compat/shields/v1"
+	wtV1Routes "github.com/muety/wakapi/routes/compat/wakatime/v1"
+	"github.com/muety/wakapi/routes/relay"
+	fsutils "github.com/muety/wakapi/utils/fs"
+	httpSwagger "github.com/swaggo/http-swagger"
 	"io/fs"
 	"log"
 	"net"
@@ -11,30 +19,23 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/emvi/logbuch"
-	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
-	"github.com/lpar/gzipped/v2"
-	"github.com/swaggo/http-swagger"
+	"github.com/muety/wakapi/static/docs"
 
+	"github.com/emvi/logbuch"
 	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"
-	fsutils "github.com/muety/wakapi/utils/fs"
-
 	_ "gorm.io/driver/mysql"
 	_ "gorm.io/driver/postgres"
 	_ "gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
+
+	_ "github.com/muety/wakapi/static/docs"
 )
 
 // Embed version.txt
@@ -79,6 +80,7 @@ var (
 	keyValueService        services.IKeyValueService
 	reportService          services.IReportService
 	diagnosticsService     services.IDiagnosticsService
+	housekeepingService    services.IHousekeepingService
 	miscService            services.IMiscService
 )
 
@@ -128,14 +130,12 @@ func main() {
 
 	// Connect to database
 	var err error
-	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger})
+	logbuch.Info("starting with %s database", config.Db.Dialect)
+	db, err = gorm.Open(config.Db.GetDialector(), &gorm.Config{Logger: gormLogger}, conf.GetWakapiDBOpts(&config.Db))
 	if err != nil {
 		logbuch.Error(err.Error())
 		logbuch.Fatal("could not open database")
 	}
-	if config.Db.IsSQLite() {
-		db.Exec("PRAGMA foreign_keys = ON;")
-	}
 
 	if config.IsDev() {
 		db = db.Debug()
@@ -180,13 +180,15 @@ func main() {
 	keyValueService = services.NewKeyValueService(keyValueRepository)
 	reportService = services.NewReportService(summaryService, userService, mailService)
 	diagnosticsService = services.NewDiagnosticsService(diagnosticsRepository)
-	miscService = services.NewMiscService(userService, summaryService, keyValueService)
+	housekeepingService = services.NewHousekeepingService(userService, heartbeatService, summaryService)
+	miscService = services.NewMiscService(userService, heartbeatService, summaryService, keyValueService, mailService)
 
 	// Schedule background tasks
 	go aggregationService.Schedule()
-	go leaderboardService.ScheduleDefault()
-	go miscService.ScheduleCountTotalTime()
+	go leaderboardService.Schedule()
 	go reportService.Schedule()
+	go housekeepingService.Schedule()
+	go miscService.Schedule()
 
 	routes.Init()
 
@@ -210,8 +212,9 @@ func main() {
 	shieldV1BadgeHandler := shieldsV1Routes.NewBadgeHandler(summaryService, userService)
 
 	// MVC Handlers
-	summaryHandler := routes.NewSummaryHandler(summaryService, userService)
+	summaryHandler := routes.NewSummaryHandler(summaryService, userService, keyValueService)
 	settingsHandler := routes.NewSettingsHandler(userService, heartbeatService, summaryService, aliasService, aggregationService, languageMappingService, projectLabelService, keyValueService, mailService)
+	subscriptionHandler := routes.NewSubscriptionHandler(userService, mailService, keyValueService)
 	leaderboardHandler := routes.NewLeaderboardHandler(userService, leaderboardService)
 	homeHandler := routes.NewHomeHandler(keyValueService)
 	loginHandler := routes.NewLoginHandler(userService, mailService)
@@ -220,28 +223,35 @@ func main() {
 	// Other Handlers
 	relayHandler := relay.NewRelayHandler()
 
-	// Setup Routers
-	router := mux.NewRouter()
-	rootRouter := router.PathPrefix("/").Subrouter()
-	apiRouter := router.PathPrefix("/api").Subrouter().StrictSlash(true)
-
-	// https://github.com/gorilla/mux/issues/416
-	router.NotFoundHandler = router.NewRoute().BuildOnly().HandlerFunc(http.NotFound).GetHandler()
-	router.NotFoundHandler = middlewares.NewLoggingMiddleware(logbuch.Info, []string{
-		"/assets",
-		"/favicon",
-		"/service-worker.js",
-	})(router.NotFoundHandler)
-
-	// Globally used middlewares
-	router.Use(middlewares.NewPrincipalMiddleware())
-	router.Use(middlewares.NewLoggingMiddleware(logbuch.Info, []string{"/assets", "/api/health"}))
-	router.Use(handlers.RecoveryHandler())
+	// Setup Routing
+	router := chi.NewRouter()
+	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 != "" {
 		router.Use(middlewares.NewSentryMiddleware())
 	}
+
+	// Setup Sub Routers
+	rootRouter := chi.NewRouter()
 	rootRouter.Use(middlewares.NewSecurityMiddleware())
 
+	apiRouter := chi.NewRouter()
+
+	// Hook sub routers
+	router.Mount("/", rootRouter)
+	router.Mount("/api", apiRouter)
+
 	// Route registrations
 	homeHandler.RegisterRoutes(rootRouter)
 	loginHandler.RegisterRoutes(rootRouter)
@@ -249,6 +259,7 @@ func main() {
 	summaryHandler.RegisterRoutes(rootRouter)
 	leaderboardHandler.RegisterRoutes(rootRouter)
 	settingsHandler.RegisterRoutes(rootRouter)
+	subscriptionHandler.RegisterRoutes(rootRouter)
 	relayHandler.RegisterRoutes(rootRouter)
 
 	// API route registrations
@@ -273,16 +284,17 @@ func main() {
 	embeddedStatic, _ := fs.Sub(staticFiles, "static")
 	static := conf.ChooseFS("static", embeddedStatic)
 
-	assetsFileServer := gzipped.FileServer(fsutils.NewExistsHttpFS(
-		fsutils.NewExistsFS(static).WithCache(!config.IsDev()),
-	))
-	staticFileServer := http.FileServer(http.FS(
-		fsutils.NeuteredFileSystem{FS: static},
-	))
+	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.PathPrefix("/contribute.json").Handler(staticFileServer)
-	router.PathPrefix("/assets").Handler(assetsFileServer)
-	router.PathPrefix("/swagger-ui").Handler(httpSwagger.WrapHandler)
+	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)
@@ -292,7 +304,7 @@ func listen(handler http.Handler) {
 	var s4, s6, sSocket *http.Server
 
 	// IPv4
-	if config.Server.ListenIpV4 != "" {
+	if config.Server.ListenIpV4 != "-" && config.Server.ListenIpV4 != "" {
 		bindString4 := config.Server.ListenIpV4 + ":" + strconv.Itoa(config.Server.Port)
 		s4 = &http.Server{
 			Handler:      handler,
@@ -303,7 +315,7 @@ func listen(handler http.Handler) {
 	}
 
 	// IPv6
-	if config.Server.ListenIpV6 != "" {
+	if config.Server.ListenIpV6 != "-" && config.Server.ListenIpV6 != "" {
 		bindString6 := "[" + config.Server.ListenIpV6 + "]:" + strconv.Itoa(config.Server.Port)
 		s6 = &http.Server{
 			Handler:      handler,
@@ -314,10 +326,10 @@ func listen(handler http.Handler) {
 	}
 
 	// UNIX domain socket
-	if config.Server.ListenSocket != "" {
+	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)
+			logbuch.Info("👉 Removing unix socket %s", config.Server.ListenSocket)
 			if err := os.Remove(config.Server.ListenSocket); err != nil {
 				logbuch.Fatal(err.Error())
 			}
@@ -331,7 +343,7 @@ func listen(handler http.Handler) {
 
 	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())
@@ -339,7 +351,7 @@ 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())
@@ -347,12 +359,15 @@ func listen(handler http.Handler) {
 			}()
 		}
 		if sSocket != nil {
-			logbuch.Info("--> Listening for HTTPS on %s... ✅", config.Server.ListenSocket)
+			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())
 				}
@@ -360,7 +375,7 @@ func listen(handler http.Handler) {
 		}
 	} 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())
@@ -368,7 +383,7 @@ 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())
@@ -376,12 +391,15 @@ func listen(handler http.Handler) {
 			}()
 		}
 		if sSocket != nil {
-			logbuch.Info("--> Listening for HTTP on %s... ✅", config.Server.ListenSocket)
+			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())
 				}

middlewares/authenticate.go

@@ -2,6 +2,7 @@ package middlewares
 
 import (
 	"fmt"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 	"strings"
 
@@ -21,10 +22,11 @@ var (
 )
 
 type AuthenticateMiddleware struct {
-	config           *conf.Config
-	userSrvc         services.IUserService
-	optionalForPaths []string
-	redirectTarget   string // optional
+	config               *conf.Config
+	userSrvc             services.IUserService
+	optionalForPaths     []string
+	redirectTarget       string // optional
+	redirectErrorMessage string // optional
 }
 
 func NewAuthenticateMiddleware(userService services.IUserService) *AuthenticateMiddleware {
@@ -45,6 +47,11 @@ func (m *AuthenticateMiddleware) WithRedirectTarget(path string) *AuthenticateMi
 	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)
@@ -72,6 +79,11 @@ func (m *AuthenticateMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			w.WriteHeader(http.StatusUnauthorized)
 			w.Write([]byte(conf.ErrUnauthorized))
 		} else {
+			if m.redirectErrorMessage != "" {
+				session, _ := conf.GetSessionStore().Get(r, conf.SessionKeyDefault)
+				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)
 		}
@@ -121,7 +133,7 @@ func (m *AuthenticateMiddleware) tryGetUserByApiKeyQuery(r *http.Request) (*mode
 }
 
 func (m *AuthenticateMiddleware) tryGetUserByCookie(r *http.Request) (*models.User, error) {
-	username, err := utils.ExtractCookieAuth(r, m.config)
+	username, err := helpers.ExtractCookieAuth(r, m.config)
 	if err != nil {
 		return nil, err
 	}

middlewares/custom/wakatime.go

@@ -160,17 +160,23 @@ func (m *WakatimeRelayMiddleware) filterByCache(r *http.Request) error {
 
 	newData := make([]interface{}, 0, len(heartbeats))
 
-	for i, hb := range heartbeats {
-		hb = hb.Hashed()
-
+	process := func(heartbeat *models.Heartbeat, rawData interface{}) {
+		heartbeat = heartbeat.Hashed()
 		// we didn't see this particular heartbeat before
-		if _, found := m.hashCache.Get(hb.Hash); !found {
-			m.hashCache.SetDefault(hb.Hash, true)
-			newData = append(newData, rawData.([]interface{})[i])
-			continue
+		if _, 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")
 	}

middlewares/principal.go

@@ -20,6 +20,13 @@ 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()),

middlewares/security.go

@@ -6,7 +6,7 @@ import (
 
 var securityHeaders = map[string]string{
 	"Cross-Origin-Opener-Policy": "same-origin",
-	"Content-Security-Policy":    "default-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' https: data:; form-action 'self'; block-all-mixed-content;",
+	"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",
 }

migrations/20221002_fix_summary_id_types.go

@@ -60,6 +60,17 @@ func init() {
 						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

migrations/20221016_drop_rank_column.go

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

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

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

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

@@ -3,11 +3,14 @@ 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
@@ -20,6 +23,45 @@ 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)
 }
@@ -35,7 +77,7 @@ func Run(db *gorm.DB, cfg *config.Config) {
 }
 
 func RunSchemaMigrations(db *gorm.DB, cfg *config.Config) {
-	if err := cfg.GetMigrationFunc(cfg.Db.Dialect)(db); err != nil {
+	if err := GetMigrationFunc(cfg)(db); err != nil {
 		logbuch.Fatal(err.Error())
 	}
 }

mocks/heartbeat_service.go

@@ -10,13 +10,13 @@ type HeartbeatServiceMock struct {
 	mock.Mock
 }
 
-func (m *HeartbeatServiceMock) Insert(heartbeat *models.Heartbeat) error {
-	args := m.Called(heartbeat)
+func (m *HeartbeatServiceMock) Insert(h *models.Heartbeat) error {
+	args := m.Called(h)
 	return args.Error(0)
 }
 
-func (m *HeartbeatServiceMock) InsertBatch(heartbeats []*models.Heartbeat) error {
-	args := m.Called(heartbeats)
+func (m *HeartbeatServiceMock) InsertBatch(h []*models.Heartbeat) error {
+	args := m.Called(h)
 	return args.Error(0)
 }
 
@@ -74,3 +74,8 @@ 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/summary_repository.go

@@ -10,8 +10,8 @@ type SummaryRepositoryMock struct {
 	mock.Mock
 }
 
-func (m *SummaryRepositoryMock) Insert(summary *models.Summary) error {
-	args := m.Called(summary)
+func (m *SummaryRepositoryMock) Insert(s *models.Summary) error {
+	args := m.Called(s)
 	return args.Error(0)
 }
 
@@ -20,8 +20,8 @@ func (m *SummaryRepositoryMock) GetAll() ([]*models.Summary, error) {
 	return args.Get(0).([]*models.Summary), args.Error(1)
 }
 
-func (m *SummaryRepositoryMock) GetByUserWithin(user *models.User, time time.Time, time2 time.Time) ([]*models.Summary, error) {
-	args := m.Called(user, time, time2)
+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,3 +34,8 @@ 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

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

@@ -54,6 +54,11 @@ func (m *UserServiceMock) GetAllByReports(b bool) ([]*models.User, error) {
 	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)
@@ -107,3 +112,7 @@ func (m *UserServiceMock) GenerateResetToken(user *models.User) (*models.User, e
 func (m *UserServiceMock) FlushCache() {
 	m.Called()
 }
+
+func (m *UserServiceMock) FlushUserCache(s string) {
+	m.Called(s)
+}

models/compat/shields/v1/badge.go

@@ -1,8 +1,8 @@
 package v1
 
 import (
+	"github.com/muety/wakapi/helpers"
 	"github.com/muety/wakapi/models"
-	"github.com/muety/wakapi/utils"
 )
 
 // https://shields.io/endpoint
@@ -23,7 +23,7 @@ func NewBadgeDataFrom(summary *models.Summary) *BadgeData {
 	return &BadgeData{
 		SchemaVersion: 1,
 		Label:         defaultLabel,
-		Message:       utils.FmtWakatimeDuration(summary.TotalTime()),
+		Message:       helpers.FmtWakatimeDuration(summary.TotalTime()),
 		Color:         defaultColor,
 	}
 }

models/compat/wakatime/v1/all_time.go

@@ -1,8 +1,9 @@
 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
@@ -28,11 +29,19 @@ type AllTimeRange struct {
 
 func NewAllTimeFrom(summary *models.Summary) *AllTimeViewModel {
 	total := summary.TotalTime()
+	tzName, _ := summary.FromTime.T().Zone()
 	return &AllTimeViewModel{
 		Data: &AllTimeData{
 			TotalSeconds: float32(total.Seconds()),
-			Text:         utils.FmtWakatimeDuration(total),
+			Text:         helpers.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/stats.go

@@ -77,6 +77,8 @@ func NewStatsFrom(summary *models.Summary, filters *models.Filters) *StatsViewMo
 		branches[i] = convertEntry(e, summary.TotalTimeBy(models.SummaryBranch))
 	}
 
+	// entities omitted intentionally
+
 	data.Editors = editors
 	data.Languages = languages
 	data.Machines = machines

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,9 +13,17 @@ import (
 // https://pastr.de/v/736450
 
 type SummariesViewModel struct {
-	Data  []*SummariesData `json:"data"`
-	End   time.Time        `json:"end"`
-	Start time.Time        `json:"start"`
+	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 {
+	Decimal string  `json:"decimal"`
+	Digital string  `json:"digital"`
+	Seconds float64 `json:"seconds"`
+	Text    string  `json:"text"`
 }
 
 type SummariesData struct {
@@ -27,6 +35,7 @@ type SummariesData struct {
 	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"`
 }
@@ -73,10 +82,23 @@ 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),
+		},
 	}
 }
 
@@ -98,7 +120,7 @@ func newDataFrom(s *models.Summary) *SummariesData {
 			Digital:      fmt.Sprintf("%d:%d", totalHrs, totalMins),
 			Hours:        totalHrs,
 			Minutes:      totalMins,
-			Text:         utils.FmtWakatimeDuration(total),
+			Text:         helpers.FmtWakatimeDuration(total),
 			TotalSeconds: total.Seconds(),
 		},
 		Range: &SummariesRange{
@@ -111,8 +133,8 @@ func newDataFrom(s *models.Summary) *SummariesData {
 	}
 
 	var wg sync.WaitGroup
-	wg.Add(6)
 
+	wg.Add(1)
 	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Projects {
@@ -120,6 +142,7 @@ func newDataFrom(s *models.Summary) *SummariesData {
 		}
 	}(data)
 
+	wg.Add(1)
 	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Editors {
@@ -127,6 +150,7 @@ func newDataFrom(s *models.Summary) *SummariesData {
 		}
 	}(data)
 
+	wg.Add(1)
 	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Languages {
@@ -134,6 +158,7 @@ func newDataFrom(s *models.Summary) *SummariesData {
 		}
 	}(data)
 
+	wg.Add(1)
 	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.OperatingSystems {
@@ -141,6 +166,7 @@ func newDataFrom(s *models.Summary) *SummariesData {
 		}
 	}(data)
 
+	wg.Add(1)
 	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Machines {
@@ -148,6 +174,7 @@ func newDataFrom(s *models.Summary) *SummariesData {
 		}
 	}(data)
 
+	wg.Add(1)
 	go func(data *SummariesData) {
 		defer wg.Done()
 		for i, e := range s.Branches {
@@ -155,9 +182,20 @@ func newDataFrom(s *models.Summary) *SummariesData {
 		}
 	}(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
@@ -180,7 +218,7 @@ func convertEntry(e *models.SummaryItem, entityTotal time.Duration) *SummariesEn
 		Name:         e.Key,
 		Percent:      percentage,
 		Seconds:      secs,
-		Text:         utils.FmtWakatimeDuration(total),
+		Text:         helpers.FmtWakatimeDuration(total),
 		TotalSeconds: total.Seconds(),
 	}
 }

models/duration.go

@@ -5,6 +5,7 @@ import (
 	"github.com/emvi/logbuch"
 	"github.com/mitchellh/hashstructure/v2"
 	"time"
+	"unicode"
 )
 
 type Duration struct {
@@ -17,8 +18,24 @@ type Duration struct {
 	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 {
@@ -32,11 +49,17 @@ func NewDurationFromHeartbeat(h *Heartbeat) *Duration {
 		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 {
@@ -60,6 +83,8 @@ func (d *Duration) GetKey(t uint8) (key string) {
 		key = d.Machine
 	case SummaryBranch:
 		key = d.Branch
+	case SummaryEntity:
+		key = d.Entity
 	}
 
 	if key == "" {

models/filters.go

@@ -14,6 +14,7 @@ type Filters struct {
 	Machine  OrFilter
 	Label    OrFilter
 	Branch   OrFilter
+	Entity   OrFilter
 }
 
 type OrFilter []string
@@ -65,6 +66,8 @@ func (f *Filters) WithMultiple(entity uint8, keys []string) *Filters {
 		f.Label = append(f.Label, keys...)
 	case SummaryBranch:
 		f.Branch = append(f.Branch, keys...)
+	case SummaryEntity:
+		f.Entity = append(f.Entity, keys...)
 	}
 	return f
 }
@@ -84,6 +87,8 @@ func (f *Filters) One() (bool, uint8, OrFilter) {
 		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{}
 }
@@ -102,7 +107,7 @@ func (f *Filters) IsEmpty() bool {
 
 func (f *Filters) Count() int {
 	var count int
-	for i := SummaryProject; i <= SummaryBranch; i++ {
+	for i := SummaryProject; i <= SummaryEntity; i++ {
 		count += f.CountByEntity(i)
 	}
 	return count
@@ -114,7 +119,7 @@ func (f *Filters) CountByEntity(entity uint8) int {
 
 func (f *Filters) EntityCount() int {
 	var count int
-	for i := SummaryProject; i <= SummaryBranch; i++ {
+	for i := SummaryProject; i <= SummaryEntity; i++ {
 		if c := f.CountByEntity(i); c > 0 {
 			count++
 		}
@@ -138,6 +143,8 @@ func (f *Filters) ResolveEntity(entityId uint8) *OrFilter {
 		return &f.Label
 	case SummaryBranch:
 		return &f.Branch
+	case SummaryEntity:
+		return &f.Entity
 	default:
 		return &OrFilter{}
 	}
@@ -209,6 +216,7 @@ func (f *Filters) WithAliases(resolve AliasReverseResolver) *Filters {
 		}
 		f.Branch = updated
 	}
+	// no aliases for entites / files
 	return f
 }
 
@@ -221,3 +229,7 @@ func (f *Filters) WithProjectLabels(resolve ProjectLabelReverseResolver) *Filter
 	}
 	return f
 }
+
+func (f *Filters) IsProjectDetails() bool {
+	return f != nil && f.Project != nil && f.Project.Exists()
+}

models/heartbeat.go

@@ -23,7 +23,7 @@ type Heartbeat struct {
 	OperatingSystem string     `json:"operating_system" gorm:"index:idx_operating_system" hash:"ignore"` // ignored because os might be parsed differently by wakatime
 	Machine         string     `json:"machine" gorm:"index:idx_machine" hash:"ignore"`                   // ignored because wakatime api doesn't return machines currently
 	UserAgent       string     `json:"user_agent" hash:"ignore" gorm:"type:varchar(255)"`
-	Time            CustomTime `json:"time" gorm:"type:timestamp(3); index:idx_time,idx_time_user" swaggertype:"primitive,number"`
+	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)"`
 	OriginId        string     `json:"-" hash:"ignore" gorm:"type:varchar(255)"`
@@ -63,6 +63,8 @@ func (h *Heartbeat) GetKey(t uint8) (key string) {
 		key = h.Machine
 	case SummaryBranch:
 		key = h.Branch
+	case SummaryEntity:
+		key = h.Entity
 	}
 
 	if key == "" {

models/heartbeat_test.go

@@ -64,3 +64,42 @@ 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
+	}
+}

models/init_test.go

@@ -0,0 +1,18 @@
+package models
+
+import (
+	"os"
+	"path"
+	"runtime"
+)
+
+func init() {
+	// move to project root as working directory (e.g. so data/* can be resolved when loading config)
+	// taken from https://intellij-support.jetbrains.com/hc/en-us/community/posts/360009685279-Go-test-working-directory-keeps-changing-to-dir-of-the-test-file-instead-of-value-in-template
+	_, filename, _, _ := runtime.Caller(0)
+	dir := path.Join(path.Dir(filename), "..")
+	err := os.Chdir(dir)
+	if err != nil {
+		panic(err)
+	}
+}

models/leaderboard.go

@@ -11,7 +11,6 @@ type LeaderboardItem struct {
 	ID        uint          `json:"-" gorm:"primary_key; size:32"`
 	User      *User         `json:"-" gorm:"not null; constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	UserID    string        `json:"user_id" gorm:"not null; index:idx_leaderboard_user"`
-	Rank      uint          `json:"rank" gorm:"->"`
 	Interval  string        `json:"interval" gorm:"not null; size:32; index:idx_leaderboard_combined"`
 	By        *uint8        `json:"aggregated_by" gorm:"index:idx_leaderboard_combined"` // pointer because nullable
 	Total     time.Duration `json:"total" gorm:"not null" swaggertype:"primitive,integer"`
@@ -19,16 +18,45 @@ type LeaderboardItem struct {
 	CreatedAt CustomTime    `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
 }
 
-type Leaderboard []*LeaderboardItem
+// https://github.com/go-gorm/gorm/issues/5789
+// https://github.com/go-gorm/gorm/issues/5284#issuecomment-1107775806
+type LeaderboardItemRanked struct {
+	LeaderboardItem
+	Rank uint
+}
+
+func (l1 *LeaderboardItemRanked) Equals(l2 *LeaderboardItemRanked) bool {
+	return l1.ID == l2.ID
+}
+
+type Leaderboard []*LeaderboardItemRanked
+
+func (l *Leaderboard) Add(item *LeaderboardItemRanked) {
+	if _, found := slice.Find[*LeaderboardItemRanked](*l, func(i int, item2 *LeaderboardItemRanked) bool {
+		return item.Equals(item2)
+	}); !found {
+		*l = append(*l, item)
+	}
+}
+
+func (l *Leaderboard) AddMany(items []*LeaderboardItemRanked) {
+	for _, item := range items {
+		l.Add(item)
+	}
+}
 
 func (l Leaderboard) UserIDs() []string {
-	return slice.Unique[string](slice.Map[*LeaderboardItem, string](l, func(i int, item *LeaderboardItem) string {
+	return slice.Unique[string](slice.Map[*LeaderboardItemRanked, string](l, func(i int, item *LeaderboardItemRanked) string {
 		return item.UserID
 	}))
 }
 
+func (l Leaderboard) HasUser(userId string) bool {
+	return slice.Contain(l.UserIDs(), userId)
+}
+
 func (l Leaderboard) TopByKey(by uint8, key string) Leaderboard {
-	return slice.Filter[*LeaderboardItem](l, func(i int, item *LeaderboardItem) bool {
+	return slice.Filter[*LeaderboardItemRanked](l, func(i int, item *LeaderboardItemRanked) bool {
 		return item.By != nil && *item.By == by && item.Key != nil && strings.ToLower(*item.Key) == strings.ToLower(key)
 	})
 }
@@ -45,10 +73,11 @@ func (l Leaderboard) TopKeys(by uint8) []string {
 		if item.Key == nil || item.By == nil || *item.By != by {
 			continue
 		}
-		if _, ok := totalsMapped[*item.Key]; !ok {
-			totalsMapped[*item.Key] = &keyTotal{Key: *item.Key, Total: 0}
+		key := strings.ToLower(*item.Key)
+		if _, ok := totalsMapped[key]; !ok {
+			totalsMapped[key] = &keyTotal{Key: *item.Key, Total: 0}
 		}
-		totalsMapped[*item.Key].Total += item.Total
+		totalsMapped[key].Total += item.Total
 	}
 
 	totals := slice.Map[*keyTotal, keyTotal](maputil.Values[string, *keyTotal](totalsMapped), func(i int, item *keyTotal) keyTotal {
@@ -64,7 +93,7 @@ func (l Leaderboard) TopKeys(by uint8) []string {
 }
 
 func (l Leaderboard) TopKeysByUser(by uint8, userId string) []string {
-	return Leaderboard(slice.Filter[*LeaderboardItem](l, func(i int, item *LeaderboardItem) bool {
+	return Leaderboard(slice.Filter[*LeaderboardItemRanked](l, func(i int, item *LeaderboardItemRanked) bool {
 		return item.UserID == userId
 	})).TopKeys(by)
 }

models/mail.go

@@ -2,18 +2,22 @@ package models
 
 import (
 	"fmt"
+	uuid "github.com/satori/go.uuid"
 	"strings"
+	"time"
 )
 
 const HtmlType = "text/html; charset=UTF-8"
 const PlainType = "text/html; charset=UTF-8"
 
 type Mail struct {
-	From    MailAddress
-	To      MailAddresses
-	Subject string
-	Body    string
-	Type    string
+	From      MailAddress
+	To        MailAddresses
+	Subject   string
+	Body      string
+	Type      string
+	Date      time.Time
+	MessageID string
 }
 
 func (m *Mail) WithText(text string) *Mail {
@@ -28,17 +32,36 @@ func (m *Mail) WithHTML(html string) *Mail {
 	return m
 }
 
+func (m *Mail) Sanitized() *Mail {
+	if m.Type == "" {
+		m.Type = PlainType
+	}
+	if m.Date.IsZero() {
+		m.Date = time.Now()
+	}
+	if m.MessageID == "" {
+		m.MessageID = fmt.Sprintf("<%s@%s>", uuid.NewV4().String(), m.From.Domain())
+	}
+	return m
+}
+
 func (m *Mail) String() string {
 	return fmt.Sprintf("To: %s\r\n"+
 		"From: %s\r\n"+
 		"Subject: %s\r\n"+
+		"Message-ID: %s\r\n"+
+		"MIME-Version: 1.0\r\n"+
 		"Content-Type: %s\r\n"+
+		"Content-Transfer-Encoding: 8bit\r\n"+
+		"Date: %s\r\n"+
 		"\r\n"+
 		"%s\r\n",
 		strings.Join(m.To.RawStrings(), ", "),
 		m.From.String(),
 		m.Subject,
+		m.MessageID,
 		m.Type,
+		m.Date.Format(time.RFC1123Z),
 		m.Body,
 	)
 }

models/mail_address.go

@@ -1,6 +1,9 @@
 package models
 
-import "regexp"
+import (
+	"regexp"
+	"strings"
+)
 
 const (
 	MailPattern      = "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+"
@@ -36,6 +39,14 @@ func (m MailAddress) Raw() string {
 	return ""
 }
 
+func (m MailAddress) Domain() string {
+	split := strings.Split(m.Raw(), "@")
+	if len(split) != 2 {
+		return ""
+	}
+	return split[1]
+}
+
 func (m MailAddress) Valid() bool {
 	return emailAddrRegex.Match([]byte(m))
 }

models/metrics/gauge_metric.go

@@ -0,0 +1,22 @@
+package metrics
+
+import "fmt"
+
+type GaugeMetric struct {
+	Name   string
+	Value  int64
+	Desc   string
+	Labels Labels
+}
+
+func (c GaugeMetric) Key() string {
+	return c.Name
+}
+
+func (c GaugeMetric) Print() string {
+	return fmt.Sprintf("%s%s %d", c.Name, c.Labels.Print(), c.Value)
+}
+
+func (c GaugeMetric) Header() string {
+	return fmt.Sprintf("# HELP %s %s\n# TYPE %s gauge", c.Name, c.Desc, c.Name)
+}

models/shared.go

@@ -5,20 +5,18 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"gorm.io/gorm"
 	"strconv"
 	"strings"
 	"time"
 )
 
 const (
-	UserKey       = "user"
-	ImprintKey    = "imprint"
-	AuthCookieKey = "wakapi_auth"
+	UserKey               = "user"
+	ImprintKey            = "imprint"
+	AuthCookieKey         = "wakapi_auth"
+	PersistentIntervalKey = "wakapi_summary_interval"
 )
 
-type MigrationFunc func(db *gorm.DB) error
-
 type KeyStringValue struct {
 	Key   string `gorm:"primary_key"`
 	Value string `gorm:"type:text"`

models/summary.go

@@ -16,6 +16,7 @@ const (
 	SummaryMachine  uint8 = 4
 	SummaryLabel    uint8 = 5
 	SummaryBranch   uint8 = 6
+	SummaryEntity   uint8 = 7
 )
 
 const UnknownSummaryKey = "unknown"
@@ -34,7 +35,8 @@ type Summary struct {
 	Machines         SummaryItems `json:"machines" gorm:"constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
 	Labels           SummaryItems `json:"labels" gorm:"-"`   // labels are not persisted, but calculated at runtime, i.e. when summary is retrieved
 	Branches         SummaryItems `json:"branches" gorm:"-"` // branches are not persisted, but calculated at runtime in case a project filter is applied
-	NumHeartbeats    int          `json:"-" gorm:"default:0"`
+	Entities         SummaryItems `json:"entities" gorm:"-"` // entities are not persisted, but calculated at runtime in case a project filter is applied
+	NumHeartbeats    int          `json:"-"`
 }
 
 type SummaryItems []*SummaryItem
@@ -62,11 +64,11 @@ type SummaryParams struct {
 }
 
 func SummaryTypes() []uint8 {
-	return []uint8{SummaryProject, SummaryLanguage, SummaryEditor, SummaryOS, SummaryMachine, SummaryLabel, SummaryBranch}
+	return []uint8{SummaryProject, SummaryLanguage, SummaryEditor, SummaryOS, SummaryMachine, SummaryLabel, SummaryBranch, SummaryEntity}
 }
 
 func NativeSummaryTypes() []uint8 {
-	return []uint8{SummaryProject, SummaryLanguage, SummaryEditor, SummaryOS, SummaryMachine, SummaryBranch}
+	return []uint8{SummaryProject, SummaryLanguage, SummaryEditor, SummaryOS, SummaryMachine, SummaryBranch, SummaryEntity}
 }
 
 func PersistedSummaryTypes() []uint8 {
@@ -81,6 +83,7 @@ func (s *Summary) Sorted() *Summary {
 	sort.Sort(sort.Reverse(s.Editors))
 	sort.Sort(sort.Reverse(s.Labels))
 	sort.Sort(sort.Reverse(s.Branches))
+	sort.Sort(sort.Reverse(s.Entities))
 	return s
 }
 
@@ -97,6 +100,7 @@ func (s *Summary) MappedItems() map[uint8]*SummaryItems {
 		SummaryMachine:  &s.Machines,
 		SummaryLabel:    &s.Labels,
 		SummaryBranch:   &s.Branches,
+		SummaryEntity:   &s.Entities,
 	}
 }
 
@@ -116,6 +120,8 @@ func (s *Summary) ItemsByType(summaryType uint8) *SummaryItems {
 		return &s.Labels
 	case SummaryBranch:
 		return &s.Branches
+	case SummaryEntity:
+		return &s.Entities
 	}
 	return nil
 }
@@ -325,6 +331,7 @@ func (s *Summary) WithResolvedAliases(resolve AliasResolver) *Summary {
 	s.Machines = processAliases(s.Machines)
 	s.Labels = processAliases(s.Labels)
 	s.Branches = processAliases(s.Branches)
+	// no aliases for entities / files
 
 	return s
 }

models/types/types.go

@@ -0,0 +1,8 @@
+package types
+
+import (
+	"github.com/muety/wakapi/models"
+	"time"
+)
+
+type SummaryRetriever func(f, t time.Time, u *models.User, filters *models.Filters) (*models.Summary, error)

models/user.go

@@ -3,6 +3,8 @@ package models
 import (
 	"crypto/md5"
 	"fmt"
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/utils"
 	"regexp"
 	"strings"
 	"time"
@@ -13,27 +15,30 @@ func init() {
 }
 
 type User struct {
-	ID                string     `json:"id" gorm:"primary_key"`
-	ApiKey            string     `json:"api_key" gorm:"unique; default:NULL"`
-	Email             string     `json:"email" gorm:"index:idx_user_email; size:255"`
-	Location          string     `json:"location"`
-	Password          string     `json:"-"`
-	CreatedAt         CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
-	LastLoggedInAt    CustomTime `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
-	ShareDataMaxDays  int        `json:"-" gorm:"default:0"`
-	ShareEditors      bool       `json:"-" gorm:"default:false; type:bool"`
-	ShareLanguages    bool       `json:"-" gorm:"default:false; type:bool"`
-	ShareProjects     bool       `json:"-" gorm:"default:false; type:bool"`
-	ShareOSs          bool       `json:"-" gorm:"default:false; type:bool; column:share_oss"`
-	ShareMachines     bool       `json:"-" gorm:"default:false; type:bool"`
-	ShareLabels       bool       `json:"-" gorm:"default:false; type:bool"`
-	IsAdmin           bool       `json:"-" gorm:"default:false; type:bool"`
-	HasData           bool       `json:"-" gorm:"default:false; type:bool"`
-	WakatimeApiKey    string     `json:"-"` // for relay middleware and imports
-	WakatimeApiUrl    string     `json:"-"` // for relay middleware and imports
-	ResetToken        string     `json:"-"`
-	ReportsWeekly     bool       `json:"-" gorm:"default:false; type:bool"`
-	PublicLeaderboard bool       `json:"-" gorm:"default:false; type:bool"`
+	ID                  string      `json:"id" gorm:"primary_key"`
+	ApiKey              string      `json:"api_key" gorm:"unique; default:NULL"`
+	Email               string      `json:"email" gorm:"index:idx_user_email; size:255"`
+	Location            string      `json:"location"`
+	Password            string      `json:"-"`
+	CreatedAt           CustomTime  `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	LastLoggedInAt      CustomTime  `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	ShareDataMaxDays    int         `json:"-"`
+	ShareEditors        bool        `json:"-" gorm:"default:false; type:bool"`
+	ShareLanguages      bool        `json:"-" gorm:"default:false; type:bool"`
+	ShareProjects       bool        `json:"-" gorm:"default:false; type:bool"`
+	ShareOSs            bool        `json:"-" gorm:"default:false; type:bool; column:share_oss"`
+	ShareMachines       bool        `json:"-" gorm:"default:false; type:bool"`
+	ShareLabels         bool        `json:"-" gorm:"default:false; type:bool"`
+	IsAdmin             bool        `json:"-" gorm:"default:false; type:bool"`
+	HasData             bool        `json:"-" gorm:"default:false; type:bool"`
+	WakatimeApiKey      string      `json:"-"` // for relay middleware and imports
+	WakatimeApiUrl      string      `json:"-"` // for relay middleware and imports
+	ResetToken          string      `json:"-"`
+	ReportsWeekly       bool        `json:"-" gorm:"default:false; type:bool"`
+	PublicLeaderboard   bool        `json:"-" gorm:"default:false; type:bool"`
+	SubscribedUntil     *CustomTime `json:"-" gorm:"type:timestamp" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	SubscriptionRenewal *CustomTime `json:"-" gorm:"type:timestamp" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	StripeCustomerId    string      `json:"-"`
 }
 
 type Login struct {
@@ -82,6 +87,10 @@ type CountByUser struct {
 	Count int64
 }
 
+func (u *User) Identity() string {
+	return u.ID
+}
+
 func (u *User) TZ() *time.Location {
 	if u.Location == "" {
 		u.Location = "Local"
@@ -120,6 +129,40 @@ func (u *User) WakaTimeURL(fallback string) string {
 	return fallback
 }
 
+// HasActiveSubscription returns true if subscriptions are enabled on the server and the user has got one
+func (u *User) HasActiveSubscription() bool {
+	return conf.Get().Subscriptions.Enabled && u.HasActiveSubscriptionStrict()
+}
+
+func (u *User) HasActiveSubscriptionStrict() bool {
+	return u.SubscribedUntil != nil && u.SubscribedUntil.T().After(time.Now())
+}
+
+// SubscriptionExpiredSince returns if a user's subscription has expiration and the duration since when that happened.
+// Returns (false, <negative duration>), if subscription hasn't expired, yet.
+// Returns (false, 0), if subscriptions are not enabled in the first place.
+// Returns (true, <very long duration>), if the user has never had a subscription.
+func (u *User) SubscriptionExpiredSince() (bool, time.Duration) {
+	cfg := conf.Get()
+	if !cfg.Subscriptions.Enabled {
+		return false, 0
+	}
+	if u.SubscribedUntil == nil {
+		return true, 99 * 365 * 24 * time.Hour
+	}
+	diff := time.Now().Sub(u.SubscribedUntil.T())
+	return diff >= 0, diff
+}
+
+func (u *User) MinDataAge() time.Time {
+	retentionMonths := conf.Get().App.DataRetentionMonths
+	if retentionMonths <= 0 || u.HasActiveSubscription() {
+		return time.Time{}
+	}
+	// this is not exactly precise, because of summer / winter time, etc.
+	return time.Now().AddDate(0, -retentionMonths, 0)
+}
+
 func (c *CredentialsReset) IsValid() bool {
 	return ValidatePassword(c.PasswordNew) &&
 		c.PasswordNew == c.PasswordRepeat
@@ -142,15 +185,16 @@ func (r *UserDataUpdate) IsValid() bool {
 }
 
 func ValidateUsername(username string) bool {
-	return len(username) >= 1 && username != "current"
+	return len(username) >= 1 && username != "current" && !strings.Contains(username, " ")
 }
 
 func ValidatePassword(password string) bool {
 	return len(password) >= 6
 }
 
+// ValidateEmail checks that, if an email address is given, it has proper syntax and (if not in dev mode) an MX record exists for the domain
 func ValidateEmail(email string) bool {
-	return email == "" || mailRegex.Match([]byte(email))
+	return email == "" || (mailRegex.Match([]byte(email)) && (conf.Get().IsDev() || utils.CheckEmailMX(email)))
 }
 
 func ValidateTimezone(tz string) bool {

models/user_test.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	conf "github.com/muety/wakapi/config"
 	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
@@ -18,3 +19,41 @@ func TestUser_TZ(t *testing.T) {
 	assert.InDelta(t, time.Duration(offset1*int(time.Second)), sut1.TZOffset(), float64(1*time.Second))
 	assert.InDelta(t, time.Duration(offset2*int(time.Second)), sut2.TZOffset(), float64(1*time.Second))
 }
+
+func TestUser_MinDataAge(t *testing.T) {
+	c := conf.Load("")
+
+	var sut *User
+
+	// test with unlimited retention time / clean-up disabled
+	c.App.DataRetentionMonths = -1
+	c.Subscriptions.Enabled = false
+	sut = &User{}
+	assert.Zero(t, sut.MinDataAge())
+
+	// test with limited retention time / clean-up enabled, and subscriptions disabled
+	c.App.DataRetentionMonths = 1
+	c.Subscriptions.Enabled = false
+	sut = &User{}
+	assert.WithinRange(t, sut.MinDataAge(), time.Now().AddDate(0, -1, -1), time.Now().AddDate(0, -1, 1))
+
+	// test with limited retention time, subscriptions enabled, and user hasn't got one
+	c.App.DataRetentionMonths = 1
+	c.Subscriptions.Enabled = true
+	sut = &User{}
+	assert.WithinRange(t, sut.MinDataAge(), time.Now().AddDate(0, -1, -1), time.Now().AddDate(0, -1, 1))
+
+	// test with limited retention time, subscriptions disabled, but user still got (an expired) one
+	c.App.DataRetentionMonths = 1
+	c.Subscriptions.Enabled = false
+	until2 := CustomTime(time.Now().AddDate(0, 0, -1))
+	sut = &User{SubscribedUntil: &until2}
+	assert.WithinRange(t, sut.MinDataAge(), time.Now().AddDate(0, -1, -1), time.Now().AddDate(0, -1, 1))
+
+	// test with limited retention time, subscriptions enabled, and user has got one
+	c.App.DataRetentionMonths = 1
+	c.Subscriptions.Enabled = true
+	until1 := CustomTime(time.Now().AddDate(0, 1, 0))
+	sut = &User{SubscribedUntil: &until1}
+	assert.Zero(t, sut.MinDataAge())
+}

models/view/common.go

@@ -0,0 +1,19 @@
+package view
+
+type BasicViewModel interface {
+	SetError(string)
+	SetSuccess(string)
+}
+
+type Messages struct {
+	Success string
+	Error   string
+}
+
+func (m *Messages) SetError(message string) {
+	m.Error = message
+}
+
+func (m *Messages) SetSuccess(message string) {
+	m.Success = message
+}

models/view/home.go

@@ -6,19 +6,18 @@ type Newsbox struct {
 }
 
 type HomeViewModel struct {
-	Success    string
-	Error      string
+	Messages
 	TotalHours int
 	TotalUsers int
 	Newsbox    *Newsbox
 }
 
 func (s *HomeViewModel) WithSuccess(m string) *HomeViewModel {
-	s.Success = m
+	s.SetSuccess(m)
 	return s
 }
 
 func (s *HomeViewModel) WithError(m string) *HomeViewModel {
-	s.Error = m
+	s.SetError(m)
 	return s
 }

models/view/imprint.go

@@ -1,18 +1,17 @@
 package view
 
 type ImprintViewModel struct {
+	Messages
 	HtmlText string
-	Success  string
-	Error    string
 }
 
 func (s *ImprintViewModel) WithSuccess(m string) *ImprintViewModel {
-	s.Success = m
+	s.SetSuccess(m)
 	return s
 }
 
 func (s *ImprintViewModel) WithError(m string) *ImprintViewModel {
-	s.Error = m
+	s.SetError(m)
 	return s
 }
 

models/view/leaderboard.go

@@ -2,33 +2,34 @@ package view
 
 import (
 	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/utils"
 	"strings"
 	"time"
 )
 
 type LeaderboardViewModel struct {
+	Messages
 	User          *models.User
 	By            string
 	Key           string
-	Items         []*models.LeaderboardItem
+	Items         []*models.LeaderboardItemRanked
 	TopKeys       []string
 	UserLanguages map[string][]string
 	ApiKey        string
-	Success       string
-	Error         string
+	PageParams    *utils.PageParams
 }
 
 func (s *LeaderboardViewModel) WithSuccess(m string) *LeaderboardViewModel {
-	s.Success = m
+	s.SetSuccess(m)
 	return s
 }
 
 func (s *LeaderboardViewModel) WithError(m string) *LeaderboardViewModel {
-	s.Error = m
+	s.SetError(m)
 	return s
 }
 
-func (s *LeaderboardViewModel) ColorModifier(item *models.LeaderboardItem, principal *models.User) string {
+func (s *LeaderboardViewModel) ColorModifier(item *models.LeaderboardItemRanked, principal *models.User) string {
 	if principal != nil && item.UserID == principal.ID {
 		return "self"
 	}
@@ -47,26 +48,32 @@ func (s *LeaderboardViewModel) ColorModifier(item *models.LeaderboardItem, princ
 func (s *LeaderboardViewModel) LangIcon(lang string) string {
 	// https://icon-sets.iconify.design/mdi/
 	langs := map[string]string{
-		"c":          "c",
-		"c++":        "cpp",
-		"cpp":        "cpp",
-		"go":         "go",
-		"haskell":    "haskell",
-		"html":       "html5",
-		"java":       "java",
-		"javascript": "javascript",
-		"kotlin":     "kotlin",
-		"lua":        "lua",
-		"php":        "php",
-		"python":     "python",
-		"r":          "r",
-		"ruby":       "ruby",
-		"rust":       "rust",
-		"swift":      "swift",
-		"typescript": "typescript",
+		"c++":        "language-cpp",
+		"cpp":        "language-cpp",
+		"go":         "language-go",
+		"haskell":    "language-haskell",
+		"html":       "language-html5",
+		"java":       "language-java",
+		"javascript": "language-javascript",
+		"jsx":        "language-javascript",
+		"kotlin":     "language-kotlin",
+		"lua":        "language-lua",
+		"php":        "language-php",
+		"python":     "language-python",
+		"r":          "language-r",
+		"ruby":       "language-ruby",
+		"rust":       "language-rust",
+		"swift":      "language-swift",
+		"typescript": "language-typescript",
+		"tsx":        "language-typescript",
+		"markdown":   "language-markdown",
+		"vue":        "vuejs",
+		"react":      "react",
+		"bash":       "bash",
+		"json":       "code-json",
 	}
 	if match, ok := langs[strings.ToLower(lang)]; ok {
-		return "mdi:language-" + match
+		return "mdi:" + match
 	}
 	return ""
 }

models/view/login.go

@@ -1,8 +1,7 @@
 package view
 
 type LoginViewModel struct {
-	Success     string
-	Error       string
+	Messages
 	TotalUsers  int
 	AllowSignup bool
 }
@@ -13,11 +12,11 @@ type SetPasswordViewModel struct {
 }
 
 func (s *LoginViewModel) WithSuccess(m string) *LoginViewModel {
-	s.Success = m
+	s.SetSuccess(m)
 	return s
 }
 
 func (s *LoginViewModel) WithError(m string) *LoginViewModel {
-	s.Error = m
+	s.SetError(m)
 	return s
 }

models/view/settings.go

@@ -1,16 +1,22 @@
 package view
 
-import "github.com/muety/wakapi/models"
+import (
+	"github.com/muety/wakapi/models"
+	"time"
+)
 
 type SettingsViewModel struct {
-	User             *models.User
-	LanguageMappings []*models.LanguageMapping
-	Aliases          []*SettingsVMCombinedAlias
-	Labels           []*SettingsVMCombinedLabel
-	Projects         []string
-	ApiKey           string
-	Success          string
-	Error            string
+	Messages
+	User                *models.User
+	LanguageMappings    []*models.LanguageMapping
+	Aliases             []*SettingsVMCombinedAlias
+	Labels              []*SettingsVMCombinedLabel
+	Projects            []string
+	SubscriptionPrice   string
+	DataRetentionMonths int
+	UserFirstData       time.Time
+	SupportContact      string
+	ApiKey              string
 }
 
 type SettingsVMCombinedAlias struct {
@@ -24,12 +30,16 @@ type SettingsVMCombinedLabel struct {
 	Values []string
 }
 
+func (s *SettingsViewModel) SubscriptionsEnabled() bool {
+	return s.SubscriptionPrice != ""
+}
+
 func (s *SettingsViewModel) WithSuccess(m string) *SettingsViewModel {
-	s.Success = m
+	s.SetSuccess(m)
 	return s
 }
 
 func (s *SettingsViewModel) WithError(m string) *SettingsViewModel {
-	s.Error = m
+	s.SetError(m)
 	return s
 }

models/view/summary.go

@@ -1,8 +1,13 @@
 package view
 
-import "github.com/muety/wakapi/models"
+import (
+	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	"time"
+)
 
 type SummaryViewModel struct {
+	Messages
 	*models.Summary
 	*models.SummaryParams
 	User           *models.User
@@ -10,18 +15,26 @@ type SummaryViewModel struct {
 	EditorColors   map[string]string
 	LanguageColors map[string]string
 	OSColors       map[string]string
-	Error          string
-	Success        string
 	ApiKey         string
 	RawQuery       string
+	UserFirstData  time.Time
+}
+
+func (s SummaryViewModel) UserDataExpiring() bool {
+	cfg := conf.Get()
+	return cfg.Subscriptions.Enabled &&
+		cfg.App.DataRetentionMonths > 0 &&
+		!s.UserFirstData.IsZero() &&
+		!s.User.HasActiveSubscription() &&
+		time.Now().AddDate(0, -cfg.App.DataRetentionMonths, 0).After(s.UserFirstData)
 }
 
 func (s *SummaryViewModel) WithSuccess(m string) *SummaryViewModel {
-	s.Success = m
+	s.SetSuccess(m)
 	return s
 }
 
 func (s *SummaryViewModel) WithError(m string) *SummaryViewModel {
-	s.Error = m
+	s.SetError(m)
 	return s
 }

package.json

@@ -9,10 +9,10 @@
     "compress": "brotli -f static/assets/css/*.dist.css && brotli -f static/assets/js/*.dist.js"
   },
   "devDependencies": {
-    "@iconify/json": "^1.1.444",
+    "@iconify/json": "^2.1.136",
     "@iconify/json-tools": "^1.0.10",
     "chokidar-cli": "^3.0.0",
-    "tailwindcss": "2.2.19"
+    "tailwindcss": "^3.1.8"
   },
   "dependencies": {}
 }

repositories/heartbeat.go

@@ -170,7 +170,7 @@ func (r *HeartbeatRepository) CountByUsers(users []*models.User) ([]*models.Coun
 	return counts, nil
 }
 
-func (r HeartbeatRepository) GetEntitySetByUser(entityType uint8, user *models.User) ([]string, error) {
+func (r *HeartbeatRepository) GetEntitySetByUser(entityType uint8, user *models.User) ([]string, error) {
 	var results []string
 	if err := r.db.
 		Model(&models.Heartbeat{}).
@@ -199,3 +199,13 @@ func (r *HeartbeatRepository) DeleteByUser(user *models.User) error {
 	}
 	return nil
 }
+
+func (r *HeartbeatRepository) DeleteByUserBefore(user *models.User, t time.Time) error {
+	if err := r.db.
+		Where("user_id = ?", user.ID).
+		Where("time <= ?", t.Local()).
+		Delete(models.Heartbeat{}).Error; err != nil {
+		return err
+	}
+	return nil
+}

repositories/key_value.go

@@ -34,6 +34,17 @@ func (r *KeyValueRepository) GetString(key string) (*models.KeyStringValue, erro
 	return kv, nil
 }
 
+func (r *KeyValueRepository) Search(like string) ([]*models.KeyStringValue, error) {
+	var keyValues []*models.KeyStringValue
+	if err := r.db.Table("key_string_values").
+		Where("`key` like ?", like).
+		Find(&keyValues).
+		Error; err != nil {
+		return nil, err
+	}
+	return keyValues, nil
+}
+
 func (r *KeyValueRepository) PutString(kv *models.KeyStringValue) error {
 	result := r.db.
 		Clauses(clause.OnConflict{

repositories/leaderboard.go

@@ -33,13 +33,27 @@ func (r *LeaderboardRepository) CountAllByUser(userId string) (int64, error) {
 	return count, err
 }
 
-func (r *LeaderboardRepository) GetAllAggregatedByInterval(key *models.IntervalKey, by *uint8) ([]*models.LeaderboardItem, error) {
+func (r *LeaderboardRepository) CountUsers() (int64, error) {
+	var count int64
+	err := r.db.
+		Table("leaderboard_items").
+		Distinct("user_id").
+		Count(&count).Error
+	return count, err
+}
+
+func (r *LeaderboardRepository) GetAllAggregatedByInterval(key *models.IntervalKey, by *uint8, limit, skip int) ([]*models.LeaderboardItemRanked, error) {
 	// TODO: distinct by (user, key) to filter out potential duplicates ?
-	var items []*models.LeaderboardItem
-	q := r.db.
+
+	var items []*models.LeaderboardItemRanked
+	subq := r.db.
+		Table("leaderboard_items").
 		Select("*, rank() over (partition by \"key\" order by total desc) as \"rank\"").
 		Where("\"interval\" in ?", *key)
-	q = utils.WhereNullable(q, "\"by\"", by)
+	subq = utils.WhereNullable(subq, "\"by\"", by)
+
+	q := r.db.Table("(?) as ranked", subq)
+	q = r.withPaging(q, limit, skip)
 
 	if err := q.Find(&items).Error; err != nil {
 		return nil, err
@@ -47,13 +61,16 @@ func (r *LeaderboardRepository) GetAllAggregatedByInterval(key *models.IntervalK
 	return items, nil
 }
 
-func (r *LeaderboardRepository) GetAggregatedByUserAndInterval(userId string, key *models.IntervalKey, by *uint8) ([]*models.LeaderboardItem, error) {
-	var items []*models.LeaderboardItem
-	q := r.db.
+func (r *LeaderboardRepository) GetAggregatedByUserAndInterval(userId string, key *models.IntervalKey, by *uint8, limit, skip int) ([]*models.LeaderboardItemRanked, error) {
+	var items []*models.LeaderboardItemRanked
+	subq := r.db.
+		Table("leaderboard_items").
 		Select("*, rank() over (partition by \"key\" order by total desc) as \"rank\"").
-		Where("user_id = ?", userId).
 		Where("\"interval\" in ?", *key)
-	q = utils.WhereNullable(q, "\"by\"", by)
+	subq = utils.WhereNullable(subq, "\"by\"", by)
+
+	q := r.db.Table("(?) as ranked", subq).Where("user_id = ?", userId)
+	q = r.withPaging(q, limit, skip)
 
 	if err := q.Find(&items).Error; err != nil {
 		return nil, err
@@ -79,3 +96,13 @@ func (r *LeaderboardRepository) DeleteByUserAndInterval(userId string, key *mode
 	}
 	return nil
 }
+
+func (r *LeaderboardRepository) withPaging(q *gorm.DB, limit, skip int) *gorm.DB {
+	if limit > 0 {
+		q = q.Where("\"rank\" <= ?", skip+limit)
+	}
+	if skip > 0 {
+		q = q.Where("\"rank\" > ?", skip)
+	}
+	return q
+}

repositories/metrics.go

@@ -16,7 +16,7 @@ FROM information_schema.tables
 WHERE table_schema = ?
 GROUP BY table_schema`
 
-const sizeTplPostgres = `SELECT pg_database_size('%s');`
+const sizeTplPostgres = `SELECT pg_database_size(?);`
 
 const sizeTplSqlite = `
 SELECT page_count * page_size as size

repositories/repositories.go

@@ -31,6 +31,7 @@ type IHeartbeatRepository interface {
 	GetEntitySetByUser(uint8, *models.User) ([]string, error)
 	DeleteBefore(time.Time) error
 	DeleteByUser(*models.User) error
+	DeleteByUserBefore(*models.User, time.Time) error
 }
 
 type IDiagnosticsRepository interface {
@@ -42,6 +43,7 @@ type IKeyValueRepository interface {
 	GetString(string) (*models.KeyStringValue, error)
 	PutString(*models.KeyStringValue) error
 	DeleteString(string) error
+	Search(string) ([]*models.KeyStringValue, error)
 }
 
 type ILanguageMappingRepository interface {
@@ -66,14 +68,12 @@ type ISummaryRepository interface {
 	GetByUserWithin(*models.User, time.Time, time.Time) ([]*models.Summary, error)
 	GetLastByUser() ([]*models.TimeByUser, error)
 	DeleteByUser(string) error
+	DeleteByUserBefore(string, time.Time) error
 }
 
 type IUserRepository interface {
-	GetById(string) (*models.User, error)
+	FindOne(user models.User) (*models.User, error)
 	GetByIds([]string) ([]*models.User, error)
-	GetByApiKey(string) (*models.User, error)
-	GetByEmail(string) (*models.User, error)
-	GetByResetToken(string) (*models.User, error)
 	GetAll() ([]*models.User, error)
 	GetMany([]string) ([]*models.User, error)
 	GetAllByReports(bool) ([]*models.User, error)
@@ -90,8 +90,9 @@ type IUserRepository interface {
 type ILeaderboardRepository interface {
 	InsertBatch([]*models.LeaderboardItem) error
 	CountAllByUser(string) (int64, error)
+	CountUsers() (int64, error)
 	DeleteByUser(string) error
 	DeleteByUserAndInterval(string, *models.IntervalKey) error
-	GetAllAggregatedByInterval(*models.IntervalKey, *uint8) ([]*models.LeaderboardItem, error)
-	GetAggregatedByUserAndInterval(string, *models.IntervalKey, *uint8) ([]*models.LeaderboardItem, error)
+	GetAllAggregatedByInterval(*models.IntervalKey, *uint8, int, int) ([]*models.LeaderboardItemRanked, error)
+	GetAggregatedByUserAndInterval(string, *models.IntervalKey, *uint8, int, int) ([]*models.LeaderboardItemRanked, error)
 }

repositories/summary.go

@@ -86,6 +86,16 @@ func (r *SummaryRepository) DeleteByUser(userId string) error {
 	return nil
 }
 
+func (r *SummaryRepository) DeleteByUserBefore(userId string, t time.Time) error {
+	if err := r.db.
+		Where("user_id = ?", userId).
+		Where("to_time <= ?", t.Local()).
+		Delete(models.Summary{}).Error; err != nil {
+		return err
+	}
+	return nil
+}
+
 // inplace
 func (r *SummaryRepository) populateItems(summaries []*models.Summary, conditions []clause.Interface) error {
 	var items []*models.SummaryItem

repositories/user.go

@@ -15,9 +15,9 @@ func NewUserRepository(db *gorm.DB) *UserRepository {
 	return &UserRepository{db: db}
 }
 
-func (r *UserRepository) GetById(userId string) (*models.User, error) {
+func (r *UserRepository) FindOne(attributes models.User) (*models.User, error) {
 	u := &models.User{}
-	if err := r.db.Where(&models.User{ID: userId}).First(u).Error; err != nil {
+	if err := r.db.Where(&attributes).First(u).Error; err != nil {
 		return u, err
 	}
 	return u, nil
@@ -34,39 +34,6 @@ func (r *UserRepository) GetByIds(userIds []string) ([]*models.User, error) {
 	return users, nil
 }
 
-func (r *UserRepository) GetByApiKey(key string) (*models.User, error) {
-	if key == "" {
-		return nil, errors.New("invalid input")
-	}
-	u := &models.User{}
-	if err := r.db.Where(&models.User{ApiKey: key}).First(u).Error; err != nil {
-		return u, err
-	}
-	return u, nil
-}
-
-func (r *UserRepository) GetByResetToken(resetToken string) (*models.User, error) {
-	if resetToken == "" {
-		return nil, errors.New("invalid input")
-	}
-	u := &models.User{}
-	if err := r.db.Where(&models.User{ResetToken: resetToken}).First(u).Error; err != nil {
-		return u, err
-	}
-	return u, nil
-}
-
-func (r *UserRepository) GetByEmail(email string) (*models.User, error) {
-	if email == "" {
-		return nil, errors.New("invalid input")
-	}
-	u := &models.User{}
-	if err := r.db.Where(&models.User{Email: email}).First(u).Error; err != nil {
-		return u, err
-	}
-	return u, nil
-}
-
 func (r *UserRepository) GetAll() ([]*models.User, error) {
 	var users []*models.User
 	if err := r.db.
@@ -144,7 +111,7 @@ func (r *UserRepository) Count() (int64, error) {
 }
 
 func (r *UserRepository) InsertOrGet(user *models.User) (*models.User, bool, error) {
-	if u, err := r.GetById(user.ID); err == nil && u != nil && u.ID != "" {
+	if u, err := r.FindOne(models.User{ID: user.ID}); err == nil && u != nil && u.ID != "" {
 		return u, false, nil
 	}
 
@@ -158,24 +125,27 @@ func (r *UserRepository) InsertOrGet(user *models.User) (*models.User, bool, err
 
 func (r *UserRepository) Update(user *models.User) (*models.User, error) {
 	updateMap := map[string]interface{}{
-		"api_key":             user.ApiKey,
-		"password":            user.Password,
-		"email":               user.Email,
-		"last_logged_in_at":   user.LastLoggedInAt,
-		"share_data_max_days": user.ShareDataMaxDays,
-		"share_editors":       user.ShareEditors,
-		"share_languages":     user.ShareLanguages,
-		"share_oss":           user.ShareOSs,
-		"share_projects":      user.ShareProjects,
-		"share_machines":      user.ShareMachines,
-		"share_labels":        user.ShareLabels,
-		"wakatime_api_key":    user.WakatimeApiKey,
-		"wakatime_api_url":    user.WakatimeApiUrl,
-		"has_data":            user.HasData,
-		"reset_token":         user.ResetToken,
-		"location":            user.Location,
-		"reports_weekly":      user.ReportsWeekly,
-		"public_leaderboard":  user.PublicLeaderboard,
+		"api_key":              user.ApiKey,
+		"password":             user.Password,
+		"email":                user.Email,
+		"last_logged_in_at":    user.LastLoggedInAt,
+		"share_data_max_days":  user.ShareDataMaxDays,
+		"share_editors":        user.ShareEditors,
+		"share_languages":      user.ShareLanguages,
+		"share_oss":            user.ShareOSs,
+		"share_projects":       user.ShareProjects,
+		"share_machines":       user.ShareMachines,
+		"share_labels":         user.ShareLabels,
+		"wakatime_api_key":     user.WakatimeApiKey,
+		"wakatime_api_url":     user.WakatimeApiUrl,
+		"has_data":             user.HasData,
+		"reset_token":          user.ResetToken,
+		"location":             user.Location,
+		"reports_weekly":       user.ReportsWeekly,
+		"public_leaderboard":   user.PublicLeaderboard,
+		"subscribed_until":     user.SubscribedUntil,
+		"subscription_renewal": user.SubscriptionRenewal,
+		"stripe_customer_id":   user.StripeCustomerId,
 	}
 
 	result := r.db.Model(user).Updates(updateMap)

routes/api/avatar.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"codeberg.org/Codeberg/avatars"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	lru "github.com/hashicorp/golang-lru"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/utils"
@@ -27,20 +27,19 @@ func NewAvatarHandler() *AvatarHandler {
 	}
 }
 
-func (h *AvatarHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/avatar/{hash}.svg").Subrouter()
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *AvatarHandler) RegisterRoutes(router chi.Router) {
+	router.Get("/avatar/{hash}.svg", h.Get)
 }
 
 func (h *AvatarHandler) Get(w http.ResponseWriter, r *http.Request) {
-	hash := mux.Vars(r)["hash"]
+	hash := chi.URLParam(r, "hash")
 
 	if utils.IsNoCache(r, 1*time.Hour) {
 		h.cache.Remove(hash)
 	}
 
 	if !h.cache.Contains(hash) {
-		h.cache.Add(hash, avatars.MakeMaleAvatar(hash))
+		h.cache.Add(hash, avatars.MakeAvatar(hash))
 	}
 	data, _ := h.cache.Get(hash)
 

routes/api/badge.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"github.com/duke-git/lancet/v2/maputil"
 	"github.com/duke-git/lancet/v2/slice"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/shields/v1"
@@ -33,13 +33,12 @@ func NewBadgeHandler(userService services.IUserService, summaryService services.
 	}
 }
 
-func (h *BadgeHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/badge/{user}").Subrouter()
-	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *BadgeHandler) RegisterRoutes(router chi.Router) {
+	router.Get("/badge/{user}/*", h.Get)
 }
 
 func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
-	user, err := h.userSrvc.GetUserById(mux.Vars(r)["user"])
+	user, err := h.userSrvc.GetUserById(chi.URLParam(r, "user"))
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
 		return

routes/api/badge_test.go

@@ -0,0 +1,154 @@
+package api
+
+import (
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/middlewares"
+	"github.com/muety/wakapi/mocks"
+	"github.com/muety/wakapi/models"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+	"io/ioutil"
+	"net/http"
+	"net/http/httptest"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+)
+
+var (
+	user1 = models.User{
+		ID:               "user1",
+		ShareDataMaxDays: 30,
+		ShareLanguages:   true,
+	}
+
+	summary1 = models.Summary{
+		User:     &user1,
+		UserID:   "user1",
+		FromTime: models.CustomTime(time.Date(2023, 3, 14, 0, 0, 0, 0, time.Local)),
+		ToTime:   models.CustomTime(time.Date(2023, 3, 14, 23, 59, 59, 0, time.Local)),
+		Languages: []*models.SummaryItem{
+			{
+				Type:  models.SummaryLanguage,
+				Key:   "go",
+				Total: 12 * time.Minute / time.Second,
+			},
+		},
+	}
+)
+
+func TestBadgeHandler_Get(t *testing.T) {
+	router := chi.NewRouter()
+	apiRouter := chi.NewRouter()
+	apiRouter.Use(middlewares.NewPrincipalMiddleware())
+	router.Mount("/api", apiRouter)
+
+	userServiceMock := new(mocks.UserServiceMock)
+	userServiceMock.On("GetUserById", "user1").Return(&user1, nil)
+
+	summaryServiceMock := new(mocks.SummaryServiceMock)
+	summaryServiceMock.On("Aliased", mock.AnythingOfType("time.Time"), mock.AnythingOfType("time.Time"), &user1, mock.Anything, mock.Anything).Return(&summary1, nil)
+
+	badgeHandler := NewBadgeHandler(userServiceMock, summaryServiceMock)
+	badgeHandler.RegisterRoutes(apiRouter)
+
+	t.Run("when requesting badge", func(t *testing.T) {
+		t.Run("should return badge", func(t *testing.T) {
+			rec := httptest.NewRecorder()
+
+			req := httptest.NewRequest(http.MethodGet, "/api/badge/{user}/interval:week/language:go", nil)
+			req = withUrlParam(req, "user", "user1")
+
+			router.ServeHTTP(rec, req)
+			res := rec.Result()
+			defer res.Body.Close()
+
+			assert.Equal(t, http.StatusOK, res.StatusCode)
+
+			data, err := ioutil.ReadAll(res.Body)
+			if err != nil {
+				t.Errorf("unextected error. Error: %s", err)
+			}
+
+			assert.True(t, strings.HasPrefix(string(data), "<svg"))
+			assert.Contains(t, string(data), "0 hrs 12 mins")
+		})
+
+		t.Run("should not return badge if shared interval exceeded", func(t *testing.T) {
+			rec := httptest.NewRecorder()
+
+			req := httptest.NewRequest(http.MethodGet, "/api/badge/{user}/interval:year/language:go", nil)
+			req = withUrlParam(req, "user", "user1")
+
+			router.ServeHTTP(rec, req)
+			res := rec.Result()
+			defer res.Body.Close()
+
+			assert.Equal(t, http.StatusForbidden, res.StatusCode)
+
+			data, err := ioutil.ReadAll(res.Body)
+			if err != nil {
+				t.Errorf("unextected error. Error: %s", err)
+			}
+
+			assert.False(t, strings.HasPrefix(string(data), "<svg"))
+		})
+
+		t.Run("should not return badge if entity type not shared", func(t *testing.T) {
+			rec := httptest.NewRecorder()
+
+			req := httptest.NewRequest(http.MethodGet, "/api/badge/{user}/interval:year/project:foo", nil)
+			req = withUrlParam(req, "user", "user1")
+
+			router.ServeHTTP(rec, req)
+			res := rec.Result()
+			defer res.Body.Close()
+
+			assert.Equal(t, http.StatusForbidden, res.StatusCode)
+
+			data, err := ioutil.ReadAll(res.Body)
+			if err != nil {
+				t.Errorf("unextected error. Error: %s", err)
+			}
+
+			assert.False(t, strings.HasPrefix(string(data), "<svg"))
+		})
+	})
+}
+
+func TestBadgeHandler_EntityPattern(t *testing.T) {
+	type test struct {
+		test string
+		key  string
+		val  string
+	}
+
+	pathPrefix := "/compat/shields/v1/current/today/"
+
+	tests := []test{
+		{test: pathPrefix + "project:wakapi", key: "project", val: "wakapi"},
+		{test: pathPrefix + "os:Linux", key: "os", val: "Linux"},
+		{test: pathPrefix + "editor:VSCode", key: "editor", val: "VSCode"},
+		{test: pathPrefix + "language:Java", key: "language", val: "Java"},
+		{test: pathPrefix + "machine:devmachine", key: "machine", val: "devmachine"},
+		{test: pathPrefix + "label:work", key: "label", val: "work"},
+		{test: pathPrefix + "foo:bar", key: "", val: ""},                                   // invalid entity
+		{test: pathPrefix + "project:01234", key: "project", val: "01234"},                 // digits only
+		{test: pathPrefix + "project:anchr-web-ext", key: "project", val: "anchr-web-ext"}, // with dashes
+		{test: pathPrefix + "project:wakapi v2", key: "project", val: "wakapi v2"},         // with blank space
+		{test: pathPrefix + "project:project", key: "project", val: "project"},
+		{test: pathPrefix + "project:Anchr-Android_v2.0", key: "project", val: "Anchr-Android_v2.0"}, // all the way
+	}
+
+	sut := regexp.MustCompile(`(project|os|editor|language|machine|label):([^:?&/]+)`) // see entityFilterPattern in badge_utils.go
+
+	for _, tc := range tests {
+		var key, val string
+		if groups := sut.FindStringSubmatch(tc.test); len(groups) > 2 {
+			key, val = groups[1], groups[2]
+		}
+		assert.Equal(t, tc.key, key)
+		assert.Equal(t, tc.val, val)
+	}
+}

routes/api/diagnostics.go

@@ -2,14 +2,13 @@ package api
 
 import (
 	"encoding/json"
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
-	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
-
 	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/services"
 )
 
 type DiagnosticsApiHandler struct {
@@ -26,9 +25,8 @@ func NewDiagnosticsApiHandler(userService services.IUserService, diagnosticsServ
 	}
 }
 
-func (h *DiagnosticsApiHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/plugins/errors").Subrouter()
-	r.Path("").Methods(http.MethodPost).HandlerFunc(h.Post)
+func (h *DiagnosticsApiHandler) RegisterRoutes(router chi.Router) {
+	router.Post("/plugins/errors", h.Post)
 }
 
 // @Summary Push a new diagnostics object
@@ -55,5 +53,5 @@ func (h *DiagnosticsApiHandler) Post(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	utils.RespondJSON(w, r, http.StatusCreated, struct{}{})
+	helpers.RespondJSON(w, r, http.StatusCreated, struct{}{})
 }

routes/api/health.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	"gorm.io/gorm"
 )
 
@@ -16,9 +16,8 @@ func NewHealthApiHandler(db *gorm.DB) *HealthApiHandler {
 	return &HealthApiHandler{db: db}
 }
 
-func (h *HealthApiHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/health").Subrouter()
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *HealthApiHandler) RegisterRoutes(router chi.Router) {
+	router.Get("/health", h.Get)
 }
 
 // @Summary Check the application's health status

routes/api/heartbeat.go

@@ -1,9 +1,11 @@
 package api
 
 import (
+	"github.com/duke-git/lancet/v2/condition"
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	customMiddleware "github.com/muety/wakapi/middlewares/custom"
@@ -34,21 +36,22 @@ type heartbeatResponseVm struct {
 	Responses [][]interface{} `json:"responses"`
 }
 
-func (h *HeartbeatApiHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-		customMiddleware.NewWakatimeRelayMiddleware().Handler,
-	)
-	// see https://github.com/muety/wakapi/issues/203
-	r.Path("/heartbeat").Methods(http.MethodPost).HandlerFunc(h.Post)
-	r.Path("/heartbeats").Methods(http.MethodPost).HandlerFunc(h.Post)
-	r.Path("/users/{user}/heartbeats").Methods(http.MethodPost).HandlerFunc(h.Post)
-	r.Path("/users/{user}/heartbeats.bulk").Methods(http.MethodPost).HandlerFunc(h.Post)
-	r.Path("/v1/users/{user}/heartbeats").Methods(http.MethodPost).HandlerFunc(h.Post)
-	r.Path("/v1/users/{user}/heartbeats.bulk").Methods(http.MethodPost).HandlerFunc(h.Post)
-	r.Path("/compat/wakatime/v1/users/{user}/heartbeats").Methods(http.MethodPost).HandlerFunc(h.Post)
-	r.Path("/compat/wakatime/v1/users/{user}/heartbeats.bulk").Methods(http.MethodPost).HandlerFunc(h.Post)
+func (h *HeartbeatApiHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(
+			middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
+			customMiddleware.NewWakatimeRelayMiddleware().Handler,
+		)
+		// see https://github.com/muety/wakapi/issues/203
+		r.Post("/heartbeat", h.Post)
+		r.Post("/heartbeats", h.Post)
+		r.Post("/users/{user}/heartbeats", h.Post)
+		r.Post("/users/{user}/heartbeats.bulk", h.Post)
+		r.Post("/v1/users/{user}/heartbeats", h.Post)
+		r.Post("/v1/users/{user}/heartbeats.bulk", h.Post)
+		r.Post("/compat/wakatime/v1/users/{user}/heartbeats", h.Post)
+		r.Post("/compat/wakatime/v1/users/{user}/heartbeats.bulk", h.Post)
+	})
 }
 
 // @Summary Push a new heartbeat
@@ -85,11 +88,22 @@ func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		hb.OperatingSystem = opSys
-		hb.Editor = editor
-		hb.Machine = machineName
+		// TODO: unit test this
+		if hb.UserAgent != "" {
+			userAgent = hb.UserAgent
+			localOpSys, localEditor, _ := utils.ParseUserAgent(userAgent)
+			opSys = condition.TernaryOperator[bool, string](localOpSys != "", localOpSys, opSys)
+			editor = condition.TernaryOperator[bool, string](localEditor != "", localEditor, editor)
+		}
+		if hb.Machine != "" {
+			machineName = hb.Machine
+		}
+
 		hb.User = user
 		hb.UserID = user.ID
+		hb.Machine = machineName
+		hb.OperatingSystem = opSys
+		hb.Editor = editor
 		hb.UserAgent = userAgent
 
 		if !hb.Valid() || !hb.Timely(h.config.App.HeartbeatsMaxAge()) {
@@ -120,7 +134,7 @@ func (h *HeartbeatApiHandler) Post(w http.ResponseWriter, r *http.Request) {
 
 	defer func() {}()
 
-	utils.RespondJSON(w, r, http.StatusCreated, constructSuccessResponse(len(heartbeats)))
+	helpers.RespondJSON(w, r, http.StatusCreated, constructSuccessResponse(len(heartbeats)))
 }
 
 // construct weird response format (see https://github.com/wakatime/wakatime/blob/2e636d389bf5da4e998e05d5285a96ce2c181e3d/wakatime/api.py#L288)

routes/api/metrics.go

@@ -3,15 +3,15 @@ package api
 import (
 	"errors"
 	"github.com/emvi/logbuch"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/helpers"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
 	mm "github.com/muety/wakapi/models/metrics"
 	"github.com/muety/wakapi/repositories"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 	"net/http"
 	"runtime"
 	"sort"
@@ -37,6 +37,9 @@ const (
 	DescAdminTotalUsers      = "Total number of registered users."
 	DescAdminActiveUsers     = "Number of active users."
 
+	DescJobQueueEnqueued      = "Number of jobs currently enqueued"
+	DescJobQueueTotalFinished = "Total number of processed jobs"
+
 	DescMemAllocTotal = "Total number of bytes allocated for heap"
 	DescMemSysTotal   = "Total number of bytes obtained from the OS"
 	DescGoroutines    = "Total number of running goroutines"
@@ -63,18 +66,18 @@ func NewMetricsHandler(userService services.IUserService, summaryService service
 	}
 }
 
-func (h *MetricsHandler) RegisterRoutes(router *mux.Router) {
+func (h *MetricsHandler) RegisterRoutes(router chi.Router) {
 	if !h.config.Security.ExposeMetrics {
 		return
 	}
 
 	logbuch.Info("exposing prometheus metrics under /api/metrics")
 
-	r := router.PathPrefix("/metrics").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+	r := chi.NewRouter()
+	r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+	r.Get("/", h.Get)
+
+	router.Mount("/metrics", r)
 }
 
 func (h *MetricsHandler) Get(w http.ResponseWriter, r *http.Request) {
@@ -126,7 +129,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 		return nil, err
 	}
 
-	from, to := utils.MustResolveIntervalRawTZ("today", user.TZ())
+	from, to := helpers.MustResolveIntervalRawTZ("today", user.TZ())
 
 	summaryToday, err := h.summarySrvc.Aliased(from, to, user, h.summarySrvc.Retrieve, nil, false)
 	if err != nil {
@@ -142,21 +145,21 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 
 	// User Metrics
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_cumulative_seconds_total",
 		Desc:   DescAllTime,
 		Value:  int64(v1.NewAllTimeFrom(summaryAllTime).Data.TotalSeconds),
 		Labels: []mm.Label{},
 	})
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_seconds_total",
 		Desc:   DescTotal,
 		Value:  int64(summaryToday.TotalTime().Seconds()),
 		Labels: []mm.Label{},
 	})
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_heartbeats_total",
 		Desc:   DescHeartbeats,
 		Value:  int64(heartbeatCount),
@@ -164,7 +167,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 	})
 
 	for _, p := range summaryToday.Projects {
-		metrics = append(metrics, &mm.CounterMetric{
+		metrics = append(metrics, &mm.GaugeMetric{
 			Name:   MetricsPrefix + "_project_seconds_total",
 			Desc:   DescProjects,
 			Value:  int64(summaryToday.TotalTimeByKey(models.SummaryProject, p.Key).Seconds()),
@@ -173,7 +176,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 	}
 
 	for _, l := range summaryToday.Languages {
-		metrics = append(metrics, &mm.CounterMetric{
+		metrics = append(metrics, &mm.GaugeMetric{
 			Name:   MetricsPrefix + "_language_seconds_total",
 			Desc:   DescLanguages,
 			Value:  int64(summaryToday.TotalTimeByKey(models.SummaryLanguage, l.Key).Seconds()),
@@ -182,7 +185,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 	}
 
 	for _, e := range summaryToday.Editors {
-		metrics = append(metrics, &mm.CounterMetric{
+		metrics = append(metrics, &mm.GaugeMetric{
 			Name:   MetricsPrefix + "_editor_seconds_total",
 			Desc:   DescEditors,
 			Value:  int64(summaryToday.TotalTimeByKey(models.SummaryEditor, e.Key).Seconds()),
@@ -191,7 +194,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 	}
 
 	for _, o := range summaryToday.OperatingSystems {
-		metrics = append(metrics, &mm.CounterMetric{
+		metrics = append(metrics, &mm.GaugeMetric{
 			Name:   MetricsPrefix + "_operating_system_seconds_total",
 			Desc:   DescOperatingSystems,
 			Value:  int64(summaryToday.TotalTimeByKey(models.SummaryOS, o.Key).Seconds()),
@@ -200,7 +203,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 	}
 
 	for _, m := range summaryToday.Machines {
-		metrics = append(metrics, &mm.CounterMetric{
+		metrics = append(metrics, &mm.GaugeMetric{
 			Name:   MetricsPrefix + "_machine_seconds_total",
 			Desc:   DescMachines,
 			Value:  int64(summaryToday.TotalTimeByKey(models.SummaryMachine, m.Key).Seconds()),
@@ -209,7 +212,7 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 	}
 
 	for _, m := range summaryToday.Labels {
-		metrics = append(metrics, &mm.CounterMetric{
+		metrics = append(metrics, &mm.GaugeMetric{
 			Name:   MetricsPrefix + "_label_seconds_total",
 			Desc:   DescLabels,
 			Value:  int64(summaryToday.TotalTimeByKey(models.SummaryLabel, m.Key).Seconds()),
@@ -221,21 +224,21 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 	var memStats runtime.MemStats
 	runtime.ReadMemStats(&memStats)
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_goroutines_total",
 		Desc:   DescGoroutines,
 		Value:  int64(runtime.NumGoroutine()),
 		Labels: []mm.Label{},
 	})
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_mem_alloc_total",
 		Desc:   DescMemAllocTotal,
 		Value:  int64(memStats.Alloc),
 		Labels: []mm.Label{},
 	})
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_mem_sys_total",
 		Desc:   DescMemSysTotal,
 		Value:  int64(memStats.Sys),
@@ -248,13 +251,30 @@ func (h *MetricsHandler) getUserMetrics(user *models.User) (*mm.Metrics, error)
 		logbuch.Warn("failed to get database size (%v)", err)
 	}
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_db_total_bytes",
 		Desc:   DescDatabaseSize,
 		Value:  dbSize,
 		Labels: []mm.Label{},
 	})
 
+	// Miscellaneous
+	for _, qm := range conf.GetQueueMetrics() {
+		metrics = append(metrics, &mm.GaugeMetric{
+			Name:   MetricsPrefix + "_queue_jobs_enqueued",
+			Value:  int64(qm.EnqueuedJobs),
+			Desc:   DescJobQueueEnqueued,
+			Labels: []mm.Label{{Key: "queue", Value: qm.Queue}},
+		})
+
+		metrics = append(metrics, &mm.CounterMetric{
+			Name:   MetricsPrefix + "_queue_jobs_total_finished",
+			Value:  int64(qm.FinishedJobs),
+			Desc:   DescJobQueueTotalFinished,
+			Labels: []mm.Label{{Key: "queue", Value: qm.Queue}},
+		})
+	}
+
 	return &metrics, nil
 }
 
@@ -281,28 +301,28 @@ func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error)
 		return nil, err
 	}
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_admin_seconds_total",
 		Desc:   DescAdminTotalTime,
 		Value:  int64(totalSeconds),
 		Labels: []mm.Label{},
 	})
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_admin_heartbeats_total",
 		Desc:   DescAdminTotalHeartbeats,
 		Value:  totalHeartbeats,
 		Labels: []mm.Label{},
 	})
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_admin_users_total",
 		Desc:   DescAdminTotalUsers,
 		Value:  totalUsers,
 		Labels: []mm.Label{},
 	})
 
-	metrics = append(metrics, &mm.CounterMetric{
+	metrics = append(metrics, &mm.GaugeMetric{
 		Name:   MetricsPrefix + "_admin_users_active_total",
 		Desc:   DescAdminActiveUsers,
 		Value:  int64(len(activeUsers)),
@@ -318,7 +338,7 @@ func (h *MetricsHandler) getAdminMetrics(user *models.User) (*mm.Metrics, error)
 	}
 
 	for _, uc := range userCounts {
-		metrics = append(metrics, &mm.CounterMetric{
+		metrics = append(metrics, &mm.GaugeMetric{
 			Name:   MetricsPrefix + "_admin_user_heartbeats_total",
 			Desc:   DescAdminUserHeartbeats,
 			Value:  uc.Count,

routes/api/summary.go

@@ -1,14 +1,14 @@
 package api
 
 import (
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"net/http"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 )
 
 type SummaryApiHandler struct {
@@ -25,12 +25,12 @@ func NewSummaryApiHandler(userService services.IUserService, summaryService serv
 	}
 }
 
-func (h *SummaryApiHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/summary").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *SummaryApiHandler) RegisterRoutes(router chi.Router) {
+	r := chi.NewRouter()
+	r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+	r.Get("/", h.Get)
+
+	router.Mount("/summary", r)
 }
 
 // @Summary Retrieve a summary
@@ -58,5 +58,5 @@ func (h *SummaryApiHandler) Get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	utils.RespondJSON(w, r, http.StatusOK, summary)
+	helpers.RespondJSON(w, r, http.StatusOK, summary)
 }

routes/api/test_utils_test.go

@@ -0,0 +1,17 @@
+package api
+
+import (
+	"context"
+	"github.com/go-chi/chi/v5"
+	"net/http"
+	"strings"
+)
+
+func withUrlParam(r *http.Request, key, value string) *http.Request {
+	r.URL.RawPath = strings.Replace(r.URL.RawPath, "{"+key+"}", value, 1)
+	r.URL.Path = strings.Replace(r.URL.Path, "{"+key+"}", value, 1)
+	rctx := chi.NewRouteContext()
+	rctx.URLParams.Add(key, value)
+	r = r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, rctx))
+	return r
+}

routes/compat/shields/v1/badge.go

@@ -2,16 +2,17 @@ package v1
 
 import (
 	"fmt"
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
+	"github.com/muety/wakapi/models/types"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"net/http"
 	"time"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/shields/v1"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 	"github.com/patrickmn/go-cache"
 )
 
@@ -31,10 +32,9 @@ func NewBadgeHandler(summaryService services.ISummaryService, userService servic
 	}
 }
 
-func (h *BadgeHandler) RegisterRoutes(router *mux.Router) {
+func (h *BadgeHandler) RegisterRoutes(router chi.Router) {
 	// no auth middleware here, handler itself resolves the user
-	r := router.PathPrefix("/compat/shields/v1/{user}").Subrouter()
-	r.Methods(http.MethodGet).HandlerFunc(h.Get)
+	router.Get("/compat/shields/v1/{user}/*", h.Get)
 }
 
 // @Summary Get badge data
@@ -48,7 +48,7 @@ func (h *BadgeHandler) RegisterRoutes(router *mux.Router) {
 // @Success 200 {object} v1.BadgeData
 // @Router /compat/shields/v1/{user}/{interval}/{filter} [get]
 func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
-	user, err := h.userSrvc.GetUserById(mux.Vars(r)["user"])
+	user, err := h.userSrvc.GetUserById(chi.URLParam(r, "user"))
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
 		return
@@ -63,7 +63,7 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 
 	cacheKey := fmt.Sprintf("%s_%v_%s", user.ID, *interval.Key, filters.Hash())
 	if cacheResult, ok := h.cache.Get(cacheKey); ok {
-		utils.RespondJSON(w, r, http.StatusOK, cacheResult.(*v1.BadgeData))
+		helpers.RespondJSON(w, r, http.StatusOK, cacheResult.(*v1.BadgeData))
 		return
 	}
 
@@ -83,11 +83,11 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 
 	vm := v1.NewBadgeDataFrom(summary)
 	h.cache.SetDefault(cacheKey, vm)
-	utils.RespondJSON(w, r, http.StatusOK, vm)
+	helpers.RespondJSON(w, r, http.StatusOK, vm)
 }
 
 func (h *BadgeHandler) loadUserSummary(user *models.User, interval *models.IntervalKey, filters *models.Filters) (*models.Summary, error, int) {
-	err, from, to := utils.ResolveIntervalTZ(interval, user.TZ())
+	err, from, to := helpers.ResolveIntervalTZ(interval, user.TZ())
 	if err != nil {
 		return nil, err, http.StatusBadRequest
 	}
@@ -98,7 +98,7 @@ func (h *BadgeHandler) loadUserSummary(user *models.User, interval *models.Inter
 		User: user,
 	}
 
-	var retrieveSummary services.SummaryRetriever = h.summarySrvc.Retrieve
+	var retrieveSummary types.SummaryRetriever = h.summarySrvc.Retrieve
 	if summaryParams.Recompute {
 		retrieveSummary = h.summarySrvc.Summarize
 	}

routes/compat/shields/v1/badge_test.go

@@ -1,43 +0,0 @@
-package v1
-
-import (
-	"github.com/stretchr/testify/assert"
-	"regexp"
-	"testing"
-)
-
-func TestBadgeHandler_EntityPattern(t *testing.T) {
-	type test struct {
-		test string
-		key  string
-		val  string
-	}
-
-	pathPrefix := "/compat/shields/v1/current/today/"
-
-	tests := []test{
-		{test: pathPrefix + "project:wakapi", key: "project", val: "wakapi"},
-		{test: pathPrefix + "os:Linux", key: "os", val: "Linux"},
-		{test: pathPrefix + "editor:VSCode", key: "editor", val: "VSCode"},
-		{test: pathPrefix + "language:Java", key: "language", val: "Java"},
-		{test: pathPrefix + "machine:devmachine", key: "machine", val: "devmachine"},
-		{test: pathPrefix + "label:work", key: "label", val: "work"},
-		{test: pathPrefix + "foo:bar", key: "", val: ""},                                   // invalid entity
-		{test: pathPrefix + "project:01234", key: "project", val: "01234"},                 // digits only
-		{test: pathPrefix + "project:anchr-web-ext", key: "project", val: "anchr-web-ext"}, // with dashes
-		{test: pathPrefix + "project:wakapi v2", key: "project", val: "wakapi v2"},         // with blank space
-		{test: pathPrefix + "project:project", key: "project", val: "project"},
-		{test: pathPrefix + "project:Anchr-Android_v2.0", key: "project", val: "Anchr-Android_v2.0"}, // all the way
-	}
-
-	sut := regexp.MustCompile(`(project|os|editor|language|machine|label):([^:?&/]+)`) // see entityFilterPattern in badge_utils.go
-
-	for _, tc := range tests {
-		var key, val string
-		if groups := sut.FindStringSubmatch(tc.test); len(groups) > 2 {
-			key, val = groups[1], groups[2]
-		}
-		assert.Equal(t, tc.key, key)
-		assert.Equal(t, tc.val, val)
-	}
-}

routes/compat/wakatime/v1/all_time.go

@@ -1,14 +1,15 @@
 package v1
 
 import (
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/helpers"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
+	"github.com/muety/wakapi/models/types"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 	"net/http"
 	"time"
 )
@@ -27,12 +28,11 @@ func NewAllTimeHandler(userService services.IUserService, summaryService service
 	}
 }
 
-func (h *AllTimeHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/compat/wakatime/v1/users/{user}/all_time_since_today").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *AllTimeHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+		r.Get("/compat/wakatime/v1/users/{user}/all_time_since_today", h.Get)
+	})
 }
 
 // @Summary Retrieve summary for all time
@@ -50,7 +50,7 @@ func (h *AllTimeHandler) Get(w http.ResponseWriter, r *http.Request) {
 		return // response was already sent by util function
 	}
 
-	summary, err, status := h.loadUserSummary(user, utils.ParseSummaryFilters(r))
+	summary, err, status := h.loadUserSummary(user, helpers.ParseSummaryFilters(r))
 	if err != nil {
 		w.WriteHeader(status)
 		w.Write([]byte(err.Error()))
@@ -58,7 +58,7 @@ func (h *AllTimeHandler) Get(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vm := v1.NewAllTimeFrom(summary)
-	utils.RespondJSON(w, r, http.StatusOK, vm)
+	helpers.RespondJSON(w, r, http.StatusOK, vm)
 }
 
 func (h *AllTimeHandler) loadUserSummary(user *models.User, filters *models.Filters) (*models.Summary, error, int) {
@@ -69,7 +69,7 @@ func (h *AllTimeHandler) loadUserSummary(user *models.User, filters *models.Filt
 		Recompute: false,
 	}
 
-	var retrieveSummary services.SummaryRetriever = h.summarySrvc.Retrieve
+	var retrieveSummary types.SummaryRetriever = h.summarySrvc.Retrieve
 	if summaryParams.Recompute {
 		retrieveSummary = h.summarySrvc.Summarize
 	}

routes/compat/wakatime/v1/heartbeat.go

@@ -2,16 +2,16 @@ package v1
 
 import (
 	"github.com/duke-git/lancet/v2/datetime"
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 	"time"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	wakatime "github.com/muety/wakapi/models/compat/wakatime/v1"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 )
 
 type HeartbeatsResult struct {
@@ -33,12 +33,11 @@ func NewHeartbeatHandler(userService services.IUserService, heartbeatService ser
 	}
 }
 
-func (h *HeartbeatHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("/compat/wakatime/v1/users/{user}/heartbeats").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *HeartbeatHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+		r.Get("/compat/wakatime/v1/users/{user}/heartbeats", h.Get)
+	})
 }
 
 // @Summary Get heartbeats of user for specified date
@@ -82,5 +81,5 @@ func (h *HeartbeatHandler) Get(w http.ResponseWriter, r *http.Request) {
 		End:      rangeTo.UTC().Format(time.RFC3339),
 		Timezone: timezone.String(),
 	}
-	utils.RespondJSON(w, r, http.StatusOK, res)
+	helpers.RespondJSON(w, r, http.StatusOK, res)
 }

routes/compat/wakatime/v1/projects.go

@@ -1,17 +1,17 @@
 package v1
 
 import (
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 	"strings"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 )
 
 type ProjectsHandler struct {
@@ -28,12 +28,11 @@ func NewProjectsHandler(userService services.IUserService, heartbeatsService ser
 	}
 }
 
-func (h *ProjectsHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/compat/wakatime/v1/users/{user}/projects").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *ProjectsHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+		r.Get("/compat/wakatime/v1/users/{user}/projects", h.Get)
+	})
 }
 
 // @Summary Retrieve and fitler the user's projects
@@ -70,5 +69,5 @@ func (h *ProjectsHandler) Get(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vm := &v1.ProjectsViewModel{Data: projects}
-	utils.RespondJSON(w, r, http.StatusOK, vm)
+	helpers.RespondJSON(w, r, http.StatusOK, vm)
 }

routes/compat/wakatime/v1/stats.go

@@ -1,16 +1,16 @@
 package v1
 
 import (
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 	"time"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 )
 
 type StatsHandler struct {
@@ -27,17 +27,18 @@ func NewStatsHandler(userService services.IUserService, summaryService services.
 	}
 }
 
-func (h *StatsHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).WithOptionalFor([]string{"/"}).Handler,
-	)
-	r.Path("/v1/users/{user}/stats/{range}").Methods(http.MethodGet).HandlerFunc(h.Get)
-	r.Path("/compat/wakatime/v1/users/{user}/stats/{range}").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *StatsHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(
+			middlewares.NewAuthenticateMiddleware(h.userSrvc).WithOptionalFor([]string{"/"}).Handler,
+		)
+		r.Get("/v1/users/{user}/stats/{range}", h.Get)
+		r.Get("/compat/wakatime/v1/users/{user}/stats/{range}", h.Get)
 
-	// Also works without range, see https://github.com/anuraghazra/github-readme-stats/issues/865#issuecomment-776186592
-	r.Path("/v1/users/{user}/stats").Methods(http.MethodGet).HandlerFunc(h.Get)
-	r.Path("/compat/wakatime/v1/users/{user}/stats").Methods(http.MethodGet).HandlerFunc(h.Get)
+		// Also works without range, see https://github.com/anuraghazra/github-readme-stats/issues/865#issuecomment-776186592
+		r.Get("/v1/users/{user}/stats", h.Get)
+		r.Get("/compat/wakatime/v1/users/{user}/stats", h.Get)
+	})
 }
 
 // TODO: support filtering (requires https://github.com/muety/wakapi/issues/108)
@@ -59,34 +60,34 @@ func (h *StatsHandler) RegisterRoutes(router *mux.Router) {
 // @Success 200 {object} v1.StatsViewModel
 // @Router /compat/wakatime/v1/users/{user}/stats/{range} [get]
 func (h *StatsHandler) Get(w http.ResponseWriter, r *http.Request) {
-	var vars = mux.Vars(r)
+	userParam := chi.URLParam(r, "user")
+	rangeParam := chi.URLParam(r, "range")
 	var authorizedUser, requestedUser *models.User
 
 	authorizedUser = middlewares.GetPrincipal(r)
-	if authorizedUser != nil && vars["user"] == "current" {
-		vars["user"] = authorizedUser.ID
+	if authorizedUser != nil && userParam == "current" {
+		userParam = authorizedUser.ID
 	}
 
-	requestedUser, err := h.userSrvc.GetUserById(vars["user"])
+	requestedUser, err := h.userSrvc.GetUserById(userParam)
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
 		w.Write([]byte("user not found"))
 		return
 	}
 
-	rangeParam := vars["range"]
 	if rangeParam == "" {
 		rangeParam = (*models.IntervalPast7Days)[0]
 	}
 
-	err, rangeFrom, rangeTo := utils.ResolveIntervalRawTZ(rangeParam, requestedUser.TZ())
+	err, rangeFrom, rangeTo := helpers.ResolveIntervalRawTZ(rangeParam, requestedUser.TZ())
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
 		w.Write([]byte("invalid range"))
 		return
 	}
 
-	minStart := rangeTo.Add(-24 * time.Hour * time.Duration(requestedUser.ShareDataMaxDays))
+	minStart := rangeTo.AddDate(0, 0, -requestedUser.ShareDataMaxDays)
 	if (authorizedUser == nil || requestedUser.ID != authorizedUser.ID) &&
 		rangeFrom.Before(minStart) && requestedUser.ShareDataMaxDays >= 0 {
 		w.WriteHeader(http.StatusForbidden)
@@ -94,7 +95,7 @@ func (h *StatsHandler) Get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	summary, err, status := h.loadUserSummary(requestedUser, rangeFrom, rangeTo, utils.ParseSummaryFilters(r))
+	summary, err, status := h.loadUserSummary(requestedUser, rangeFrom, rangeTo, helpers.ParseSummaryFilters(r))
 	if err != nil {
 		w.WriteHeader(status)
 		w.Write([]byte(err.Error()))
@@ -120,7 +121,7 @@ func (h *StatsHandler) Get(w http.ResponseWriter, r *http.Request) {
 		stats.Data.Machines = nil
 	}
 
-	utils.RespondJSON(w, r, http.StatusOK, stats)
+	helpers.RespondJSON(w, r, http.StatusOK, stats)
 }
 
 func (h *StatsHandler) loadUserSummary(user *models.User, start, end time.Time, filters *models.Filters) (*models.Summary, error, int) {

routes/compat/wakatime/v1/statusbar.go

@@ -1,17 +1,18 @@
 package v1
 
 import (
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
+	"github.com/muety/wakapi/models/types"
 	"net/http"
 	"time"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 )
 
 type StatusBarViewModel struct {
@@ -33,15 +34,13 @@ func NewStatusBarHandler(userService services.IUserService, summaryService servi
 	}
 }
 
-func (h *StatusBarHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("").Subrouter()
-
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("/users/{user}/statusbar/{range}").Methods(http.MethodGet).HandlerFunc(h.Get)
-	r.Path("/v1/users/{user}/statusbar/{range}").Methods(http.MethodGet).HandlerFunc(h.Get)
-	r.Path("/compat/wakatime/v1/users/{user}/statusbar/{range}").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *StatusBarHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+		r.Get("/users/{user}/statusbar/{range}", h.Get)
+		r.Get("/v1/users/{user}/statusbar/{range}", h.Get)
+		r.Get("/compat/wakatime/v1/users/{user}/statusbar/{range}", h.Get)
+	})
 }
 
 // @Summary Retrieve summary for statusbar
@@ -58,14 +57,13 @@ func (h *StatusBarHandler) Get(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		return // response was already sent by util function
 	}
-	var vars = mux.Vars(r)
 
-	rangeParam := vars["range"]
+	rangeParam := chi.URLParam(r, "range")
 	if rangeParam == "" {
 		rangeParam = (*models.IntervalToday)[0]
 	}
 
-	err, rangeFrom, rangeTo := utils.ResolveIntervalRawTZ(rangeParam, user.TZ())
+	err, rangeFrom, rangeTo := helpers.ResolveIntervalRawTZ(rangeParam, user.TZ())
 	if err != nil {
 		w.WriteHeader(http.StatusBadRequest)
 		w.Write([]byte("invalid range"))
@@ -79,7 +77,7 @@ func (h *StatusBarHandler) Get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	summariesView := v1.NewSummariesFrom([]*models.Summary{summary})
-	utils.RespondJSON(w, r, http.StatusOK, StatusBarViewModel{
+	helpers.RespondJSON(w, r, http.StatusOK, StatusBarViewModel{
 		CachedAt: time.Now(),
 		Data:     *summariesView.Data[0],
 	})
@@ -93,7 +91,7 @@ func (h *StatusBarHandler) loadUserSummary(user *models.User, start, end time.Ti
 		Recompute: false,
 	}
 
-	var retrieveSummary services.SummaryRetriever = h.summarySrvc.Retrieve
+	var retrieveSummary types.SummaryRetriever = h.summarySrvc.Retrieve
 	if summaryParams.Recompute {
 		retrieveSummary = h.summarySrvc.Summarize
 	}

routes/compat/wakatime/v1/summaries.go

@@ -3,11 +3,12 @@ package v1
 import (
 	"errors"
 	"github.com/duke-git/lancet/v2/datetime"
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 	"strings"
 	"time"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
@@ -31,12 +32,11 @@ func NewSummariesHandler(userService services.IUserService, summaryService servi
 	}
 }
 
-func (h *SummariesHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/compat/wakatime/v1/users/{user}/summaries").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *SummariesHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+		r.Get("/compat/wakatime/v1/users/{user}/summaries", h.Get)
+	})
 }
 
 // TODO: Support parameters: project, branches, timeout, writes_only
@@ -63,12 +63,12 @@ func (h *SummariesHandler) RegisterRoutes(router *mux.Router) {
 // @Success 200 {object} v1.SummariesViewModel
 // @Router /compat/wakatime/v1/users/{user}/summaries [get]
 func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
-	_, err := routeutils.CheckEffectiveUser(w, r, h.userSrvc, "current")
+	user, err := routeutils.CheckEffectiveUser(w, r, h.userSrvc, "current")
 	if err != nil {
 		return // response was already sent by util function
 	}
 
-	summaries, err, status := h.loadUserSummaries(r)
+	summaries, err, status := h.loadUserSummaries(r, user)
 	if err != nil {
 		w.WriteHeader(status)
 		w.Write([]byte(err.Error()))
@@ -76,11 +76,10 @@ func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
 	}
 
 	vm := v1.NewSummariesFrom(summaries)
-	utils.RespondJSON(w, r, http.StatusOK, vm)
+	helpers.RespondJSON(w, r, http.StatusOK, vm)
 }
 
-func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary, error, int) {
-	user := middlewares.GetPrincipal(r)
+func (h *SummariesHandler) loadUserSummaries(r *http.Request, user *models.User) ([]*models.Summary, error, int) {
 	params := r.URL.Query()
 	rangeParam, startParam, endParam, tzParam := params.Get("range"), params.Get("start"), params.Get("end"), params.Get("timezone")
 
@@ -94,24 +93,24 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
 	var start, end time.Time
 	if rangeParam != "" {
 		// range param takes precedence
-		if err, parsedFrom, parsedTo := utils.ResolveIntervalRawTZ(rangeParam, timezone); err == nil {
+		if err, parsedFrom, parsedTo := helpers.ResolveIntervalRawTZ(rangeParam, timezone); err == nil {
 			start, end = parsedFrom, parsedTo
 		} else {
 			return nil, errors.New("invalid 'range' parameter"), http.StatusBadRequest
 		}
-	} else if err, parsedFrom, parsedTo := utils.ResolveIntervalRawTZ(startParam, timezone); err == nil && startParam == endParam {
+	} else if err, parsedFrom, parsedTo := helpers.ResolveIntervalRawTZ(startParam, timezone); err == nil && startParam == endParam {
 		// also accept start param to be a range param
 		start, end = parsedFrom, parsedTo
 	} else {
 		// eventually, consider start and end params a date
 		var err error
 
-		start, err = utils.ParseDateTimeTZ(strings.Replace(startParam, " ", "+", 1), timezone)
+		start, err = helpers.ParseDateTimeTZ(strings.Replace(startParam, " ", "+", 1), timezone)
 		if err != nil {
 			return nil, errors.New("missing required 'start' parameter"), http.StatusBadRequest
 		}
 
-		end, err = utils.ParseDateTimeTZ(strings.Replace(endParam, " ", "+", 1), timezone)
+		end, err = helpers.ParseDateTimeTZ(strings.Replace(endParam, " ", "+", 1), timezone)
 		if err != nil {
 			return nil, errors.New("missing required 'end' parameter"), http.StatusBadRequest
 		}
@@ -133,7 +132,7 @@ func (h *SummariesHandler) loadUserSummaries(r *http.Request) ([]*models.Summary
 	summaries := make([]*models.Summary, len(intervals))
 
 	// filtering
-	filters := utils.ParseSummaryFilters(r)
+	filters := helpers.ParseSummaryFilters(r)
 
 	for i, interval := range intervals {
 		summary, err := h.summarySrvc.Aliased(interval[0], interval[1], user, h.summarySrvc.Retrieve, filters, end.After(time.Now()))

routes/compat/wakatime/v1/test_utils_test.go

@@ -0,0 +1,17 @@
+package v1
+
+import (
+	"context"
+	"github.com/go-chi/chi/v5"
+	"net/http"
+	"strings"
+)
+
+func withUrlParam(r *http.Request, key, value string) *http.Request {
+	r.URL.RawPath = strings.Replace(r.URL.RawPath, "{"+key+"}", value, 1)
+	r.URL.Path = strings.Replace(r.URL.Path, "{"+key+"}", value, 1)
+	rctx := chi.NewRouteContext()
+	rctx.URLParams.Add(key, value)
+	r = r.WithContext(context.WithValue(r.Context(), chi.RouteCtxKey, rctx))
+	return r
+}

routes/compat/wakatime/v1/users.go

@@ -1,15 +1,15 @@
 package v1
 
 import (
+	"github.com/go-chi/chi/v5"
+	"github.com/muety/wakapi/helpers"
 	"net/http"
 
-	"github.com/gorilla/mux"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	v1 "github.com/muety/wakapi/models/compat/wakatime/v1"
 	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
-	"github.com/muety/wakapi/utils"
 )
 
 type UsersHandler struct {
@@ -26,12 +26,11 @@ func NewUsersHandler(userService services.IUserService, heartbeatService service
 	}
 }
 
-func (h *UsersHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/compat/wakatime/v1/users/{user}").Subrouter()
-	r.Use(
-		middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler,
-	)
-	r.Path("").Methods(http.MethodGet).HandlerFunc(h.Get)
+func (h *UsersHandler) RegisterRoutes(router chi.Router) {
+	router.Group(func(r chi.Router) {
+		r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).Handler)
+		r.Get("/compat/wakatime/v1/users/{user}", h.Get)
+	})
 }
 
 // @Summary Retrieve the given user
@@ -56,5 +55,5 @@ func (h *UsersHandler) Get(w http.ResponseWriter, r *http.Request) {
 		conf.Log().Request(r).Error("%v", err)
 	}
 
-	utils.RespondJSON(w, r, http.StatusOK, v1.UserViewModel{Data: user})
+	helpers.RespondJSON(w, r, http.StatusOK, v1.UserViewModel{Data: user})
 }

routes/compat/wakatime/v1/users_test.go

@@ -3,7 +3,7 @@ package v1
 import (
 	"encoding/base64"
 	"fmt"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/mocks"
 	"github.com/muety/wakapi/models"
@@ -36,9 +36,10 @@ var (
 )
 
 func TestUsersHandler_Get(t *testing.T) {
-	router := mux.NewRouter()
-	apiRouter := router.PathPrefix("/api").Subrouter().StrictSlash(true)
+	router := chi.NewRouter()
+	apiRouter := chi.NewRouter()
 	apiRouter.Use(middlewares.NewPrincipalMiddleware())
+	router.Mount("/api", apiRouter)
 
 	userServiceMock := new(mocks.UserServiceMock)
 	userServiceMock.On("GetUserById", "AdminUser").Return(adminUser, nil)
@@ -61,19 +62,22 @@ func TestUsersHandler_Get(t *testing.T) {
 
 	t.Run("when requesting own user data", func(t *testing.T) {
 		t.Run("should return own data", func(t *testing.T) {
-			req := httptest.NewRequest(http.MethodGet, "/api/compat/wakatime/v1/users/AdminUser", nil)
+			rec := httptest.NewRecorder()
+
+			req := httptest.NewRequest(http.MethodGet, "/api/compat/wakatime/v1/users/{user}", nil)
+			req = withUrlParam(req, "user", "AdminUser")
 			req.Header.Add(
 				"Authorization",
 				fmt.Sprintf("Bearer %s", base64.StdEncoding.EncodeToString([]byte(adminUser.ApiKey))),
 			)
-			requestRecorder := httptest.NewRecorder()
-			apiRouter.ServeHTTP(requestRecorder, req)
-			res := requestRecorder.Result()
+
+			router.ServeHTTP(rec, req)
+			res := rec.Result()
 			defer res.Body.Close()
 
 			data, err := ioutil.ReadAll(res.Body)
 			if err != nil {
-				t.Errorf("unextected error. Error: %s", err)
+				t.Errorf("unexpected error. Error: %s", err)
 			}
 
 			if !strings.Contains(string(data), "\"username\":\"AdminUser\"") {
@@ -84,14 +88,17 @@ func TestUsersHandler_Get(t *testing.T) {
 
 	t.Run("when requesting another users data", func(t *testing.T) {
 		t.Run("should respond with '401 unauthorized' if not an admin user", func(t *testing.T) {
-			req := httptest.NewRequest(http.MethodGet, "/api/compat/wakatime/v1/users/AdminUser", nil)
+			rec := httptest.NewRecorder()
+
+			req := httptest.NewRequest(http.MethodGet, "/api/compat/wakatime/v1/users/{user}", nil)
+			req = withUrlParam(req, "user", "AdminUser")
 			req.Header.Add(
 				"Authorization",
 				fmt.Sprintf("Bearer %s", base64.StdEncoding.EncodeToString([]byte(basicUser.ApiKey))),
 			)
-			requestRecorder := httptest.NewRecorder()
-			apiRouter.ServeHTTP(requestRecorder, req)
-			res := requestRecorder.Result()
+
+			router.ServeHTTP(rec, req)
+			res := rec.Result()
 			defer res.Body.Close()
 
 			data, err := ioutil.ReadAll(res.Body)
@@ -105,14 +112,17 @@ func TestUsersHandler_Get(t *testing.T) {
 		})
 
 		t.Run("should receive user data if requesting user is an admin", func(t *testing.T) {
-			req := httptest.NewRequest(http.MethodGet, "/api/compat/wakatime/v1/users/BasicUser", nil)
+			rec := httptest.NewRecorder()
+
+			req := httptest.NewRequest(http.MethodGet, "/api/compat/wakatime/v1/users/{user}", nil)
+			req = withUrlParam(req, "user", "BasicUser")
 			req.Header.Add(
 				"Authorization",
 				fmt.Sprintf("Bearer %s", base64.StdEncoding.EncodeToString([]byte(adminUser.ApiKey))),
 			)
-			requestRecorder := httptest.NewRecorder()
-			apiRouter.ServeHTTP(requestRecorder, req)
-			res := requestRecorder.Result()
+
+			router.ServeHTTP(rec, req)
+			res := rec.Result()
 			defer res.Body.Close()
 
 			data, err := ioutil.ReadAll(res.Body)

routes/handler.go

@@ -1,7 +1,9 @@
 package routes
 
-import "github.com/gorilla/mux"
+import (
+	"github.com/go-chi/chi/v5"
+)
 
 type Handler interface {
-	RegisterRoutes(router *mux.Router)
+	RegisterRoutes(router chi.Router)
 }

routes/home.go

@@ -3,11 +3,13 @@ package routes
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/gorilla/mux"
+	"github.com/emvi/logbuch"
+	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/schema"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
+	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
 	"net/http"
 	"strconv"
@@ -31,8 +33,8 @@ func NewHomeHandler(keyValueService services.IKeyValueService) *HomeHandler {
 	}
 }
 
-func (h *HomeHandler) RegisterRoutes(router *mux.Router) {
-	router.Path("/").Methods(http.MethodGet).HandlerFunc(h.GetIndex)
+func (h *HomeHandler) RegisterRoutes(router chi.Router) {
+	router.Get("/", h.GetIndex)
 }
 
 func (h *HomeHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@@ -44,11 +46,15 @@ func (h *HomeHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		http.Redirect(w, r, fmt.Sprintf("%s/summary", h.config.Server.BasePath), http.StatusFound)
 		return
 	}
+	if h.config.Security.DisableFrontpage {
+		http.Redirect(w, r, fmt.Sprintf("%s/login", h.config.Server.BasePath), http.StatusFound)
+		return
+	}
 
-	templates[conf.IndexTemplate].Execute(w, h.buildViewModel(r))
+	templates[conf.IndexTemplate].Execute(w, h.buildViewModel(r, w))
 }
 
-func (h *HomeHandler) buildViewModel(r *http.Request) *view.HomeViewModel {
+func (h *HomeHandler) buildViewModel(r *http.Request, w http.ResponseWriter) *view.HomeViewModel {
 	var totalHours int
 	var totalUsers int
 	var newsbox view.Newsbox
@@ -66,14 +72,15 @@ func (h *HomeHandler) buildViewModel(r *http.Request) *view.HomeViewModel {
 	}
 
 	if kv, err := h.keyValueSrvc.GetString(conf.KeyNewsbox); err == nil && kv != nil && kv.Value != "" {
-		json.NewDecoder(strings.NewReader(kv.Value)).Decode(&newsbox)
+		if err := json.NewDecoder(strings.NewReader(kv.Value)).Decode(&newsbox); err != nil {
+			logbuch.Error("failed to decode newsbox message - %v", err)
+		}
 	}
 
-	return &view.HomeViewModel{
-		Success:    r.URL.Query().Get("success"),
-		Error:      r.URL.Query().Get("error"),
+	vm := &view.HomeViewModel{
 		TotalHours: totalHours,
 		TotalUsers: totalUsers,
 		Newsbox:    &newsbox,
 	}
+	return routeutils.WithSessionMessages(vm, r, w)
 }

routes/imprint.go

@@ -1,7 +1,7 @@
 package routes
 
 import (
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
@@ -21,8 +21,8 @@ func NewImprintHandler(keyValueService services.IKeyValueService) *ImprintHandle
 	}
 }
 
-func (h *ImprintHandler) RegisterRoutes(router *mux.Router) {
-	router.Path("/imprint").Methods(http.MethodGet).HandlerFunc(h.GetImprint)
+func (h *ImprintHandler) RegisterRoutes(router chi.Router) {
+	router.Get("/imprint", h.GetImprint)
 }
 
 func (h *ImprintHandler) GetImprint(w http.ResponseWriter, r *http.Request) {
@@ -39,8 +39,5 @@ func (h *ImprintHandler) GetImprint(w http.ResponseWriter, r *http.Request) {
 }
 
 func (h *ImprintHandler) buildViewModel(r *http.Request) *view.ImprintViewModel {
-	return &view.ImprintViewModel{
-		Success: r.URL.Query().Get("success"),
-		Error:   r.URL.Query().Get("error"),
-	}
+	return &view.ImprintViewModel{}
 }

routes/leaderboard.go

@@ -4,12 +4,14 @@ import (
 	"fmt"
 	"github.com/duke-git/lancet/v2/slice"
 	"github.com/emvi/logbuch"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
+	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
+	"github.com/muety/wakapi/utils"
 	"net/http"
 	"strings"
 )
@@ -32,30 +34,36 @@ func NewLeaderboardHandler(userService services.IUserService, leaderboardService
 	}
 }
 
-func (h *LeaderboardHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/leaderboard").Subrouter()
+func (h *LeaderboardHandler) RegisterRoutes(router chi.Router) {
+	r := chi.NewRouter()
 	r.Use(
 		middlewares.NewAuthenticateMiddleware(h.userService).
 			WithRedirectTarget(defaultErrorRedirectTarget()).
-			WithOptionalFor([]string{"/"}).
-			Handler,
+			WithRedirectErrorMessage("unauthorized").
+			WithOptionalFor([]string{"/"}).Handler,
 	)
-	r.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
+	r.Get("/", h.GetIndex)
+
+	router.Mount("/leaderboard", r)
 }
 
 func (h *LeaderboardHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
-	if err := templates[conf.LeaderboardTemplate].Execute(w, h.buildViewModel(r)); err != nil {
+	if err := templates[conf.LeaderboardTemplate].Execute(w, h.buildViewModel(r, w)); err != nil {
 		logbuch.Error(err.Error())
 	}
 }
 
-func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardViewModel {
+func (h *LeaderboardHandler) buildViewModel(r *http.Request, w http.ResponseWriter) *view.LeaderboardViewModel {
 	user := middlewares.GetPrincipal(r)
 	byParam := strings.ToLower(r.URL.Query().Get("by"))
 	keyParam := strings.ToLower(r.URL.Query().Get("key"))
+	pageParams := utils.ParsePageParamsWithDefault(r, 1, 100)
+	// note: pagination is not fully implemented, yet
+	// count function to get total item / total pages is missing
+	// and according ui (+ optionally search bar) is missing, too
 
 	var err error
 	var leaderboard models.Leaderboard
@@ -63,20 +71,46 @@ func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardVi
 	var topKeys []string
 
 	if byParam == "" {
-		leaderboard, err = h.leaderboardService.GetByInterval(models.IntervalPast7Days, true)
+		leaderboard, err = h.leaderboardService.GetByInterval(models.IntervalPast7Days, pageParams, true)
 		if err != nil {
 			conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
-			return &view.LeaderboardViewModel{Error: criticalError}
+			return &view.LeaderboardViewModel{
+				Messages: view.Messages{Error: criticalError},
+			}
+		}
+
+		// regardless of page, always show own rank
+		if user != nil && !leaderboard.HasUser(user.ID) {
+			// but only if leaderboard spans multiple pages
+			if count, err := h.leaderboardService.CountUsers(); err == nil && count > int64(pageParams.PageSize) {
+				if l, err := h.leaderboardService.GetByIntervalAndUser(models.IntervalPast7Days, user.ID, true); err == nil && len(l) > 0 {
+					leaderboard = append(leaderboard, l[0])
+				}
+			}
 		}
 	} else {
 		if by, ok := allowedAggregations[byParam]; ok {
-			leaderboard, err = h.leaderboardService.GetAggregatedByInterval(models.IntervalPast7Days, &by, true)
+			leaderboard, err = h.leaderboardService.GetAggregatedByInterval(models.IntervalPast7Days, &by, pageParams, true)
 			if err != nil {
 				conf.Log().Request(r).Error("error while fetching general leaderboard items - %v", err)
-				return &view.LeaderboardViewModel{Error: criticalError}
+				return &view.LeaderboardViewModel{
+					Messages: view.Messages{Error: criticalError},
+				}
 			}
 
-			userLeaderboards := slice.GroupWith[*models.LeaderboardItem, string](leaderboard, func(item *models.LeaderboardItem) string {
+			// regardless of page, always show own rank
+			if user != nil {
+				// but only if leaderboard could, in theory, span multiple pages
+				if count, err := h.leaderboardService.CountUsers(); err == nil && count > int64(pageParams.PageSize) {
+					if l, err := h.leaderboardService.GetAggregatedByIntervalAndUser(models.IntervalPast7Days, user.ID, &by, true); err == nil {
+						leaderboard.AddMany(l)
+					} else {
+						conf.Log().Request(r).Error("error while fetching own aggregated user leaderboard - %v", err)
+					}
+				}
+			}
+
+			userLeaderboards := slice.GroupWith[*models.LeaderboardItemRanked, string](leaderboard, func(item *models.LeaderboardItemRanked) string {
 				return item.UserID
 			})
 			userLanguages = map[string][]string{}
@@ -87,12 +121,15 @@ func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardVi
 			topKeys = leaderboard.TopKeys(by)
 			if len(topKeys) > 0 {
 				if keyParam == "" {
-					keyParam = strings.ToLower(topKeys[0])
+					keyParam = topKeys[0]
 				}
+				keyParam = strings.ToLower(keyParam)
 				leaderboard = leaderboard.TopByKey(by, keyParam)
 			}
 		} else {
-			return &view.LeaderboardViewModel{Error: fmt.Sprintf("unsupported aggregation '%s'", byParam)}
+			return &view.LeaderboardViewModel{
+				Messages: view.Messages{Error: fmt.Sprintf("unsupported aggregation '%s'", byParam)},
+			}
 		}
 	}
 
@@ -101,7 +138,7 @@ func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardVi
 		apiKey = user.ApiKey
 	}
 
-	return &view.LeaderboardViewModel{
+	vm := &view.LeaderboardViewModel{
 		User:          user,
 		By:            byParam,
 		Key:           keyParam,
@@ -109,7 +146,7 @@ func (h *LeaderboardHandler) buildViewModel(r *http.Request) *view.LeaderboardVi
 		UserLanguages: userLanguages,
 		TopKeys:       topKeys,
 		ApiKey:        apiKey,
-		Success:       r.URL.Query().Get("success"),
-		Error:         r.URL.Query().Get("error"),
+		PageParams:    pageParams,
 	}
+	return routeutils.WithSessionMessages(vm, r, w)
 }

routes/login.go

@@ -3,10 +3,12 @@ package routes
 import (
 	"fmt"
 	"github.com/emvi/logbuch"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
 	"github.com/muety/wakapi/models/view"
+	routeutils "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/utils"
 	"net/http"
@@ -28,16 +30,25 @@ func NewLoginHandler(userService services.IUserService, mailService services.IMa
 	}
 }
 
-func (h *LoginHandler) RegisterRoutes(router *mux.Router) {
-	router.Path("/login").Methods(http.MethodGet).HandlerFunc(h.GetIndex)
-	router.Path("/login").Methods(http.MethodPost).HandlerFunc(h.PostLogin)
-	router.Path("/logout").Methods(http.MethodPost).HandlerFunc(h.PostLogout)
-	router.Path("/signup").Methods(http.MethodGet).HandlerFunc(h.GetSignup)
-	router.Path("/signup").Methods(http.MethodPost).HandlerFunc(h.PostSignup)
-	router.Path("/set-password").Methods(http.MethodGet).HandlerFunc(h.GetSetPassword)
-	router.Path("/set-password").Methods(http.MethodPost).HandlerFunc(h.PostSetPassword)
-	router.Path("/reset-password").Methods(http.MethodGet).HandlerFunc(h.GetResetPassword)
-	router.Path("/reset-password").Methods(http.MethodPost).HandlerFunc(h.PostResetPassword)
+func (h *LoginHandler) RegisterRoutes(router chi.Router) {
+	router.Get("/login", h.GetIndex)
+	router.Post("/login", h.PostLogin)
+	router.Get("/signup", h.GetSignup)
+	router.Post("/signup", h.PostSignup)
+	router.Get("/set-password", h.GetSetPassword)
+	router.Post("/set-password", h.PostSetPassword)
+	router.Get("/reset-password", h.GetResetPassword)
+	router.Post("/reset-password", h.PostResetPassword)
+
+	authMiddleware := middlewares.NewAuthenticateMiddleware(h.userSrvc).
+		WithRedirectTarget(defaultErrorRedirectTarget()).
+		WithRedirectErrorMessage("unauthorized").
+		WithOptionalFor([]string{"/logout"})
+
+	logoutRouter := chi.NewRouter()
+	logoutRouter.Use(authMiddleware.Handler)
+	logoutRouter.Post("/", h.PostLogout)
+	router.Mount("/logout", logoutRouter)
 }
 
 func (h *LoginHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@@ -50,7 +61,7 @@ func (h *LoginHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r))
+	templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r, w))
 }
 
 func (h *LoginHandler) PostLogin(w http.ResponseWriter, r *http.Request) {
@@ -66,25 +77,25 @@ func (h *LoginHandler) PostLogin(w http.ResponseWriter, r *http.Request) {
 	var login models.Login
 	if err := r.ParseForm(); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 	if err := loginDecoder.Decode(&login, r.PostForm); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 
 	user, err := h.userSrvc.GetUserById(login.Username)
 	if err != nil {
 		w.WriteHeader(http.StatusNotFound)
-		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r).WithError("resource not found"))
+		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r, w).WithError("resource not found"))
 		return
 	}
 
 	if !utils.CompareBcrypt(user.Password, login.Password, h.config.Security.PasswordSalt) {
 		w.WriteHeader(http.StatusUnauthorized)
-		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r).WithError("invalid credentials"))
+		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r, w).WithError("invalid credentials"))
 		return
 	}
 
@@ -92,7 +103,7 @@ func (h *LoginHandler) PostLogin(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		conf.Log().Request(r).Error("failed to encode secure cookie - %v", err)
-		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r).WithError("internal server error"))
+		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r, w).WithError("internal server error"))
 		return
 	}
 
@@ -108,6 +119,9 @@ func (h *LoginHandler) PostLogout(w http.ResponseWriter, r *http.Request) {
 		loadTemplates()
 	}
 
+	if user := middlewares.GetPrincipal(r); user != nil {
+		h.userSrvc.FlushUserCache(user.ID)
+	}
 	http.SetCookie(w, h.config.GetClearCookie(models.AuthCookieKey))
 	http.Redirect(w, r, fmt.Sprintf("%s/", h.config.Server.BasePath), http.StatusFound)
 }
@@ -122,7 +136,7 @@ func (h *LoginHandler) GetSignup(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r))
+	templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r, w))
 }
 
 func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
@@ -132,7 +146,7 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 
 	if !h.config.IsDev() && !h.config.Security.AllowSignup {
 		w.WriteHeader(http.StatusForbidden)
-		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("registration is disabled on this server"))
+		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r, w).WithError("registration is disabled on this server"))
 		return
 	}
 
@@ -144,18 +158,18 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 	var signup models.Signup
 	if err := r.ParseForm(); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 	if err := signupDecoder.Decode(&signup, r.PostForm); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 
 	if !signup.IsValid() {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("invalid parameters"))
+		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r, w).WithError("invalid parameters"))
 		return
 	}
 
@@ -165,23 +179,24 @@ func (h *LoginHandler) PostSignup(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		conf.Log().Request(r).Error("failed to create new user - %v", err)
-		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("failed to create new user"))
+		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r, w).WithError("failed to create new user"))
 		return
 	}
 	if !created {
 		w.WriteHeader(http.StatusConflict)
-		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r).WithError("user already existing"))
+		templates[conf.SignupTemplate].Execute(w, h.buildViewModel(r, w).WithError("user already existing"))
 		return
 	}
 
-	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "account created successfully"), http.StatusFound)
+	routeutils.SetSuccess(r, w, "account created successfully")
+	http.Redirect(w, r, h.config.Server.BasePath, http.StatusFound)
 }
 
 func (h *LoginHandler) GetResetPassword(w http.ResponseWriter, r *http.Request) {
 	if h.config.IsDev() {
 		loadTemplates()
 	}
-	templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r))
+	templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r, w))
 }
 
 func (h *LoginHandler) GetSetPassword(w http.ResponseWriter, r *http.Request) {
@@ -193,12 +208,12 @@ func (h *LoginHandler) GetSetPassword(w http.ResponseWriter, r *http.Request) {
 	token := values.Get("token")
 	if token == "" {
 		w.WriteHeader(http.StatusUnauthorized)
-		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid or missing token"))
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("invalid or missing token"))
 		return
 	}
 
 	vm := &view.SetPasswordViewModel{
-		LoginViewModel: *h.buildViewModel(r),
+		LoginViewModel: *h.buildViewModel(r, w),
 		Token:          token,
 	}
 
@@ -213,25 +228,25 @@ func (h *LoginHandler) PostSetPassword(w http.ResponseWriter, r *http.Request) {
 	var setRequest models.SetPasswordRequest
 	if err := r.ParseForm(); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 	if err := signupDecoder.Decode(&setRequest, r.PostForm); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 
 	user, err := h.userSrvc.GetUserByResetToken(setRequest.Token)
 	if err != nil {
 		w.WriteHeader(http.StatusUnauthorized)
-		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid token"))
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("invalid token"))
 		return
 	}
 
 	if !setRequest.IsValid() {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("invalid parameters"))
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("invalid parameters"))
 		return
 	}
 
@@ -240,7 +255,7 @@ func (h *LoginHandler) PostSetPassword(w http.ResponseWriter, r *http.Request) {
 	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		conf.Log().Request(r).Error("failed to set new password - %v", err)
-		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to set new password"))
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("failed to set new password"))
 		return
 	} else {
 		user.Password = hash
@@ -249,11 +264,12 @@ func (h *LoginHandler) PostSetPassword(w http.ResponseWriter, r *http.Request) {
 	if _, err := h.userSrvc.Update(user); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		conf.Log().Request(r).Error("failed to save new password - %v", err)
-		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to save new password"))
+		templates[conf.SetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("failed to save new password"))
 		return
 	}
 
-	http.Redirect(w, r, fmt.Sprintf("%s/login?success=%s", h.config.Server.BasePath, "password updated successfully"), http.StatusFound)
+	routeutils.SetSuccess(r, w, "password updated successfully")
+	http.Redirect(w, r, fmt.Sprintf("%s/login", h.config.Server.BasePath), http.StatusFound)
 }
 
 func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request) {
@@ -263,19 +279,19 @@ func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request)
 
 	if !h.config.Mail.Enabled {
 		w.WriteHeader(http.StatusNotImplemented)
-		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("mailing is disabled on this server"))
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("mailing is disabled on this server"))
 		return
 	}
 
 	var resetRequest models.ResetPasswordRequest
 	if err := r.ParseForm(); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 	if err := resetPasswordDecoder.Decode(&resetRequest, r.PostForm); err != nil {
 		w.WriteHeader(http.StatusBadRequest)
-		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("missing parameters"))
+		templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("missing parameters"))
 		return
 	}
 
@@ -283,7 +299,7 @@ func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request)
 		if u, err := h.userSrvc.GenerateResetToken(user); err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
 			conf.Log().Request(r).Error("failed to generate password reset token - %v", err)
-			templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r).WithError("failed to generate password reset token"))
+			templates[conf.ResetPasswordTemplate].Execute(w, h.buildViewModel(r, w).WithError("failed to generate password reset token"))
 			return
 		} else {
 			go func(user *models.User) {
@@ -299,16 +315,16 @@ func (h *LoginHandler) PostResetPassword(w http.ResponseWriter, r *http.Request)
 		conf.Log().Request(r).Warn("password reset requested for unregistered address '%s'", resetRequest.Email)
 	}
 
-	http.Redirect(w, r, fmt.Sprintf("%s/?success=%s", h.config.Server.BasePath, "an e-mail was sent to you in case your e-mail address was registered"), http.StatusFound)
+	routeutils.SetSuccess(r, w, "an e-mail was sent to you in case your e-mail address was registered")
+	http.Redirect(w, r, h.config.Server.BasePath, http.StatusFound)
 }
 
-func (h *LoginHandler) buildViewModel(r *http.Request) *view.LoginViewModel {
+func (h *LoginHandler) buildViewModel(r *http.Request, w http.ResponseWriter) *view.LoginViewModel {
 	numUsers, _ := h.userSrvc.Count()
 
-	return &view.LoginViewModel{
-		Success:     r.URL.Query().Get("success"),
-		Error:       r.URL.Query().Get("error"),
+	vm := &view.LoginViewModel{
 		TotalUsers:  int(numUsers),
 		AllowSignup: h.config.IsDev() || h.config.Security.AllowSignup,
 	}
+	return routeutils.WithSessionMessages(vm, r, w)
 }