docs: instructions how to set up browser extension [skip ci]

chore: include more properties in status model for better compatibility

.dockerignore

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

.github/workflows/ci.yml

@@ -10,13 +10,13 @@ jobs:
     steps:
 
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.19
+        go-version: ^1.20
       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
@@ -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.19
+        go-version: ^1.20
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Get dependencies
       run: go get
@@ -71,37 +71,10 @@ 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
 
-  build:
-    name: 'Build (Win, Linux, Mac)'
-
-    strategy:
-      matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
-
-    runs-on: ${{ matrix.platform }}
-    env:
-      CGO_ENABLED: 0
-
-    steps:
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v2
-      with:
-        go-version: ^1.19
-      id: go
-
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-
-    - name: Get dependencies
-      run: go get
-
-    - name: Build
-      run: go build -v .
-
   migration:
     name: Migration tests
     runs-on: ubuntu-latest
@@ -113,12 +86,12 @@ jobs:
 
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.19
+        go-version: ^1.20
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - run: ./testing/run_api_tests.sh ${{ matrix.db }} --migration

.github/workflows/docker.yml

@@ -1,10 +1,9 @@
 name: Publish Docker Image
 
 on:
-  push:
-    tags:
-      - '*.*.*'
-      - '!*.*.*-*'
+  release:
+    types:
+      - published
 
 jobs:
   docker-publish:
@@ -21,19 +20,19 @@ jobs:
             || git rev-parse --short HEAD) > version.txt 2> /dev/null
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -41,7 +40,7 @@ jobs:
 
       - name: Docker Metadata
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: |
             ghcr.io/${{ github.repository }}
@@ -54,7 +53,7 @@ jobs:
             type=semver,pattern={{version}}
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: Dockerfile

.github/workflows/release.yml

@@ -12,10 +12,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - platform: ubuntu-18.04
+          - platform: ubuntu-latest
             GOOS: linux
             GOARCH: amd64
-          - platform: ubuntu-18.04
+          - platform: ubuntu-latest
             GOOS: linux
             GOARCH: arm64
           - platform: windows-latest
@@ -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.19
+        go-version: ^1.20
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Set version
       shell: bash

Dockerfile

@@ -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">
@@ -48,10 +47,6 @@ Installation instructions can be found below and in the [Wiki](https://github.co
 * ✅ Lightning fast
 * ✅ Self-hosted
 
-## 🚧 Roadmap
-
-Plans for the near future mainly include, besides usual improvements and bug fixes, a UI redesign as well as additional types of charts and statistics (see [#101](https://github.com/muety/wakapi/issues/101), [#76](https://github.com/muety/wakapi/issues/76), [#12](https://github.com/muety/wakapi/issues/12)). If you have feature requests or any kind of improvement proposals feel free to open an issue or share them in our [user survey](https://github.com/muety/wakapi/issues/82).
-
 ## ⌨️ How to use?
 
 There are different options for how to use Wakapi, ranging from our hosted cloud service to self-hosting it. Regardless of which option choose, you will always have to do the [client setup](#-client-setup) in addition.
@@ -140,7 +135,7 @@ You can specify configuration options either via a config file (default: `config
 | `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 * * 7`                                    | When to perform data cleanup operations (see `app.data_retention_months`)                                                                                                |
+| `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))                                                                     |
@@ -152,6 +147,7 @@ You can specify configuration options either via a config file (default: `config
 | `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)                                                                                                            |
@@ -161,6 +157,7 @@ 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                                                                                                                                                            |
@@ -255,9 +252,9 @@ 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)
+![](https://github-readme-stats.vercel.app/api/wakatime?username=n1try&api_domain=wakapi.dev&bg_color=2D3748&title_color=2F855A&icon_color=2F855A&text_color=ffffff&custom_title=Wakapi%20Week%20Stats&layout=compact&range=last_7_days)
 
 <details>
 <summary>Click to view code</summary>
@@ -271,7 +268,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:
 
@@ -297,6 +294,44 @@ Preview:
 </details>
 <br>
 
+### Browser Plugin (Chrome & Firefox)
+The [browser-wakatime](https://github.com/wakatime/browser-wakatime) plugin enables you to track your web surfing in WakaTime (and Wakapi, of course). Visited websites will appear as "files" in the summary. Follow these instructions to get started:
+
+1. Install the browser extension from the official store ([Firefox](https://addons.mozilla.org/en-US/firefox/addon/wakatimes), [Chrome](https://chrome.google.com/webstore/detail/wakatime/jnbbnacmeggbgdjgaoojpmhdlkkpblgi?hl=de))
+2. Open the extension settings dialog
+3. Configure it like so (see screenshot below):
+    * API Key: Your personal API key (get it at [wakapi.dev](https://wakapi.dev))
+    * Logging Type: _Only the domain_
+    * API URL: `https://wakapi.dev/api/compat/wakatime/v1` (alternatively, replace _wakapi.dev_ with your self-hosted instance hostname)
+4. Save
+5. Start browsing!
+
+![](.github/assets/screenshot_browser_plugin.png)
+
+Note: the plugin will only sync heartbeats once in a while, so it might take some time for them to appear on Wakapi. To "force" it to sync, simply bring up the plugin main dialog.
+
+## 📦 Data Export
+You can export your coding activity from Wakapi to CSV in the form of raw heartbeats. While there is no way to accomplish this directly through the web UI, we provide an easy-to-use Python [script](scripts/download_heartbeats.py) instead.
+
+```bash
+$ pip install requests tqdm
+$ python scripts/download_heartbeats.py --api_key API_KEY [--url URL] [--from FROM] [--to TO] [--output OUTPUT]
+```
+
+<details>
+
+<summary>Example</summary>
+
+```bash
+python scripts/download_heartbeats.py --api_key 04648d14-15c9-432b-b901-dbeec70d4eaf \
+  --url https://wakapi.dev/api \
+  --from 2023-01-01 \
+  --to 2023-01-31 \
+  --output wakapi_export.csv
+```
+
+</details>
+
 ## 👍 Best practices
 
 It is recommended to use wakapi behind a **reverse proxy**, like [Caddy](https://caddyserver.com) or [nginx](https://www.nginx.com/), to enable **TLS encryption** (HTTPS).
@@ -307,6 +342,7 @@ 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
@@ -446,10 +482,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!
@@ -458,10 +490,10 @@ 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
 
-GPL-v3 @ [Ferdinand Mütsch](https://muetsch.io)
+MIT @ [Ferdinand Mütsch](https://muetsch.io)

config.default.yml

@@ -6,6 +6,7 @@ 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
@@ -17,7 +18,7 @@ app:
   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 * * 7'                          # time at which to run old data cleanup (if enabled through data_retention_months)
+  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)
@@ -29,6 +30,7 @@ app:
     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
@@ -53,6 +55,7 @@ security:
   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
 

config/config.go

@@ -2,11 +2,9 @@ package config
 
 import (
 	"encoding/json"
-	"flag"
 	"fmt"
-	"github.com/robfig/cron/v3"
-	"io/ioutil"
 	"net/http"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
@@ -17,11 +15,12 @@ import (
 	"github.com/jinzhu/configor"
 	"github.com/muety/wakapi/data"
 	"github.com/muety/wakapi/utils"
+	"github.com/robfig/cron/v3"
 	uuid "github.com/satori/go.uuid"
 )
 
 const (
-	defaultConfigPath = "config.yml"
+	DefaultConfigPath = "config.yml"
 
 	SQLDialectMysql    = "mysql"
 	SQLDialectPostgres = "postgres"
@@ -52,6 +51,7 @@ const (
 	WakatimeApiHeartbeatsBulkUrl = "/users/current/heartbeats.bulk"
 	WakatimeApiUserAgentsUrl     = "/users/current/user_agents"
 	WakatimeApiMachineNamesUrl   = "/users/current/machine_names"
+	WakatimeApiDataDumpUrl       = "/users/current/data_dumps"
 )
 
 const (
@@ -65,20 +65,20 @@ var emailProviders = []string{
 }
 
 var cfg *Config
-var cFlag = flag.String("config", defaultConfigPath, "config file location")
 var env string
 
 type appConfig struct {
 	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 * * 7" env:"WAKAPI_DATA_CLEANUP_TIME"`
+	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"`
@@ -86,9 +86,10 @@ type appConfig struct {
 }
 
 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"`
@@ -114,15 +115,16 @@ type dbConfig struct {
 }
 
 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 {
@@ -341,7 +343,7 @@ func readColors() map[string]map[string]string {
 
 	raw := data.ColorsFile
 	if IsDev(env) {
-		raw, _ = ioutil.ReadFile("data/colors.json")
+		raw, _ = os.ReadFile("data/colors.json")
 	}
 
 	var colors = make(map[string]map[string]string)
@@ -373,12 +375,10 @@ func Get() *Config {
 	return cfg
 }
 
-func Load(version string) *Config {
+func Load(configFlag string, version string) *Config {
 	config := &Config{}
 
-	flag.Parse()
-
-	if err := configor.New(&configor.Config{}).Load(config, *cFlag); err != nil {
+	if err := configor.New(&configor.Config{}).Load(config, configFlag); err != nil {
 		logbuch.Fatal("failed to read config: %v", err)
 	}
 
@@ -393,16 +393,22 @@ 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),
-	)
-	config.Security.SessionKey = securecookie.GenerateRandomKey(32)
 
-	if strings.HasSuffix(config.Server.BasePath, "/") {
-		config.Server.BasePath = config.Server.BasePath[:len(config.Server.BasePath)-1]
+	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
+
+	config.Server.BasePath = strings.TrimSuffix(config.Server.BasePath, "/")
+
 	for k, v := range config.App.CustomLanguages {
 		if v == "" {
 			config.App.CustomLanguages[k] = "unknown"

config/eventbus.go

@@ -12,6 +12,7 @@ const (
 	TopicHeartbeat          = "heartbeat.*"
 	TopicProjectLabel       = "project_label.*"
 	EventUserUpdate         = "user.update"
+	EventUserDelete         = "user.delete"
 	EventHeartbeatCreate    = "heartbeat.create"
 	EventProjectLabelCreate = "project_label.create"
 	EventProjectLabelDelete = "project_label.delete"

config/jobqueue.go

@@ -2,10 +2,11 @@ package config
 
 import (
 	"fmt"
-	"github.com/emvi/logbuch"
-	"github.com/muety/artifex/v2"
 	"math"
 	"runtime"
+
+	"github.com/emvi/logbuch"
+	"github.com/muety/artifex/v2"
 )
 
 var jobQueues map[string]*artifex.Dispatcher
@@ -28,7 +29,9 @@ type JobQueueMetrics struct {
 
 func init() {
 	jobQueues = make(map[string]*artifex.Dispatcher)
+}
 
+func StartJobs() {
 	InitQueue(QueueDefault, 1)
 	InitQueue(QueueProcessing, halfCPUs())
 	InitQueue(QueueReports, 1)

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

@@ -111,24 +111,19 @@ 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
-			}
-
-			hub := sentry.GetHubFromContext(ctx.Span.Context())
-			txName := hub.Scope().Transaction()
-
+		EnableTracing:    config.EnableTracing,
+		TracesSampler: func(ctx sentry.SamplingContext) float64 {
+			txName := ctx.Span.Name
 			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 {

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,84 +1,81 @@
 module github.com/muety/wakapi
 
-go 1.19
+go 1.20
 
 require (
 	codeberg.org/Codeberg/avatars v1.0.0
-	github.com/duke-git/lancet/v2 v2.1.10
+	github.com/alexedwards/argon2id v0.0.0-20230305115115-4b3c3280a736
+	github.com/duke-git/lancet/v2 v2.2.3
 	github.com/emersion/go-sasl v0.0.0-20220912192320-0145f2c60ead
-	github.com/emersion/go-smtp v0.15.0
+	github.com/emersion/go-smtp v0.17.0
 	github.com/emvi/logbuch v1.2.0
-	github.com/getsentry/sentry-go v0.15.0
-	github.com/glebarez/sqlite v1.5.0
-	github.com/gorilla/handlers v1.5.1
-	github.com/gorilla/mux v1.8.0
+	github.com/getsentry/sentry-go v0.22.0
+	github.com/glebarez/sqlite v1.9.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/muety/artifex/v2 v2.0.1-0.20221201142708-74e7d3f6feaf
-	github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e
+	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/swaggo/http-swagger v1.3.3
-	github.com/swaggo/swag v1.8.8
-	go.uber.org/atomic v1.10.0
-	golang.org/x/crypto v0.3.0
-	golang.org/x/sync v0.1.0
-	gorm.io/driver/mysql v1.4.4
-	gorm.io/driver/postgres v1.4.5
-	gorm.io/driver/sqlite v1.4.3
-	gorm.io/gorm v1.24.2
+	github.com/stretchr/testify v1.8.2
+	github.com/stripe/stripe-go/v74 v74.25.0
+	github.com/swaggo/http-swagger v1.3.4
+	github.com/swaggo/swag v1.16.1
+	go.uber.org/atomic v1.11.0
+	golang.org/x/crypto v0.11.0
+	golang.org/x/sync v0.3.0
+	gorm.io/driver/mysql v1.5.1
+	gorm.io/driver/postgres v1.5.2
+	gorm.io/driver/sqlite v1.5.2
+	gorm.io/gorm v1.25.2
 )
 
 require (
-	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/BurntSushi/toml v1.3.2 // 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.19.5 // 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/go-openapi/swag v0.22.3 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/glebarez/go-sqlite v1.21.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/spec v0.20.9 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
+	github.com/go-sql-driver/mysql v1.7.1 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/gorilla/sessions v1.2.1 // 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.4.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/kevinpollet/nego v0.0.0-20211010160919-a65cd48cee43 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
+	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
-	github.com/stretchr/objx v0.4.0 // indirect
-	github.com/stripe/stripe-go/v74 v74.3.0 // indirect
-	github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a // indirect
-	golang.org/x/image v0.1.0 // indirect
-	golang.org/x/net v0.2.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
-	golang.org/x/tools v0.3.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/rogpeppe/go-internal v1.11.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/swaggo/files v1.0.1 // indirect
+	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
+	golang.org/x/image v0.9.0 // indirect
+	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/tools v0.11.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	modernc.org/libc v1.21.5 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.4.0 // indirect
-	modernc.org/sqlite v1.20.0 // indirect
+	modernc.org/libc v1.24.1 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.6.0 // indirect
+	modernc.org/sqlite v1.23.1 // indirect
 )

go.sum

@@ -1,76 +1,61 @@
 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.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
-github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.3.2/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/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/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/alexedwards/argon2id v0.0.0-20230305115115-4b3c3280a736 h1:qZaEtLxnqY5mJ0fVKbk31NVhlgi0yrKm51Pq/I5wcz4=
+github.com/alexedwards/argon2id v0.0.0-20230305115115-4b3c3280a736/go.mod h1:mTeFRcTdnpzOlRjMoFYC/80HwVUreupyAiqPkCZQOXc=
 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.10 h1:q6YKhbYg6KChBS+T41e/IhK+sTDPVk2wRhWLTevCeuY=
-github.com/duke-git/lancet/v2 v2.1.10/go.mod h1:5Nawyf/bK783rCiHyVkZLx+jj8028oVVjLOrC21ZONA=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/duke-git/lancet/v2 v2.2.3 h1:Lj4iWgvEbgktEjAfqxE1G2BoGm1mL7l3QHBlXRYptjE=
+github.com/duke-git/lancet/v2 v2.2.3/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc=
+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.17.0 h1:tq90evlrcyqRfE6DSXaWVH54oX6OuZOQECEmhWBMEtI=
+github.com/emersion/go-smtp v0.17.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.15.0 h1:CP9bmA7pralrVUedYZsmIHWpq/pBtXTSew7xvVpfLaA=
-github.com/getsentry/sentry-go v0.15.0/go.mod h1:RZPJKSw+adu8PBNygiri/A98FqVr2HtRckJk9XVxJ9I=
-github.com/glebarez/go-sqlite v1.19.1/go.mod h1:9AykawGIyIcxoSfpYWiX1SgTNHTNsa/FVc75cDkbp4M=
-github.com/glebarez/go-sqlite v1.19.5 h1:krEVjICcImFNi+X81GmEkSe/brhzLL3Csbkb/ihi8sI=
-github.com/glebarez/go-sqlite v1.19.5/go.mod h1:IjVxx3ezfL9clKLLSzVgv2sGZe28yIa116YyLTIvp84=
-github.com/glebarez/sqlite v1.5.0 h1:+8LAEpmywqresSoGlqjjT+I9m4PseIM3NcerIJ/V7mk=
-github.com/glebarez/sqlite v1.5.0/go.mod h1:0wzXzTvfVJIN2GqRhCdMbnYd+m+aH5/QV7B30rM6NgY=
+github.com/getsentry/sentry-go v0.22.0 h1:XNX9zKbv7baSEI65l+H1GEJgSeIC1c7EN5kluWaP6dM=
+github.com/getsentry/sentry-go v0.22.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
+github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
+github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
+github.com/glebarez/sqlite v1.8.0 h1:02X12E2I/4C1n+v90yTqrjRa8yuo7c3KeHI3FRznCvc=
+github.com/glebarez/sqlite v1.8.0/go.mod h1:bpET16h1za2KOOMb8+jCp6UBP/iahDpfPQqSaYLTLx8=
+github.com/glebarez/sqlite v1.9.0 h1:Aj6bPA12ZEx5GbSF6XADmCkYXlljPNUY+Zf1EQxynXs=
+github.com/glebarez/sqlite v1.9.0/go.mod h1:YBYCoyupOao60lzp1MVBLEjZfgkq0tdB1voAQ09K9zw=
+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-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-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.9 h1:xnlYNQAwKd2VQRRfwTEI0DcK+2cbuvI/0c7jx3gA8/8=
+github.com/go-openapi/spec v0.20.9/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-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
+github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
+github.com/go-sql-driver/mysql v1.7.1/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.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/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 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=
@@ -79,83 +64,31 @@ github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7Fsg
 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/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
-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/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.4.1 h1:oKfB/FhuVtit1bBM3zNRRsZ925ZkMN3HXL+LgLUM9lE=
+github.com/jackc/pgx/v5 v5.4.1/go.mod h1:q6iHT8uDNXWiFNOlRqJzBTaSH3+2xCXkokxHZC5qWFY=
 github.com/jinzhu/configor v1.2.1 h1:OKk9dsR8i6HPOCZR8BcMtcEImAFjIhbJFZNyn5GCZko=
 github.com/jinzhu/configor v1.2.1/go.mod h1:nX89/MOmDba7ZX7GCyU/VIaQ2Ar2aizBl2d3JLF/rDc=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
-github.com/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/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=
@@ -163,180 +96,116 @@ 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.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/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
+github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 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/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-20220127184443-140af28a266e h1:bR8DQ4ZfItytLJwRlrLOPUHd5z18V6tECwYQFy8W+8g=
-github.com/narqo/go-badge v0.0.0-20220127184443-140af28a266e/go.mod h1:m9BzkaxwU4IfPQi9ko23cmuFltayFe8iS0dlRlnEWiM=
+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/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-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/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.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 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/stripe/stripe-go/v74 v74.3.0 h1:8ymGwZvMnpWMCRNomc9dVGcJ5j8L/ubwhQvpIpcmcOA=
-github.com/stripe/stripe-go/v74 v74.3.0/go.mod h1:5PoXNp30AJ3tGq57ZcFuaMylzNi8KpwlrYAFmO1fHZw=
-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/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.8 h1:/GgJmrJ8/c0z4R4hoEPZ5UeEhVGdvsII4JbVDLbR7Xc=
-github.com/swaggo/swag v1.8.8/go.mod h1:ezQVUUhly8dludpVk+/PuwJWvLLanB13ygV5Pr9enSk=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stripe/stripe-go/v74 v74.25.0 h1:mGJp9L1ymxjFvq5MlmG6ynv/fAGX6LLU8MyMVsiRAMY=
+github.com/stripe/stripe-go/v74 v74.25.0/go.mod h1:f9L6LvaXa35ja7eyvP6GQswoaIPaBRvGAimAO+udbBw=
+github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
+github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
+github.com/swaggo/http-swagger v1.3.4 h1:q7t/XLx0n15H1Q9/tk3Y9L4n210XzJF5WtnDX64a5ww=
+github.com/swaggo/http-swagger v1.3.4/go.mod h1:9dAh0unqMBAlbp1uE2Uc2mQTxNMU/ha4UbucIg1MFkQ=
+github.com/swaggo/swag v1.16.1 h1:fTNRhKstPKxcnoKsytm4sahr8FaYzUcT7i1/3nd/fBg=
+github.com/swaggo/swag v1.16.1/go.mod h1:9/LMvHycG3NFHfR6LwvikHv5iFvmPADQ359cKikGxto=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-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=
-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=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 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-20210921155107-089bfa567519/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.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
-golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
-golang.org/x/image v0.1.0 h1:r8Oj8ZA2Xy12/b5KZYj3tuv7NG/fBz3TwQVvpJ9l8Rk=
-golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
+golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
+golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df h1:UA2aFVmmsIlefxMk29Dp2juaUSth8Pyn3Tq5Y5mJGME=
+golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/image v0.9.0 h1:QrzfX26snvCM20hIhBwuHI/ThTg18b/+kcKdXHvnR+g=
+golang.org/x/image v0.9.0/go.mod h1:jtrku+n79PfroUbvDdeUWMAI+heR786BofxrbiSF+J0=
 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-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 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-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
+golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/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.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 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.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/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.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.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.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/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/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-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/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
-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.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
+golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
 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/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/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/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 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=
@@ -344,58 +213,26 @@ 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.4.4 h1:MX0K9Qvy0Na4o7qSC/YI7XxqUw5KDw01umqgID+svdQ=
-gorm.io/driver/mysql v1.4.4/go.mod h1:BCg8cKI+R0j/rZRQxeKis/forqRwRSYOR8OM3Wo6hOM=
-gorm.io/driver/postgres v1.4.5 h1:mTeXTTtHAgnS9PgmhN2YeUbazYpLhUI1doLnw42XUZc=
-gorm.io/driver/postgres v1.4.5/go.mod h1:GKNQYSJ14qvWkvPwXljMGehpKrhlDNsqYRr5HnYGncg=
-gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU=
-gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
-gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
-gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.24.1-0.20221019064659-5dd2bb482755/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.24.2 h1:9wR6CFD+G8nOusLdvkZelOEhpJVwwHzpQOUM+REd6U0=
-gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.36.2/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20=
-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.0.0-20220910160915-348f15de615a/go.mod h1:8p47QxPkdugex9J4n9P2tLZ9bK01yngIVp00g4nomW0=
-modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJDo=
-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 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.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 h1:xBkU9fnHV+hvZuPSRszN0AXDG4M7nwPLwTWwkYcvLCI=
-modernc.org/libc v1.21.5/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
+gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
+gorm.io/driver/postgres v1.5.2 h1:ytTDxxEv+MplXOfFe3Lzm7SjG09fcdb3Z/c056DTBx0=
+gorm.io/driver/postgres v1.5.2/go.mod h1:fmpX0m2I1PKuR7mKZiEluwrP3hbs+ps7JIGMUBpCgl8=
+gorm.io/driver/sqlite v1.5.2 h1:TpQ+/dqCY4uCigCFyrfnrJnrW9zjpelWVoEVNy5qJkc=
+gorm.io/driver/sqlite v1.5.2/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
+gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
+gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE=
+modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
+modernc.org/libc v1.24.1 h1:uvJSeCKL/AgzBo2yYIPPTy82v21KgGnizcGYfBHaNuM=
+modernc.org/libc v1.24.1/go.mod h1:FmfO1RLrU3MHJfyi9eYYmZBfi/R+tqZ6+hQ3yQQUkak=
 modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
 modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/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/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.19.1/go.mod h1:UfQ83woKMaPW/ZBruK0T7YaFCrI+IE0LeWVY6pmnVms=
-modernc.org/sqlite v1.19.5/go.mod h1:EsYz8rfOvLCiYTy5ZFsOYzoCcRMu98YYkwAcCw5YIYw=
-modernc.org/sqlite v1.20.0 h1:80zmD3BGkm8BZ5fUi/4lwJQHiO3GXgIUvZRXpoIfROY=
-modernc.org/sqlite v1.20.0/go.mod h1:EsYz8rfOvLCiYTy5ZFsOYzoCcRMu98YYkwAcCw5YIYw=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
-modernc.org/tcl v1.14.0/go.mod h1:gQ7c1YPMvryCHCcmf8acB6VPabE59QBeuRQLL7cTUlM=
-modernc.org/tcl v1.15.0/go.mod h1:xRoGotBZ6dU+Zo2tca+2EqVEeMmOUBzHnhIwq4YrVnE=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.6.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ=
-modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ=
+modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
+modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
+modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/memory v1.6.0 h1:i6mzavxrE9a30whzMfwf7XWVODx2r5OYXvU46cirX7o=
+modernc.org/memory v1.6.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/sqlite v1.23.1 h1:nrSBg4aRQQwq59JpvGEQ15tNxoO5pX/kUjcRNwSAGQM=
+modernc.org/sqlite v1.23.1/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk=

helpers/interval.go

@@ -0,0 +1,107 @@
+package helpers
+
+import (
+	"errors"
+	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/utils"
+	"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 MustParseInterval(interval string) *models.IntervalKey {
+	key, _ := ParseInterval(interval)
+	return key
+}
+
+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.IntervalPastDay:
+		from = now.Add(-24 * time.Hour)
+	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
+}
+
+// ResolveClosestRange returns the interval label (e.g. "last_7_days") of the maximum allowed range when having opted to share this many days or an error for days == 0.
+func ResolveMaximumRange(days int) (error, *models.IntervalKey) {
+	if days == 0 {
+		return errors.New("no matching interval"), nil
+	}
+	if days < 0 {
+		return nil, models.IntervalAny
+	}
+	if days < 7 {
+		return nil, models.IntervalPastDay
+	}
+	if days < 14 {
+		return nil, models.IntervalPast7Days
+	}
+	if days < 30 {
+		return nil, models.IntervalPast14Days
+	}
+	if days < 181 { // 3*31 + 2*30 + 1*28
+		return nil, models.IntervalPast30Days
+	}
+	if days < 365 { // 7*31 + 4*30 + 1*28
+		return nil, models.IntervalPast6Months
+	}
+	return nil, models.IntervalPast12Months
+}

helpers/interval_test.go

@@ -0,0 +1,27 @@
+package helpers
+
+import (
+	"github.com/muety/wakapi/models"
+	"github.com/stretchr/testify/assert"
+	"testing"
+	"time"
+)
+
+func TestResolveMaximumRange_Default(t *testing.T) {
+	for i := 1; i <= 366; i++ {
+		err1, maximumInterval := ResolveMaximumRange(i)
+		err2, from, to := ResolveIntervalTZ(maximumInterval, time.UTC)
+
+		assert.Nil(t, err1)
+		assert.Nil(t, err2)
+		assert.LessOrEqual(t, to.Sub(from), time.Duration(i*24)*time.Hour)
+	}
+}
+
+func TestResolveMaximumRange_EdgeCases(t *testing.T) {
+	err, _ := ResolveMaximumRange(0)
+	assert.NotNil(t, err)
+
+	_, maximumInterval := ResolveMaximumRange(-1)
+	assert.Equal(t, models.IntervalAny, maximumInterval)
+}

helpers/summary.go

@@ -3,7 +3,6 @@ package helpers
 import (
 	"errors"
 	"github.com/muety/wakapi/models"
-	"github.com/muety/wakapi/utils"
 	"net/http"
 	"time"
 )
@@ -67,6 +66,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
 }
 
@@ -79,69 +81,3 @@ 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,6 +2,7 @@ package main
 
 import (
 	"embed"
+	"flag"
 	"io/fs"
 	"log"
 	"net"
@@ -10,13 +11,16 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/muety/wakapi/static/docs"
-
 	"github.com/emvi/logbuch"
-	"github.com/gorilla/handlers"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
+	middleware "github.com/go-chi/chi/v5/middleware"
 	"github.com/lpar/gzipped/v2"
 	httpSwagger "github.com/swaggo/http-swagger"
+	_ "gorm.io/driver/mysql"
+	_ "gorm.io/driver/postgres"
+	_ "gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
@@ -29,15 +33,8 @@ import (
 	"github.com/muety/wakapi/routes/relay"
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/services/mail"
+	docs "github.com/muety/wakapi/static/docs"
 	fsutils "github.com/muety/wakapi/utils/fs"
-
-	_ "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
@@ -108,7 +105,15 @@ var (
 // @name Authorization
 
 func main() {
-	config = conf.Load(version)
+	var versionFlag = flag.Bool("version", false, "print version")
+	var configFlag = flag.String("config", conf.DefaultConfigPath, "config file location")
+	flag.Parse()
+
+	if *versionFlag {
+		print(version)
+		os.Exit(0)
+	}
+	config = conf.Load(*configFlag, version)
 
 	// Configure Swagger docs
 	docs.SwaggerInfo.BasePath = config.Server.BasePath + "/api"
@@ -119,6 +124,7 @@ func main() {
 	} else {
 		logbuch.SetLevel(logbuch.LevelInfo)
 	}
+	logbuch.Info("Wakapi " + version)
 
 	// Set up GORM
 	gormLogger := logger.New(
@@ -186,6 +192,7 @@ func main() {
 	miscService = services.NewMiscService(userService, heartbeatService, summaryService, keyValueService, mailService)
 
 	// Schedule background tasks
+	go conf.StartJobs()
 	go aggregationService.Schedule()
 	go leaderboardService.Schedule()
 	go reportService.Schedule()
@@ -214,7 +221,7 @@ 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)
@@ -225,28 +232,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)
@@ -279,17 +293,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.Path("/swagger-ui").Handler(http.RedirectHandler("swagger-ui/", http.StatusMovedPermanently)) // https://github.com/swaggo/http-swagger/issues/44
-	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)
@@ -360,6 +374,9 @@ func listen(handler http.Handler) {
 				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())
 				}
@@ -389,6 +406,9 @@ func listen(handler http.Handler) {
 				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/principal.go

@@ -21,6 +21,9 @@ func (c *PrincipalContainer) GetPrincipal() *models.User {
 }
 
 func (c *PrincipalContainer) GetPrincipalIdentity() string {
+	if c.principal == nil {
+		return ""
+	}
 	return c.principal.Identity()
 }
 

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/20221028_fix_heartbeats_time_user_idx.go

@@ -1,12 +1,13 @@
 package migrations
 
 import (
+	"regexp"
+	"strings"
+
 	"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
@@ -37,7 +38,7 @@ func init() {
 				}
 
 				matches := regexp.MustCompile("(?i)\\((.+)\\)$").FindStringSubmatch(ddl)
-				if len(matches) > 0 && !strings.Contains(matches[0], "`user_id`") || !strings.Contains(matches[0], "`time`") {
+				if len(matches) > 0 && (!strings.Contains(matches[0], "`user_id`") || !strings.Contains(matches[0], "`time`")) {
 					drop = true
 				}
 			} else {

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

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

@@ -99,11 +99,6 @@ func (m *UserServiceMock) SetWakatimeApiCredentials(user *models.User, s1, s2 st
 	return args.Get(0).(*models.User), args.Error(1)
 }
 
-func (m *UserServiceMock) MigrateMd5Password(user *models.User, login *models.Login) (*models.User, error) {
-	args := m.Called(user, login)
-	return args.Get(0).(*models.User), args.Error(1)
-}
-
 func (m *UserServiceMock) GenerateResetToken(user *models.User) (*models.User, error) {
 	args := m.Called(user)
 	return args.Get(0).(*models.User), args.Error(1)

models/compat/wakatime/v1/data_dump.go

@@ -0,0 +1,28 @@
+package v1
+
+type DataDumpViewModel struct {
+	Data       []*DataDumpData `json:"data"`
+	Total      int             `json:"total"`
+	TotalPages int             `json:"total_pages"`
+}
+
+type DataDumpResultErrorModel struct {
+	Error string `json:"error"`
+}
+
+type DataDumpResultViewModel struct {
+	Data *DataDumpData `json:"data"`
+}
+
+type DataDumpData struct {
+	Id              string  `json:"id"`
+	Type            string  `json:"type"`
+	DownloadUrl     string  `json:"download_url"`
+	Status          string  `json:"status"`
+	PercentComplete float32 `json:"percent_complete"`
+	Expires         string  `json:"expires"`
+	CreatedAt       string  `json:"created_at"`
+	HasFailed       bool    `json:"has_failed"`
+	IsStuck         bool    `json:"is_stuck"`
+	IsProcessing    bool    `json:"is_processing"`
+}

models/compat/wakatime/v1/json_export.go

@@ -0,0 +1,17 @@
+package v1
+
+type JsonExportViewModel struct {
+	//User  *User            `json:"user"`
+	Range *JsonExportRange `json:"range"`
+	Days  []*JsonExportDay `json:"days"`
+}
+
+type JsonExportRange struct {
+	Start int64 `json:"start"`
+	End   int64 `json:"end"`
+}
+
+type JsonExportDay struct {
+	Date       string            `json:"date"`
+	Heartbeats []*HeartbeatEntry `json:"heartbeats"`
+}

models/compat/wakatime/v1/stats.go

@@ -1,6 +1,7 @@
 package v1
 
 import (
+	"github.com/muety/wakapi/helpers"
 	"github.com/muety/wakapi/models"
 	"math"
 	"time"
@@ -14,19 +15,26 @@ type StatsViewModel struct {
 }
 
 type StatsData struct {
-	Username              string            `json:"username"`
-	UserId                string            `json:"user_id"`
-	Start                 time.Time         `json:"start"`
-	End                   time.Time         `json:"end"`
-	TotalSeconds          float64           `json:"total_seconds"`
-	DailyAverage          float64           `json:"daily_average"`
-	DaysIncludingHolidays int               `json:"days_including_holidays"`
-	Editors               []*SummariesEntry `json:"editors"`
-	Languages             []*SummariesEntry `json:"languages"`
-	Machines              []*SummariesEntry `json:"machines"`
-	Projects              []*SummariesEntry `json:"projects"`
-	OperatingSystems      []*SummariesEntry `json:"operating_systems"`
-	Branches              []*SummariesEntry `json:"branches,omitempty"`
+	Username                  string            `json:"username"`
+	UserId                    string            `json:"user_id"`
+	Start                     time.Time         `json:"start"`
+	End                       time.Time         `json:"end"`
+	Status                    string            `json:"status"`
+	TotalSeconds              float64           `json:"total_seconds"`
+	DailyAverage              float64           `json:"daily_average"`
+	DaysIncludingHolidays     int               `json:"days_including_holidays"`
+	Range                     string            `json:"range"`
+	HumanReadableRange        string            `json:"human_readable_range"`
+	HumanReadableTotal        string            `json:"human_readable_total"`
+	HumanReadableDailyAverage string            `json:"human_readable_daily_average"`
+	IsCodingActivityVisible   bool              `json:"is_coding_activity_visible"`
+	IsOtherUsageVisible       bool              `json:"is_other_usage_visible"`
+	Editors                   []*SummariesEntry `json:"editors"`
+	Languages                 []*SummariesEntry `json:"languages"`
+	Machines                  []*SummariesEntry `json:"machines"`
+	Projects                  []*SummariesEntry `json:"projects"`
+	OperatingSystems          []*SummariesEntry `json:"operating_systems"`
+	Branches                  []*SummariesEntry `json:"branches,omitempty"`
 }
 
 func NewStatsFrom(summary *models.Summary, filters *models.Filters) *StatsViewModel {
@@ -38,11 +46,16 @@ func NewStatsFrom(summary *models.Summary, filters *models.Filters) *StatsViewMo
 		UserId:                summary.UserID,
 		Start:                 summary.FromTime.T(),
 		End:                   summary.ToTime.T(),
+		Status:                "ok",
 		TotalSeconds:          totalTime.Seconds(),
-		DailyAverage:          totalTime.Seconds() / float64(numDays),
 		DaysIncludingHolidays: numDays,
+		HumanReadableTotal:    helpers.FmtWakatimeDuration(totalTime),
 	}
 
+	if numDays > 0 {
+		data.DailyAverage = totalTime.Seconds() / float64(numDays)
+		data.HumanReadableDailyAverage = helpers.FmtWakatimeDuration(totalTime / time.Duration(numDays))
+	}
 	if math.IsInf(data.DailyAverage, 0) || math.IsNaN(data.DailyAverage) {
 		data.DailyAverage = 0
 	}
@@ -77,6 +90,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

@@ -35,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"`
 }
@@ -132,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 {
@@ -141,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 {
@@ -148,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 {
@@ -155,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 {
@@ -162,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 {
@@ -169,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 {
@@ -176,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

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
@@ -24,7 +25,7 @@ func (f OrFilter) Exists() bool {
 
 func (f OrFilter) MatchAny(search string) bool {
 	for _, s := range f {
-		if s == search {
+		if s == search || (s == "-" && search == "") {
 			return true
 		}
 	}
@@ -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

@@ -2,6 +2,7 @@ package models
 
 import (
 	"fmt"
+	"github.com/duke-git/lancet/v2/strutil"
 	"github.com/emvi/logbuch"
 	"github.com/mitchellh/hashstructure/v2"
 	"strings"
@@ -39,6 +40,22 @@ func (h *Heartbeat) Timely(maxAge time.Duration) bool {
 	return now.Sub(h.Time.T()) <= maxAge && h.Time.T().Sub(now) < 1*time.Hour
 }
 
+func (h *Heartbeat) Sanitize() *Heartbeat {
+	// wakatime has a special keyword that indicates to use the most recent project for a given heartbeat
+	// in chrome, the browser extension sends this keyword for (most?) heartbeats
+	// presumably the idea behind this is that if you're coding, your browsing activity will likely also relate to that coding project
+	// but i don't really like this, i'd rather have all browsing activity under the "unknown" project (as the case with firefox, for whatever reason)
+	// see https://github.com/wakatime/browser-wakatime/pull/206
+	if (h.Type == "url" || h.Type == "domain") && h.Project == "<<LAST_PROJECT>>" {
+		h.Project = ""
+	}
+
+	h.OperatingSystem = strutil.Capitalize(h.OperatingSystem)
+	h.Editor = strutil.Capitalize(h.Editor)
+
+	return h
+}
+
 func (h *Heartbeat) Augment(languageMappings map[string]string) {
 	maxPrec := -1 // precision / mapping complexity -> more concrete ones shall take precedence
 	for ending, value := range languageMappings {
@@ -63,6 +80,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/interval.go

@@ -1,27 +1,33 @@
 package models
 
+import (
+	"unicode"
+)
+
 // Support Wakapi and WakaTime range / interval identifiers
 // See https://wakatime.com/developers/#summaries
 var (
 	IntervalToday              = &IntervalKey{"today", "Today"}
 	IntervalYesterday          = &IntervalKey{"day", "yesterday", "Yesterday"}
+	IntervalPastDay            = &IntervalKey{"24_hours", "last_24_hours", "last_day", "Last 24 Hours"} // non-official one
 	IntervalThisWeek           = &IntervalKey{"week", "This Week"}
-	IntervalLastWeek           = &IntervalKey{"Last Week"}
+	IntervalLastWeek           = &IntervalKey{"last_week", "Last Week"}
 	IntervalThisMonth          = &IntervalKey{"month", "This Month"}
-	IntervalLastMonth          = &IntervalKey{"Last Month"}
-	IntervalThisYear           = &IntervalKey{"year"}
+	IntervalLastMonth          = &IntervalKey{"last_month", "Last Month"}
+	IntervalThisYear           = &IntervalKey{"year", "This Year"}
 	IntervalPast7Days          = &IntervalKey{"7_days", "last_7_days", "Last 7 Days"}
 	IntervalPast7DaysYesterday = &IntervalKey{"Last 7 Days from Yesterday"}
-	IntervalPast14Days         = &IntervalKey{"Last 14 Days"}
+	IntervalPast14Days         = &IntervalKey{"14_days", "last_14_days", "Last 14 Days"}
 	IntervalPast30Days         = &IntervalKey{"30_days", "last_30_days", "Last 30 Days"}
-	IntervalPast6Months        = &IntervalKey{"6_months", "last_6_months"}
-	IntervalPast12Months       = &IntervalKey{"12_months", "last_12_months", "last_year"}
-	IntervalAny                = &IntervalKey{"any", "all_time"}
+	IntervalPast6Months        = &IntervalKey{"6_months", "last_6_months", "Last 6 Months"}
+	IntervalPast12Months       = &IntervalKey{"12_months", "last_12_months", "last_year", "Last 12 Months"}
+	IntervalAny                = &IntervalKey{"any", "all_time", "All Time"}
 )
 
 var AllIntervals = []*IntervalKey{
 	IntervalToday,
 	IntervalYesterday,
+	IntervalPastDay,
 	IntervalThisWeek,
 	IntervalLastWeek,
 	IntervalThisMonth,
@@ -46,3 +52,12 @@ func (k *IntervalKey) HasAlias(s string) bool {
 	}
 	return false
 }
+
+func (k *IntervalKey) GetHumanReadable() string {
+	for _, s := range *k {
+		if unicode.IsUpper(rune(s[0])) {
+			return s
+		}
+	}
+	return ""
+}

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/report.go

@@ -3,8 +3,9 @@ package models
 import "time"
 
 type Report struct {
-	From    time.Time
-	To      time.Time
-	User    *User
-	Summary *Summary
+	From           time.Time
+	To             time.Time
+	User           *User
+	Summary        *Summary
+	DailySummaries []*Summary
 }

models/summary.go

@@ -16,6 +16,7 @@ const (
 	SummaryMachine  uint8 = 4
 	SummaryLabel    uint8 = 5
 	SummaryBranch   uint8 = 6
+	SummaryEntity   uint8 = 7
 )
 
 const UnknownSummaryKey = "unknown"
@@ -34,6 +35,7 @@ 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
+	Entities         SummaryItems `json:"entities" gorm:"-"` // entities are not persisted, but calculated at runtime in case a project filter is applied
 	NumHeartbeats    int          `json:"-"`
 }
 
@@ -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

@@ -15,29 +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:"-"`
-	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"`
-	StripeCustomerId  string      `json:"-"`
+	ID                  string      `json:"id" gorm:"primary_key"`
+	ApiKey              string      `json:"api_key" gorm:"unique; default:NULL"`
+	Email               string      `json:"email" gorm:"index:idx_user_email; size:255"`
+	Location            string      `json:"location"`
+	Password            string      `json:"-"`
+	CreatedAt           CustomTime  `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	LastLoggedInAt      CustomTime  `gorm:"type:timestamp; default:CURRENT_TIMESTAMP" swaggertype:"string" format:"date" example:"2006-01-02 15:04:05.000"`
+	ShareDataMaxDays    int         `json:"-"`
+	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 {
@@ -162,6 +163,10 @@ func (u *User) MinDataAge() time.Time {
 	return time.Now().AddDate(0, -retentionMonths, 0)
 }
 
+func (u *User) AnyDataShared() bool {
+	return u.ShareDataMaxDays != 0 && (u.ShareEditors || u.ShareLanguages || u.ShareProjects || u.ShareOSs || u.ShareMachines || u.ShareLabels)
+}
+
 func (c *CredentialsReset) IsValid() bool {
 	return ValidatePassword(c.PasswordNew) &&
 		c.PasswordNew == c.PasswordRepeat
@@ -184,7 +189,7 @@ 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 {

models/user_test.go

@@ -1,10 +1,11 @@
 package models
 
 import (
-	conf "github.com/muety/wakapi/config"
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	conf "github.com/muety/wakapi/config"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUser_TZ(t *testing.T) {
@@ -21,7 +22,7 @@ func TestUser_TZ(t *testing.T) {
 }
 
 func TestUser_MinDataAge(t *testing.T) {
-	c := conf.Load("")
+	c := conf.Load("", "")
 
 	var sut *User
 

models/view/summary.go

@@ -1,6 +1,10 @@
 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
@@ -13,6 +17,16 @@ type SummaryViewModel struct {
 	OSColors       map[string]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 {

repositories/heartbeat.go

@@ -1,6 +1,7 @@
 package repositories
 
 import (
+	"github.com/duke-git/lancet/v2/slice"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
@@ -89,7 +90,13 @@ func (r *HeartbeatRepository) GetAllWithinByFilters(from, to time.Time, user *mo
 		Order("time asc")
 
 	for col, vals := range filterMap {
-		q = q.Where(col+" in ?", vals)
+		q = q.Where(col+" in ?", slice.Map[string, string](vals, func(i int, val string) string {
+			// query for "unknown" projects, languages, etc.
+			if val == "-" {
+				return ""
+			}
+			return val
+		}))
 	}
 
 	if err := q.Find(&heartbeats).Error; err != nil {

repositories/key_value.go

@@ -2,6 +2,7 @@ package repositories
 
 import (
 	"errors"
+	"github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
@@ -36,8 +37,12 @@ func (r *KeyValueRepository) GetString(key string) (*models.KeyStringValue, erro
 
 func (r *KeyValueRepository) Search(like string) ([]*models.KeyStringValue, error) {
 	var keyValues []*models.KeyStringValue
+	condition := "key like ?"
+	if r.db.Config.Name() == config.SQLDialectMysql {
+		condition = "`key` like ?"
+	}
 	if err := r.db.Table("key_string_values").
-		Where("`key` like ?", like).
+		Where(condition, like).
 		Find(&keyValues).
 		Error; err != nil {
 		return nil, err

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/user.go

@@ -125,26 +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,
-		"subscribed_until":    user.SubscribedUntil,
-		"stripe_customer_id":  user.StripeCustomerId,
+		"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,13 +27,12 @@ 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)

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
@@ -52,7 +51,7 @@ func (h *BadgeHandler) Get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	cacheKey := fmt.Sprintf("%s_%v_%s", user.ID, *interval.Key, filters.Hash())
+	cacheKey := fmt.Sprintf("%s_%v_%s_%s", user.ID, *interval.Key, filters.Hash(), r.URL.RawQuery)
 	noCache := utils.IsNoCache(r, 1*time.Hour)
 	if cacheResult, ok := h.cache.Get(cacheKey); ok && !noCache {
 		respondSvg(w, cacheResult.([]byte))

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,10 +2,10 @@ 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/models"
 	"github.com/muety/wakapi/services"
@@ -25,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

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,10 +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"
@@ -35,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
@@ -86,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()) {

routes/api/metrics.go

@@ -3,7 +3,7 @@ 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"
@@ -66,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) {

routes/api/summary.go

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

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,12 +2,13 @@ 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"
@@ -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
@@ -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,12 +1,13 @@
 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"
 	"net/http"
@@ -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
@@ -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,11 +2,11 @@ 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"
@@ -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

routes/compat/wakatime/v1/projects.go

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

routes/compat/wakatime/v1/stats.go

@@ -1,11 +1,11 @@
 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"
@@ -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,24 +60,30 @@ 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 no range was requested, get the maximum allowed range given the users max shared days, otherwise default to past 7 days (which will fail in the next step, because user didn't allow any sharing)
+	// this "floors" the user's maximum shared date to the supported range buckets (e.g. if user opted to share 12 days, we'll still fallback to "last_7_days") for consistency with wakatime
 	if rangeParam == "" {
-		rangeParam = (*models.IntervalPast7Days)[0]
+		if _, userRange := helpers.ResolveMaximumRange(requestedUser.ShareDataMaxDays); userRange != nil {
+			rangeParam = (*userRange)[1]
+		} else {
+			rangeParam = (*models.IntervalPast7Days)[1]
+		}
 	}
 
 	err, rangeFrom, rangeTo := helpers.ResolveIntervalRawTZ(rangeParam, requestedUser.TZ())
@@ -102,6 +109,10 @@ func (h *StatsHandler) Get(w http.ResponseWriter, r *http.Request) {
 	}
 
 	stats := v1.NewStatsFrom(summary, &models.Filters{})
+	stats.Data.Range = rangeParam
+	stats.Data.HumanReadableRange = helpers.MustParseInterval(rangeParam).GetHumanReadable()
+	stats.Data.IsCodingActivityVisible = requestedUser.ShareDataMaxDays != 0
+	stats.Data.IsOtherUsageVisible = requestedUser.AnyDataShared()
 
 	// post filter stats according to user's given sharing permissions
 	if !requestedUser.ShareEditors {

routes/compat/wakatime/v1/statusbar.go

@@ -1,11 +1,12 @@
 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"
@@ -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,9 +57,8 @@ 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]
 	}
@@ -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,12 +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"
@@ -32,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
@@ -64,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()))
@@ -80,8 +79,7 @@ func (h *SummariesHandler) Get(w http.ResponseWriter, r *http.Request) {
 	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")
 

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,10 +1,10 @@
 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"
@@ -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

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

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/emvi/logbuch"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	"github.com/gorilla/schema"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
@@ -33,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) {
@@ -46,6 +46,10 @@ 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, 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) {

routes/leaderboard.go

@@ -4,7 +4,7 @@ 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"
@@ -34,16 +34,17 @@ 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()).
 			WithRedirectErrorMessage("unauthorized").
-			WithOptionalFor([]string{"/"}).
-			Handler,
+			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) {

routes/login.go

@@ -3,7 +3,7 @@ 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"
@@ -30,24 +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("/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 := router.PathPrefix("/logout").Subrouter()
+	logoutRouter := chi.NewRouter()
 	logoutRouter.Use(authMiddleware.Handler)
-	logoutRouter.Path("").Methods(http.MethodPost).HandlerFunc(h.PostLogout)
+	logoutRouter.Post("/", h.PostLogout)
+	router.Mount("/logout", logoutRouter)
 }
 
 func (h *LoginHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@@ -92,7 +93,7 @@ func (h *LoginHandler) PostLogin(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if !utils.CompareBcrypt(user.Password, login.Password, h.config.Security.PasswordSalt) {
+	if !utils.ComparePassword(user.Password, login.Password, h.config.Security.PasswordSalt) {
 		w.WriteHeader(http.StatusUnauthorized)
 		templates[conf.LoginTemplate].Execute(w, h.buildViewModel(r, w).WithError("invalid credentials"))
 		return
@@ -251,7 +252,7 @@ func (h *LoginHandler) PostSetPassword(w http.ResponseWriter, r *http.Request) {
 
 	user.Password = setRequest.Password
 	user.ResetToken = ""
-	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
+	if hash, err := utils.HashPassword(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, w).WithError("failed to set new password"))

routes/relay/relay.go

@@ -1,7 +1,7 @@
 package relay
 
 import (
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
 	conf "github.com/muety/wakapi/config"
 	"net/http"
 	"net/http/httputil"
@@ -46,14 +46,16 @@ func (m *filteringMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request)
 	m.handler.ServeHTTP(w, r)
 }
 
-func (h *RelayHandler) RegisterRoutes(router *mux.Router) {
+func (h *RelayHandler) RegisterRoutes(router chi.Router) {
 	if !h.config.Security.EnableProxy {
 		return
 	}
 
-	r := router.PathPrefix("/relay").Subrouter()
+	r := chi.NewRouter()
 	r.Use(newFilteringMiddleware())
-	r.Path("").HandlerFunc(h.Any)
+	r.HandleFunc("/", h.Any)
+
+	router.Mount("/relay", r)
 }
 
 func (h *RelayHandler) Any(w http.ResponseWriter, r *http.Request) {
@@ -63,6 +65,7 @@ func (h *RelayHandler) Any(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte{})
 		return
 	}
+	targetUrl.RawQuery = r.URL.RawQuery
 
 	p := httputil.ReverseProxy{
 		Director: func(r *http.Request) {

routes/routes.go

@@ -1,6 +1,7 @@
 package routes
 
 import (
+	"github.com/duke-git/lancet/v2/strutil"
 	"github.com/muety/wakapi/helpers"
 	"html/template"
 	"net/http"
@@ -34,7 +35,7 @@ func DefaultTemplateFuncs() template.FuncMap {
 		"title":          strings.Title,
 		"join":           strings.Join,
 		"add":            add,
-		"capitalize":     utils.Capitalize,
+		"capitalize":     strutil.Capitalize,
 		"lower":          strings.ToLower,
 		"toRunes":        utils.ToRunes,
 		"localTZOffset":  utils.LocalTZOffset,
@@ -90,6 +91,9 @@ func typeName(t uint8) string {
 	if t == models.SummaryBranch {
 		return "branch"
 	}
+	if t == models.SummaryEntity {
+		return "entity"
+	}
 	return "unknown"
 }
 

routes/settings.go

@@ -3,9 +3,15 @@ package routes
 import (
 	"encoding/base64"
 	"fmt"
+	"github.com/go-chi/chi/v5"
+	"net/http"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
 	datastructure "github.com/duke-git/lancet/v2/datastructure/set"
 	"github.com/emvi/logbuch"
-	"github.com/gorilla/mux"
 	"github.com/gorilla/schema"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
@@ -15,11 +21,6 @@ import (
 	"github.com/muety/wakapi/services"
 	"github.com/muety/wakapi/services/imports"
 	"github.com/muety/wakapi/utils"
-	"net/http"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
 )
 
 const criticalError = "a critical error has occurred, sorry"
@@ -66,16 +67,17 @@ func NewSettingsHandler(
 	}
 }
 
-func (h *SettingsHandler) RegisterRoutes(router *mux.Router) {
-	r := router.PathPrefix("/settings").Subrouter()
+func (h *SettingsHandler) RegisterRoutes(router chi.Router) {
+	r := chi.NewRouter()
 	r.Use(
 		middlewares.NewAuthenticateMiddleware(h.userSrvc).
 			WithRedirectTarget(defaultErrorRedirectTarget()).
-			WithRedirectErrorMessage("unauthorized").
-			Handler,
+			WithRedirectErrorMessage("unauthorized").Handler,
 	)
-	r.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
-	r.Methods(http.MethodPost).HandlerFunc(h.PostIndex)
+	r.Get("/", h.GetIndex)
+	r.Post("/", h.PostIndex)
+
+	router.Mount("/settings", r)
 }
 
 func (h *SettingsHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@@ -215,7 +217,7 @@ func (h *SettingsHandler) actionChangePassword(w http.ResponseWriter, r *http.Re
 		return http.StatusBadRequest, "", "missing parameters"
 	}
 
-	if !utils.CompareBcrypt(user.Password, credentials.PasswordOld, h.config.Security.PasswordSalt) {
+	if !utils.ComparePassword(user.Password, credentials.PasswordOld, h.config.Security.PasswordSalt) {
 		return http.StatusUnauthorized, "", "invalid credentials"
 	}
 
@@ -224,7 +226,7 @@ func (h *SettingsHandler) actionChangePassword(w http.ResponseWriter, r *http.Re
 	}
 
 	user.Password = credentials.PasswordNew
-	if hash, err := utils.HashBcrypt(user.Password, h.config.Security.PasswordSalt); err != nil {
+	if hash, err := utils.HashPassword(user.Password, h.config.Security.PasswordSalt); err != nil {
 		return http.StatusInternalServerError, "", conf.ErrInternalServerError
 	} else {
 		user.Password = hash
@@ -364,22 +366,28 @@ func (h *SettingsHandler) actionAddLabel(w http.ResponseWriter, r *http.Request)
 	}
 	user := middlewares.GetPrincipal(r)
 
-	label := &models.ProjectLabel{
-		UserID:     user.ID,
-		ProjectKey: r.PostFormValue("key"),
-		Label:      r.PostFormValue("value"),
+	var labels []*models.ProjectLabel
+
+	for _, key := range r.Form["key"] {
+		label := &models.ProjectLabel{
+			UserID:     user.ID,
+			ProjectKey: key,
+			Label:      r.PostFormValue("value"),
+		}
+		labels = append(labels, label)
 	}
 
-	if !label.IsValid() {
-		return http.StatusBadRequest, "", "invalid input"
+	for _, label := range labels {
+		msg := "invalid input for project: " + label.ProjectKey
+		if !label.IsValid() {
+			return http.StatusBadRequest, "", msg
+		}
+		if _, err := h.projectLabelSrvc.Create(label); err != nil {
+			// TODO: distinguish between bad request, conflict and server error
+			return http.StatusBadRequest, "", msg
+		}
 	}
-
-	if _, err := h.projectLabelSrvc.Create(label); err != nil {
-		// TODO: distinguish between bad request, conflict and server error
-		return http.StatusBadRequest, "", "invalid input"
-	}
-
-	return http.StatusOK, "label added successfully", ""
+	return http.StatusOK, "label added to project successfully", ""
 }
 
 func (h *SettingsHandler) actionDeleteLabel(w http.ResponseWriter, r *http.Request) (int, string, string) {
@@ -505,23 +513,27 @@ func (h *SettingsHandler) actionImportWakatime(w http.ResponseWriter, r *http.Re
 
 	go func(user *models.User) {
 		start := time.Now()
-		importer := imports.NewWakatimeHeartbeatImporter(user.WakatimeApiKey)
+		importer := imports.NewWakatimeImporter(user.WakatimeApiKey)
 
-		countBefore, err := h.heartbeatSrvc.CountByUser(user)
-		if err != nil {
-			println(err)
-		}
+		countBefore, _ := h.heartbeatSrvc.CountByUser(user)
 
-		var stream <-chan *models.Heartbeat
+		var (
+			stream      <-chan *models.Heartbeat
+			importError error
+		)
 		if latest, err := h.heartbeatSrvc.GetLatestByOriginAndUser(imports.OriginWakatime, user); latest == nil || err != nil {
-			stream = importer.ImportAll(user)
+			stream, importError = importer.ImportAll(user)
 		} else {
 			// if an import has happened before, only import heartbeats newer than the latest of the last import
-			stream = importer.Import(user, latest.Time.T(), time.Now())
+			stream, importError = importer.Import(user, latest.Time.T(), time.Now())
+		}
+		if importError != nil {
+			conf.Log().Error("wakatime import for user '%s' failed - %v", user.ID, importError)
+			return
 		}
 
 		count := 0
-		batch := make([]*models.Heartbeat, 0)
+		batch := make([]*models.Heartbeat, 0, h.config.App.ImportBatchSize)
 
 		insert := func(batch []*models.Heartbeat) {
 			if err := h.heartbeatSrvc.InsertBatch(batch); err != nil {
@@ -535,10 +547,9 @@ func (h *SettingsHandler) actionImportWakatime(w http.ResponseWriter, r *http.Re
 
 			if len(batch) == h.config.App.ImportBatchSize {
 				insert(batch)
-				batch = make([]*models.Heartbeat, 0)
+				batch = make([]*models.Heartbeat, 0, h.config.App.ImportBatchSize)
 			}
 		}
-
 		if len(batch) > 0 {
 			insert(batch)
 		}

routes/subscription.go

@@ -5,7 +5,8 @@ import (
 	"errors"
 	"fmt"
 	"github.com/emvi/logbuch"
-	"github.com/gorilla/mux"
+	"github.com/go-chi/chi/v5"
+	"github.com/leandro-lugaresi/hub"
 	conf "github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/middlewares"
 	"github.com/muety/wakapi/models"
@@ -16,6 +17,7 @@ import (
 	stripeCheckoutSession "github.com/stripe/stripe-go/v74/checkout/session"
 	stripeCustomer "github.com/stripe/stripe-go/v74/customer"
 	stripePrice "github.com/stripe/stripe-go/v74/price"
+	stripeSubscription "github.com/stripe/stripe-go/v74/subscription"
 	"github.com/stripe/stripe-go/v74/webhook"
 	"io/ioutil"
 	"net/http"
@@ -32,8 +34,11 @@ import (
   4. Copy the publishable API key (https://dashboard.stripe.com/test/apikeys) and save it to 'stripe_api_key'
 */
 
+// TODO: move all logic inside this controller into a separate service
+
 type SubscriptionHandler struct {
 	config       *conf.Config
+	eventBus     *hub.Hub
 	userSrvc     services.IUserService
 	mailSrvc     services.IMailService
 	keyValueSrvc services.IKeyValueService
@@ -46,6 +51,7 @@ func NewSubscriptionHandler(
 	keyValueService services.IKeyValueService,
 ) *SubscriptionHandler {
 	config := conf.Get()
+	eventBus := conf.EventBus()
 
 	if config.Subscriptions.Enabled {
 		stripe.Key = config.Subscriptions.StripeSecretKey
@@ -59,36 +65,57 @@ func NewSubscriptionHandler(
 		logbuch.Info("enabling subscriptions with stripe payment for %s / month", config.Subscriptions.StandardPrice)
 	}
 
-	return &SubscriptionHandler{
+	handler := &SubscriptionHandler{
 		config:       config,
 		userSrvc:     userService,
 		mailSrvc:     mailService,
 		keyValueSrvc: keyValueService,
 		httpClient:   &http.Client{Timeout: 10 * time.Second},
 	}
+
+	onUserDelete := eventBus.Subscribe(0, conf.EventUserDelete)
+	go func(sub *hub.Subscription) {
+		for m := range sub.Receiver {
+			user := m.Fields[conf.FieldPayload].(*models.User)
+			if !user.HasActiveSubscription() {
+				continue
+			}
+
+			logbuch.Info("cancelling subscription for user '%s' (email '%s', stripe customer '%s') upon account deletion", user.ID, user.Email, user.StripeCustomerId)
+			if err := handler.cancelUserSubscription(user); err == nil {
+				logbuch.Info("successfully cancelled subscription for user '%s' (email '%s', stripe customer '%s')", user.ID, user.Email, user.StripeCustomerId)
+			} else {
+				conf.Log().Error("failed to cancel subscription for user '%s' (email '%s', stripe customer '%s') - %v", user.ID, user.Email, user.StripeCustomerId, err)
+			}
+		}
+	}(&onUserDelete)
+
+	return handler
 }
 
 // https://stripe.com/docs/billing/quickstart?lang=go
 
-func (h *SubscriptionHandler) RegisterRoutes(router *mux.Router) {
+func (h *SubscriptionHandler) RegisterRoutes(router chi.Router) {
 	if !h.config.Subscriptions.Enabled {
 		return
 	}
 
-	subRouterPublic := router.PathPrefix("/subscription").Subrouter()
-	subRouterPublic.Path("/success").Methods(http.MethodGet).HandlerFunc(h.GetCheckoutSuccess)
-	subRouterPublic.Path("/cancel").Methods(http.MethodGet).HandlerFunc(h.GetCheckoutCancel)
-	subRouterPublic.Path("/webhook").Methods(http.MethodPost).HandlerFunc(h.PostWebhook)
+	subRouterPublic := chi.NewRouter()
+	subRouterPublic.Get("/success", h.GetCheckoutSuccess)
+	subRouterPublic.Get("/cancel", h.GetCheckoutCancel)
+	subRouterPublic.Post("/webhook", h.PostWebhook)
 
-	subRouterPrivate := subRouterPublic.PathPrefix("").Subrouter()
+	subRouterPrivate := chi.NewRouter()
 	subRouterPrivate.Use(
 		middlewares.NewAuthenticateMiddleware(h.userSrvc).
 			WithRedirectTarget(defaultErrorRedirectTarget()).
-			WithRedirectErrorMessage("unauthorized").
-			Handler,
+			WithRedirectErrorMessage("unauthorized").Handler,
 	)
-	subRouterPrivate.Path("/checkout").Methods(http.MethodPost).HandlerFunc(h.PostCheckout)
-	subRouterPrivate.Path("/portal").Methods(http.MethodPost).HandlerFunc(h.PostPortal)
+	subRouterPrivate.Post("/checkout", h.PostCheckout)
+	subRouterPrivate.Post("/portal", h.PostPortal)
+
+	subRouterPublic.Mount("/", subRouterPrivate)
+	router.Mount("/subscription", subRouterPublic)
 }
 
 func (h *SubscriptionHandler) PostCheckout(w http.ResponseWriter, r *http.Request) {
@@ -192,8 +219,7 @@ func (h *SubscriptionHandler) PostWebhook(w http.ResponseWriter, r *http.Request
 		// example payload: https://pastr.de/p/k7bx3alx38b1iawo6amtx09k
 		subscription, err := h.parseSubscriptionEvent(w, r, event)
 		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			return
+			return // status code already written
 		}
 		logbuch.Info("received stripe subscription event of type '%s' for subscription '%s' (customer '%s').", event.Type, subscription.ID, subscription.Customer.ID)
 
@@ -206,14 +232,14 @@ func (h *SubscriptionHandler) PostWebhook(w http.ResponseWriter, r *http.Request
 			customer, err := stripeCustomer.Get(subscription.Customer.ID, nil)
 			if err != nil {
 				conf.Log().Request(r).Error("failed to fetch stripe customer with id '%s', %v", subscription.Customer.ID, err)
-				w.WriteHeader(http.StatusInternalServerError)
+				w.WriteHeader(http.StatusOK) // don't make stripe retry the event
 				return
 			}
 
 			u, err := h.userSrvc.GetUserByEmail(customer.Email)
 			if err != nil {
 				conf.Log().Request(r).Error("failed to get user with email '%s' as stripe customer '%s' for processing event for subscription %s, %v", customer.Email, subscription.Customer.ID, subscription.ID, err)
-				w.WriteHeader(http.StatusInternalServerError)
+				w.WriteHeader(http.StatusOK) // don't make stripe retry the event
 				return
 			}
 			user = u
@@ -221,7 +247,7 @@ func (h *SubscriptionHandler) PostWebhook(w http.ResponseWriter, r *http.Request
 
 		if err := h.handleSubscriptionEvent(subscription, user); err != nil {
 			conf.Log().Request(r).Error("failed to handle subscription event %s (%s) for user %s, %v", event.ID, event.Type, user.ID, err)
-			w.WriteHeader(http.StatusInternalServerError)
+			w.WriteHeader(http.StatusOK) // don't make stripe retry the event
 			return
 		}
 
@@ -229,16 +255,14 @@ func (h *SubscriptionHandler) PostWebhook(w http.ResponseWriter, r *http.Request
 		// example payload: https://pastr.de/p/d01iniw9naq9hkmvyqtxin2w
 		checkoutSession, err := h.parseCheckoutSessionEvent(w, r, event)
 		if err != nil {
-			w.WriteHeader(http.StatusInternalServerError)
-			return
+			return // status code already written
 		}
 		logbuch.Info("received stripe checkout session event of type '%s' for session '%s' (customer '%s' with email '%s').", event.Type, checkoutSession.ID, checkoutSession.Customer.ID, checkoutSession.CustomerEmail)
 
 		user, err := h.userSrvc.GetUserById(checkoutSession.ClientReferenceID)
 		if err != nil {
 			conf.Log().Request(r).Error("failed to find user with id '%s' to update associated stripe customer (%s)", user.ID, checkoutSession.Customer.ID)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
+			return // status code already written
 		}
 
 		if user.StripeCustomerId == "" {
@@ -278,14 +302,17 @@ func (h *SubscriptionHandler) handleSubscriptionEvent(subscription *stripe.Subsc
 		if user.SubscribedUntil == nil || !user.SubscribedUntil.T().Equal(until.T()) {
 			hasSubscribed = true
 			user.SubscribedUntil = &until
+			user.SubscriptionRenewal = &until
 			logbuch.Info("user %s got active subscription %s until %v", user.ID, subscription.ID, user.SubscribedUntil)
 		}
 
 		if cancelAt := time.Unix(subscription.CancelAt, 0); !cancelAt.IsZero() && cancelAt.After(time.Now()) {
+			user.SubscriptionRenewal = nil
 			logbuch.Info("user %s chose to cancel subscription %s by %v", user.ID, subscription.ID, cancelAt)
 		}
-	case "canceled", "unpaid":
+	case "canceled", "unpaid", "incomplete_expired":
 		user.SubscribedUntil = nil
+		user.SubscriptionRenewal = nil
 		logbuch.Info("user %s's subscription %s got canceled, because of status update to '%s'", user.ID, subscription.ID, subscription.Status)
 	default:
 		logbuch.Info("got subscription (%s) status update to '%s' for user '%s'", subscription.ID, subscription.Status, user.ID)
@@ -320,6 +347,16 @@ func (h *SubscriptionHandler) parseCheckoutSessionEvent(w http.ResponseWriter, r
 	return &checkoutSession, nil
 }
 
+func (h *SubscriptionHandler) cancelUserSubscription(user *models.User) error {
+	// TODO: directly store subscription id with user object
+	subscription, err := h.findCurrentStripeSubscription(user.StripeCustomerId)
+	if err != nil {
+		return err
+	}
+	_, err = stripeSubscription.Cancel(subscription.ID, nil)
+	return err
+}
+
 func (h *SubscriptionHandler) findStripeCustomerByEmail(email string) (*stripe.Customer, error) {
 	params := &stripe.CustomerSearchParams{
 		SearchParams: stripe.SearchParams{
@@ -339,6 +376,24 @@ func (h *SubscriptionHandler) findStripeCustomerByEmail(email string) (*stripe.C
 	}
 }
 
+func (h *SubscriptionHandler) findCurrentStripeSubscription(customerId string) (*stripe.Subscription, error) {
+	paramStatus := "active"
+	params := &stripe.SubscriptionListParams{
+		Customer: &customerId,
+		Price:    &h.config.Subscriptions.StandardPriceId,
+		Status:   &paramStatus,
+		CurrentPeriodEndRange: &stripe.RangeQueryParams{
+			GreaterThan: time.Now().Unix(),
+		},
+	}
+	params.Filters.AddFilter("limit", "", "1")
+
+	if result := stripeSubscription.List(params); result.Next() {
+		return result.Subscription(), nil
+	}
+	return nil, fmt.Errorf("no active subscription found for customer '%s'", customerId)
+}
+
 func (h *SubscriptionHandler) clearSubscriptionNotificationStatus(userId string) {
 	key := fmt.Sprintf("%s_%s", conf.KeySubscriptionNotificationSent, userId)
 	if err := h.keyValueSrvc.DeleteString(key); err != nil {

routes/summary.go

@@ -2,7 +2,7 @@ package routes
 
 import (
 	"fmt"
-	"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"
@@ -11,36 +11,34 @@ import (
 	su "github.com/muety/wakapi/routes/utils"
 	"github.com/muety/wakapi/services"
 	"net/http"
+	"time"
 )
 
 type SummaryHandler struct {
-	config      *conf.Config
-	userSrvc    services.IUserService
-	summarySrvc services.ISummaryService
+	config       *conf.Config
+	userSrvc     services.IUserService
+	summarySrvc  services.ISummaryService
+	keyValueSrvc services.IKeyValueService
 }
 
-func NewSummaryHandler(summaryService services.ISummaryService, userService services.IUserService) *SummaryHandler {
+func NewSummaryHandler(summaryService services.ISummaryService, userService services.IUserService, keyValueService services.IKeyValueService) *SummaryHandler {
 	return &SummaryHandler{
-		summarySrvc: summaryService,
-		userSrvc:    userService,
-		config:      conf.Get(),
+		summarySrvc:  summaryService,
+		userSrvc:     userService,
+		keyValueSrvc: keyValueService,
+		config:       conf.Get(),
 	}
 }
 
-func (h *SummaryHandler) RegisterRoutes(router *mux.Router) {
-	r1 := router.PathPrefix("/summary").Subrouter()
-	r1.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).
+func (h *SummaryHandler) RegisterRoutes(router chi.Router) {
+	r := chi.NewRouter()
+	r.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).
 		WithRedirectTarget(defaultErrorRedirectTarget()).
-		WithRedirectErrorMessage("unauthorized").
-		Handler)
-	r1.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
+		WithRedirectErrorMessage("unauthorized").Handler,
+	)
+	r.Get("/", h.GetIndex)
 
-	r2 := router.PathPrefix("/summary").Subrouter()
-	r2.Use(middlewares.NewAuthenticateMiddleware(h.userSrvc).
-		WithRedirectTarget(defaultErrorRedirectTarget()).
-		WithRedirectErrorMessage("unauthorized").
-		Handler)
-	r2.Methods(http.MethodGet).HandlerFunc(h.GetIndex)
+	router.Mount("/summary", r)
 }
 
 func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
@@ -81,6 +79,13 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// user first data
+	var firstData time.Time
+	firstDataKv := h.keyValueSrvc.MustGetString(fmt.Sprintf("%s_%s", conf.KeyFirstHeartbeat, user.ID))
+	if firstDataKv.Value != "" {
+		firstData, _ = time.Parse(time.RFC822Z, firstDataKv.Value)
+	}
+
 	vm := view.SummaryViewModel{
 		Summary:        summary,
 		SummaryParams:  summaryParams,
@@ -90,6 +95,7 @@ func (h *SummaryHandler) GetIndex(w http.ResponseWriter, r *http.Request) {
 		OSColors:       su.FilterColors(h.config.App.GetOSColors(), summary.OperatingSystems),
 		ApiKey:         user.ApiKey,
 		RawQuery:       rawQuery,
+		UserFirstData:  firstData,
 	}
 
 	templates[conf.SummaryTemplate].Execute(w, vm)

routes/utils/summary_utils.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"github.com/muety/wakapi/helpers"
 	"github.com/muety/wakapi/models"
+	"github.com/muety/wakapi/models/types"
 	"github.com/muety/wakapi/services"
 	"net/http"
 	"strings"
@@ -17,7 +18,7 @@ func LoadUserSummary(ss services.ISummaryService, r *http.Request) (*models.Summ
 }
 
 func LoadUserSummaryByParams(ss services.ISummaryService, params *models.SummaryParams) (*models.Summary, error, int) {
-	var retrieveSummary services.SummaryRetriever = ss.Retrieve
+	var retrieveSummary types.SummaryRetriever = ss.Retrieve
 	if params.Recompute {
 		retrieveSummary = ss.Summarize
 	}

routes/utils/user_utils.go

@@ -2,7 +2,7 @@ package utils
 
 import (
 	"errors"
-	"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"
@@ -13,34 +13,33 @@ import (
 // CheckEffectiveUser extracts the requested user from a URL (like '/users/{user}'), compares it with the currently authorized user and writes an HTTP error if they differ.
 // Fallback can be used to manually set a value for '{user}' if none is present.
 func CheckEffectiveUser(w http.ResponseWriter, r *http.Request, userService services.IUserService, fallback string) (*models.User, error) {
-	var vars = mux.Vars(r)
-	var authorizedUser, requestedUser *models.User
-
-	if vars["user"] == "" {
-		vars["user"] = fallback
-	}
-
-	authorizedUser = middlewares.GetPrincipal(r)
-	if authorizedUser != nil {
-		if vars["user"] == "current" {
-			vars["user"] = authorizedUser.ID
-		}
-	}
-
-	requestedUser, err := userService.GetUserById(vars["user"])
-	if err != nil {
-		err := errors.New("user not found")
-		w.WriteHeader(http.StatusNotFound)
-		w.Write([]byte(err.Error()))
-		return nil, err
-	}
-
-	if authorizedUser == nil || authorizedUser.ID != requestedUser.ID && !authorizedUser.IsAdmin {
+	respondError := func(code int, text string) (*models.User, error) {
 		err := errors.New(conf.ErrUnauthorized)
 		w.WriteHeader(http.StatusUnauthorized)
 		w.Write([]byte(err.Error()))
 		return nil, err
 	}
 
+	userParam := chi.URLParam(r, "user")
+	if userParam == "" {
+		userParam = fallback
+	}
+
+	authorizedUser := middlewares.GetPrincipal(r)
+	if authorizedUser == nil {
+		return respondError(http.StatusUnauthorized, conf.ErrUnauthorized)
+	} else if userParam == "current" {
+		return authorizedUser, nil
+	}
+
+	if authorizedUser.ID != userParam && !authorizedUser.IsAdmin {
+		return respondError(http.StatusUnauthorized, conf.ErrUnauthorized)
+	}
+
+	requestedUser, err := userService.GetUserById(userParam)
+	if err != nil {
+		return respondError(http.StatusNotFound, "user not found")
+	}
+
 	return requestedUser, nil
 }

routes/utils/user_utils_test.go

@@ -0,0 +1,92 @@
+package utils
+
+import (
+	"context"
+	"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"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+)
+
+func TestCheckEffectiveUser_Current(t *testing.T) {
+	// request current as normal user -> return myself
+	r, w, userServiceMock := mockUserAwareRequest("current", "user1")
+	user, err := CheckEffectiveUser(w, r, userServiceMock, "current")
+	assert.Nil(t, err)
+	assert.Equal(t, "user1", user.ID)
+	userServiceMock.AssertNumberOfCalls(t, "GetUserById", 0)
+}
+
+func TestCheckEffectiveUser_Other(t *testing.T) {
+	// request someone else as admin -> return someone else
+	r, w, userServiceMock := mockUserAwareRequest("user2", "admin")
+	user, err := CheckEffectiveUser(w, r, userServiceMock, "current")
+	assert.Nil(t, err)
+	assert.Equal(t, "user2", user.ID)
+	userServiceMock.AssertCalled(t, "GetUserById", "user2")
+	userServiceMock.AssertNumberOfCalls(t, "GetUserById", 1)
+}
+
+func TestCheckEffectiveUser_FallbackUnauthorized(t *testing.T) {
+	// request someone else as non-admin -> error
+	r, w, userServiceMock := mockUserAwareRequest("user2", "user1")
+	user, err := CheckEffectiveUser(w, r, userServiceMock, "current")
+	assert.NotNil(t, err)
+	assert.Nil(t, user)
+	userServiceMock.AssertNumberOfCalls(t, "GetUserById", 0)
+}
+
+func TestCheckEffectiveUser_FallbackEmpty(t *testing.T) {
+	// request none -> return myself
+	r, w, userServiceMock := mockUserAwareRequest("", "user1")
+	user, err := CheckEffectiveUser(w, r, userServiceMock, "current")
+	assert.Nil(t, err)
+	assert.Equal(t, "user1", user.ID)
+	userServiceMock.AssertNumberOfCalls(t, "GetUserById", 0)
+}
+
+func TestCheckEffectiveUser_FallbackUnauthenticated(t *testing.T) {
+	// request anyone without authentication -> error
+	r, w, userServiceMock := mockUserAwareRequest("user1", "")
+	user, err := CheckEffectiveUser(w, r, userServiceMock, "current")
+	assert.NotNil(t, err)
+	assert.Nil(t, user)
+	userServiceMock.AssertNumberOfCalls(t, "GetUserById", 0)
+}
+
+func mockUserAwareRequest(requestedUser, authorizedUser string) (*http.Request, http.ResponseWriter, *mocks.UserServiceMock) {
+	testUser := models.User{
+		ID:      authorizedUser,
+		IsAdmin: authorizedUser == "admin",
+	}
+
+	testPrincipal := middlewares.PrincipalContainer{}
+	if authorizedUser != "" {
+		testPrincipal.SetPrincipal(&testUser)
+	}
+
+	r := httptest.NewRequest("GET", "http://localhost:3000/api/{user}/data", nil)
+	r = withUrlParam(r, "user", requestedUser)
+	r = r.WithContext(context.WithValue(r.Context(), "principal", &testPrincipal))
+
+	userServiceMock := new(mocks.UserServiceMock)
+	userServiceMock.On("GetUserById", "user1").Return(&models.User{ID: "user1"}, nil)
+	userServiceMock.On("GetUserById", "user2").Return(&models.User{ID: "user2"}, nil)
+	userServiceMock.On("GetUserById", "admin").Return(&models.User{ID: "admin"}, nil)
+
+	return r, httptest.NewRecorder(), userServiceMock
+}
+
+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
+}

scripts/bundle_icons.js

@@ -77,7 +77,8 @@ let icons = [
     'mdi:code-json',
     'mdi:bash',
     'twemoji:frowning-face',
-    'ci:dot-03-m'
+    'ci:dot-03-m',
+    'jam:crown-f',
 ]
 
 const output = path.normalize(path.join(__dirname, '../static/assets/js/icons.dist.js'))

scripts/convert_colors.py

@@ -0,0 +1,13 @@
+# convert colors from the format provided by https://raw.githubusercontent.com/ozh/github-colors/master/colors.json to what wakapi wants
+
+import sys
+import json
+
+with open(sys.argv[1], 'r') as f:
+    colors = json.load(f)
+
+result = {}
+for k, v in colors.items():
+    result[k] = v['color']
+
+print(json.dumps(result, indent=4))

scripts/download_heartbeats.py

@@ -0,0 +1,90 @@
+#!/bin/python
+
+# Setup:
+# pip install requests tqdm
+
+import argparse
+import base64
+import csv
+import datetime
+import logging
+import os.path
+import sys
+from typing import Tuple, Any, Dict, List, Generator
+from urllib.parse import urlparse
+
+from tqdm import tqdm
+
+import requests
+
+# globals
+http: requests.Session = requests.Session()
+api_url: str = 'https://wakapi.dev/api'
+
+Heartbeats = List[Dict[str, Any]]
+
+model_keys: List[str] = ['branch', 'category', 'entity', 'is_write', 'language', 'project', 'time', 'type', 'user_id', 'machine_name_id', 'user_agent_id', 'created_at']
+
+
+def fetch_total_range(min_date: datetime.date, max_date: datetime.date) -> Tuple[datetime.date, datetime.date]:
+    r = http.get(f'{api_url}/compat/wakatime/v1/users/current/all_time_since_today')
+    r.raise_for_status()
+    data = r.json()
+    start_date: datetime.date = datetime.date.fromisoformat(data['data']['range']['start_date'])
+    end_date: datetime.date = datetime.date.fromisoformat(data['data']['range']['end_date'])
+    return max([start_date, min_date]), min([end_date, max_date])
+
+
+def fetch_all_heartbeats(start: datetime.date, end: datetime.date) -> Generator[Heartbeats, None, None]:
+    date_range: List[datetime.date] = [start + datetime.timedelta(days=x) for x in range(0, (end - start).days + 2)]
+    for date in tqdm(date_range):
+        yield fetch_heartbeats(date)
+
+
+def fetch_heartbeats(date: datetime.date) -> Heartbeats:
+    r = http.get(f'{api_url}/compat/wakatime/v1/users/current/heartbeats', params=dict(date=date.isoformat()))
+    r.raise_for_status()
+    return r.json()['data']
+
+
+def run(from_date: datetime.date, to_date: datetime.date, out_file: str):
+    total_range: Tuple[datetime.date, datetime.date] = fetch_total_range(from_date, to_date)
+
+    with open(out_file, 'w') as f:
+        w: csv.DictWriter = csv.DictWriter(f, model_keys, extrasaction='ignore')
+        w.writeheader()
+
+        for heartbeats in fetch_all_heartbeats(*total_range):
+            for hb in heartbeats:
+                w.writerow(hb)
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(description='Script to download raw heartbeats from Wakapi API')
+    parser.add_argument('--api_key', required=True, help='Wakapi API key')
+    parser.add_argument('--url', required=False, default=api_url, help='Wakapi instance API URL (without trailing slash)')
+    parser.add_argument('--from', default='1970-01-01', type=datetime.date.fromisoformat, help='Date range start')
+    parser.add_argument('--to', default=datetime.date.today().isoformat(), type=datetime.date.fromisoformat, help='Date range end')
+    parser.add_argument('--output', '-o', default='wakapi_heartbeats.csv', help='CSV file to save heartbeats to')
+    return parser.parse_args()
+
+
+def init_http(api_key: str):
+    global api_url
+    encoded_key: str = str(base64.b64encode(api_key.encode('utf-8')), 'utf-8')
+    http.headers.update({'Authorization': f'Basic {encoded_key}'})
+    api_url = args.url
+
+
+if __name__ == '__main__':
+    args = parse_args()
+
+    if os.path.exists(args.output):
+        logging.error('output file already existing, please delete or choose a different path')
+        sys.exit(1)
+
+    if 'wakatime.com' in urlparse(args.url):
+        logging.warning('warning: this script is not perfectly compatible with wakatime')
+
+    init_http(args.api_key)
+    run(getattr(args, 'from'), getattr(args, 'to'), args.output)

scripts/sample_data.py

@@ -19,7 +19,8 @@ LANGUAGES = {
     'Python': 'py',
     # https://github.com/muety/wakapi/issues/172
     'PHP': 'php',
-    'Blade': 'blade.php'
+    'Blade': 'blade.php',
+    '?': 'astro',  # simulate language unknown to wakatime-cli
 }
 BRANCHES = ['master', 'feature-1', 'feature-2']
 
@@ -78,7 +79,7 @@ def generate_data(n: int, n_projects: int = 5, n_past_hours: int = 24) -> List[H
         data.append(Heartbeat(
             entity=f'/home/me/dev/{p}/{f}.{LANGUAGES[l]}',
             project=p,
-            language=l,
+            language=l if not '?' in l else None,
             branch=b,
             time=(now - delta).timestamp()
         ))

scripts/send_mail.py

@@ -1,4 +1,5 @@
 import argparse
+import logging
 import time
 
 import requests
@@ -36,8 +37,11 @@ def send(recipient: str, subject: str, content: str, is_html: bool = False, base
 def run(args):
     content, is_html = read_mail_content(args.content)
     for recipient in tqdm(read_recipients(args.recipients)):
-        send(recipient, args.subject, content, is_html, args.mw_url)
-        time.sleep(args.throttle)
+        try:
+            send(recipient, args.subject, content, is_html, args.mw_url)
+            time.sleep(args.throttle)
+        except Exception as e:
+            logging.warning(f'failed to send to {recipient}, {e}')
 
 
 def parse_arguments():

services/duration.go

@@ -51,6 +51,9 @@ func (srv *DurationService) Get(from, to time.Time, user *models.User, filters *
 		}
 
 		d1 := models.NewDurationFromHeartbeat(h)
+		if !filters.IsProjectDetails() {
+			d1 = d1.WithEntityIgnored() // only for efficiency
+		}
 
 		if list, ok := mapping[d1.GroupHash]; !ok || len(list) < 1 {
 			mapping[d1.GroupHash] = []*models.Duration{d1}

services/duration_test.go

@@ -26,6 +26,8 @@ const (
 	TestOsWin          = "Windows"
 	TestMachine1       = "muety-desktop"
 	TestMachine2       = "muety-work"
+	TestEntity1        = "/home/bob/dev/wakapi.go"
+	TestEntity2        = "/home/bob/dev/SomethingElse.java"
 	TestBranchMaster   = "master"
 	TestBranchDev      = "dev"
 	MinUnixTime1       = 1601510400000 * 1e6

services/heartbeat.go

@@ -64,6 +64,7 @@ func (srv *HeartbeatService) InsertBatch(heartbeats []*models.Heartbeat) error {
 	filteredHeartbeats := make([]*models.Heartbeat, 0, len(heartbeats))
 	for _, hb := range heartbeats {
 		if !hashes.Contain(hb.Hash) {
+			hb = hb.Sanitize()
 			filteredHeartbeats = append(filteredHeartbeats, hb)
 			hashes.Add(hb.Hash)
 		}
@@ -238,6 +239,7 @@ func (srv *HeartbeatService) updateEntityUserCacheByHeartbeat(hb *models.Heartbe
 	go srv.updateEntityUserCache(models.SummaryOS, hb.OperatingSystem, hb.User)
 	go srv.updateEntityUserCache(models.SummaryMachine, hb.Machine, hb.User)
 	go srv.updateEntityUserCache(models.SummaryBranch, hb.Branch, hb.User)
+	go srv.updateEntityUserCache(models.SummaryEntity, hb.Entity, hb.User)
 }
 
 func (srv *HeartbeatService) notifyBatch(heartbeats []*models.Heartbeat) {

services/housekeeping.go

@@ -66,6 +66,10 @@ func (s *HousekeepingService) Schedule() {
 
 func (s *HousekeepingService) CleanUserDataBefore(user *models.User, before time.Time) error {
 	logbuch.Warn("cleaning up user data for '%s' older than %v", user.ID, before)
+	if s.config.App.DataCleanupDryRun {
+		logbuch.Info("skipping actual data deletion for '%v', because this is just a dry run", user.ID)
+		return nil
+	}
 
 	// clear old heartbeats
 	if err := s.heartbeatSrvc.DeleteByUserBefore(user, before); err != nil {

services/imports/importers.go

@@ -5,7 +5,7 @@ import (
 	"time"
 )
 
-type HeartbeatImporter interface {
-	Import(*models.User, time.Time, time.Time) <-chan *models.Heartbeat
-	ImportAll(*models.User) <-chan *models.Heartbeat
+type DataImporter interface {
+	Import(*models.User, time.Time, time.Time) (<-chan *models.Heartbeat, error)
+	ImportAll(*models.User) (<-chan *models.Heartbeat, error)
 }

services/imports/wakatime.go

@@ -1,338 +1,30 @@
 package imports
 
 import (
-	"context"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"github.com/duke-git/lancet/v2/datetime"
-	"github.com/muety/artifex/v2"
-	"github.com/muety/wakapi/utils"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/emvi/logbuch"
 	"github.com/muety/wakapi/config"
 	"github.com/muety/wakapi/models"
-	wakatime "github.com/muety/wakapi/models/compat/wakatime/v1"
-	"go.uber.org/atomic"
-	"golang.org/x/sync/semaphore"
+	"strings"
+	"time"
 )
 
-const OriginWakatime = "wakatime"
-const (
-	// wakatime api permits a max. rate of 10 req / sec
-	// https://github.com/wakatime/wakatime/issues/261
-	// with 5 workers, each sleeping slightly over 1/2 sec after every req., we should stay well below that limit
-	maxWorkers    = 5
-	throttleDelay = 550 * time.Millisecond
-)
-
-type WakatimeHeartbeatImporter struct {
-	ApiKey     string
-	httpClient *http.Client
-	queue      *artifex.Dispatcher
+type WakatimeImporter struct {
+	apiKey string
 }
 
-func NewWakatimeHeartbeatImporter(apiKey string) *WakatimeHeartbeatImporter {
-	return &WakatimeHeartbeatImporter{
-		ApiKey:     apiKey,
-		httpClient: &http.Client{Timeout: 10 * time.Second},
-		queue:      config.GetQueue(config.QueueImports),
-	}
+func NewWakatimeImporter(apiKey string) *WakatimeImporter {
+	return &WakatimeImporter{apiKey: apiKey}
 }
 
-func (w *WakatimeHeartbeatImporter) Import(user *models.User, minFrom time.Time, maxTo time.Time) <-chan *models.Heartbeat {
-	out := make(chan *models.Heartbeat)
-
-	process := func(user *models.User, minFrom time.Time, maxTo time.Time, out chan *models.Heartbeat) {
-		logbuch.Info("running wakatime import for user '%s'", user.ID)
-
-		baseUrl := user.WakaTimeURL(config.WakatimeApiUrl)
-
-		startDate, endDate, err := w.fetchRange(baseUrl)
-		if err != nil {
-			config.Log().Error("failed to fetch date range while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
-			return
-		}
-
-		if startDate.Before(minFrom) {
-			startDate = minFrom
-		}
-		if endDate.After(maxTo) {
-			endDate = maxTo
-		}
-
-		userAgents := map[string]*wakatime.UserAgentEntry{}
-		if data, err := w.fetchUserAgents(baseUrl); err == nil {
-			userAgents = data
-		} else if strings.Contains(baseUrl, "wakatime.com") {
-			// when importing from wakatime, resolving user agents is mandatorily required
-			config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
-			return
-		}
-
-		machinesNames := map[string]*wakatime.MachineEntry{}
-		if data, err := w.fetchMachineNames(baseUrl); err == nil {
-			machinesNames = data
-		} else if strings.Contains(baseUrl, "wakatime.com") {
-			// when importing from wakatime, resolving machine names is mandatorily required
-			config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
-			return
-		}
-
-		days := generateDays(startDate, endDate)
-
-		c := atomic.NewUint32(uint32(len(days)))
-		ctx := context.TODO()
-		sem := semaphore.NewWeighted(maxWorkers)
-
-		for _, d := range days {
-			if err := sem.Acquire(ctx, 1); err != nil {
-				logbuch.Error("failed to acquire semaphore - %v", err)
-				break
-			}
-
-			go func(day time.Time) {
-				defer sem.Release(1)
-				defer time.Sleep(throttleDelay)
-
-				d := day.Format(config.SimpleDateFormat)
-				heartbeats, err := w.fetchHeartbeats(d, baseUrl)
-				if err != nil {
-					config.Log().Error("failed to fetch heartbeats for day '%s' and user '%s' - %v", d, user.ID, err)
-				}
-
-				for _, h := range heartbeats {
-					out <- mapHeartbeat(h, userAgents, machinesNames, user)
-				}
-
-				if c.Dec() == 0 {
-					close(out)
-				}
-			}(d)
-		}
+func (w *WakatimeImporter) Import(user *models.User, minFrom time.Time, maxTo time.Time) (<-chan *models.Heartbeat, error) {
+	if strings.Contains(user.WakaTimeURL(config.WakatimeApiUrl), "wakatime.com") {
+		return NewWakatimeDumpImporter(w.apiKey).Import(user, minFrom, maxTo)
 	}
-
-	if minDataAge := user.MinDataAge(); minFrom.Before(minDataAge) {
-		logbuch.Info("wakatime data import for user '%s' capped to [%v, &v]", user.ID, minDataAge, maxTo)
-	}
-
-	logbuch.Info("scheduling wakatime import for user '%s' (interval [%v, &v])", user.ID, minFrom, maxTo)
-	if err := w.queue.Dispatch(func() {
-		process(user, minFrom, maxTo, out)
-	}); err != nil {
-		config.Log().Error("failed to dispatch wakatime import job for user '%s', %v", user.ID, err)
-	}
-
-	return out
+	return NewWakatimeHeartbeatImporter(w.apiKey).Import(user, minFrom, maxTo)
 }
 
-func (w *WakatimeHeartbeatImporter) ImportAll(user *models.User) <-chan *models.Heartbeat {
-	return w.Import(user, time.Time{}, time.Now())
-}
-
-// https://wakatime.com/api/v1/users/current/heartbeats?date=2021-02-05
-// https://pastr.de/p/b5p4od5s8w0pfntmwoi117jy
-func (w *WakatimeHeartbeatImporter) fetchHeartbeats(day string, baseUrl string) ([]*wakatime.HeartbeatEntry, error) {
-	req, err := http.NewRequest(http.MethodGet, baseUrl+config.WakatimeApiHeartbeatsUrl, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	q := req.URL.Query()
-	q.Add("date", day)
-	req.URL.RawQuery = q.Encode()
-
-	res, err := w.httpClient.Do(w.withHeaders(req))
-	if err != nil {
-		return nil, err
-	} else if res.StatusCode >= 400 {
-		return nil, errors.New(fmt.Sprintf("got status %d from wakatime api", res.StatusCode))
-	}
-	defer res.Body.Close()
-
-	var heartbeatsData wakatime.HeartbeatsViewModel
-	if err := json.NewDecoder(res.Body).Decode(&heartbeatsData); err != nil {
-		return nil, err
-	}
-
-	return heartbeatsData.Data, nil
-}
-
-// https://wakatime.com/api/v1/users/current/all_time_since_today
-// https://pastr.de/p/w8xb4biv575pu32pox7jj2gr
-func (w *WakatimeHeartbeatImporter) fetchRange(baseUrl string) (time.Time, time.Time, error) {
-	notime := time.Time{}
-
-	req, err := http.NewRequest(http.MethodGet, baseUrl+config.WakatimeApiAllTimeUrl, nil)
-	if err != nil {
-		return notime, notime, err
-	}
-
-	res, err := w.httpClient.Do(w.withHeaders(req))
-	if err != nil {
-		return notime, notime, err
-	}
-
-	// see https://github.com/muety/wakapi/issues/370
-	allTimeData, err := utils.ParseJsonDropKeys[wakatime.AllTimeViewModel](res.Body, "text")
-	if err != nil {
-		return notime, notime, err
-	}
-
-	startDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.StartDate)
-	if err != nil {
-		return notime, notime, err
-	}
-
-	endDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.EndDate)
-	if err != nil {
-		return notime, notime, err
-	}
-
-	return startDate, endDate, nil
-}
-
-// https://wakatime.com/api/v1/users/current/user_agents
-// https://pastr.de/p/05k5do8q108k94lic4lfl3pc
-func (w *WakatimeHeartbeatImporter) fetchUserAgents(baseUrl string) (map[string]*wakatime.UserAgentEntry, error) {
-	userAgents := make(map[string]*wakatime.UserAgentEntry)
-
-	for page := 1; ; page++ {
-		url := fmt.Sprintf("%s%s?page=%d", baseUrl, config.WakatimeApiUserAgentsUrl, page)
-		req, err := http.NewRequest(http.MethodGet, url, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		res, err := w.httpClient.Do(w.withHeaders(req))
-		if err != nil {
-			return nil, err
-		}
-		defer res.Body.Close()
-
-		var userAgentsData wakatime.UserAgentsViewModel
-		if err := json.NewDecoder(res.Body).Decode(&userAgentsData); err != nil {
-			return nil, err
-		}
-
-		for _, ua := range userAgentsData.Data {
-			userAgents[ua.Id] = ua
-		}
-
-		if page == userAgentsData.TotalPages {
-			break
-		}
-	}
-
-	return userAgents, nil
-}
-
-// https://wakatime.com/api/v1/users/current/machine_names
-// https://pastr.de/p/v58cv0xrupp3zvyyv8o6973j
-func (w *WakatimeHeartbeatImporter) fetchMachineNames(baseUrl string) (map[string]*wakatime.MachineEntry, error) {
-	httpClient := &http.Client{Timeout: 10 * time.Second}
-
-	machines := make(map[string]*wakatime.MachineEntry)
-
-	for page := 1; ; page++ {
-		url := fmt.Sprintf("%s%s?page=%d", baseUrl, config.WakatimeApiMachineNamesUrl, page)
-		req, err := http.NewRequest(http.MethodGet, url, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		res, err := httpClient.Do(w.withHeaders(req))
-		if err != nil {
-			return nil, err
-		}
-		defer res.Body.Close()
-
-		var machineData wakatime.MachineViewModel
-		if err := json.NewDecoder(res.Body).Decode(&machineData); err != nil {
-			return nil, err
-		}
-
-		for _, ma := range machineData.Data {
-			machines[ma.Id] = ma
-		}
-
-		if page == machineData.TotalPages {
-			break
-		}
-	}
-
-	return machines, nil
-}
-
-func (w *WakatimeHeartbeatImporter) withHeaders(req *http.Request) *http.Request {
-	req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(w.ApiKey))))
-	return req
-}
-
-func mapHeartbeat(
-	entry *wakatime.HeartbeatEntry,
-	userAgents map[string]*wakatime.UserAgentEntry,
-	machineNames map[string]*wakatime.MachineEntry,
-	user *models.User,
-) *models.Heartbeat {
-	ua := userAgents[entry.UserAgentId]
-	if ua == nil {
-		// try to parse id as an actual user agent string (as returned by wakapi)
-		if opSys, editor, err := utils.ParseUserAgent(entry.UserAgentId); err == nil {
-			ua = &wakatime.UserAgentEntry{
-				Editor: opSys,
-				Os:     editor,
-			}
-		} else {
-			ua = &wakatime.UserAgentEntry{
-				Editor: "unknown",
-				Os:     "unknown",
-			}
-		}
-	}
-
-	ma := machineNames[entry.MachineNameId]
-	if ma == nil {
-		ma = &wakatime.MachineEntry{
-			Id:    entry.MachineNameId,
-			Value: entry.MachineNameId,
-		}
-	}
-
-	return (&models.Heartbeat{
-		User:            user,
-		UserID:          user.ID,
-		Entity:          entry.Entity,
-		Type:            entry.Type,
-		Category:        entry.Category,
-		Project:         entry.Project,
-		Branch:          entry.Branch,
-		Language:        entry.Language,
-		IsWrite:         entry.IsWrite,
-		Editor:          ua.Editor,
-		OperatingSystem: ua.Os,
-		Machine:         ma.Value,
-		UserAgent:       ua.Value,
-		Time:            models.CustomTime(time.Unix(0, int64(entry.Time*1e9))),
-		Origin:          OriginWakatime,
-		OriginId:        entry.Id,
-		CreatedAt:       models.CustomTime(entry.CreatedAt),
-	}).Hashed()
-}
-
-func generateDays(from, to time.Time) []time.Time {
-	days := make([]time.Time, 0)
-
-	from = datetime.BeginOfDay(from)
-	to = datetime.BeginOfDay(to.AddDate(0, 0, 1))
-
-	for d := from; d.Before(to); d = d.AddDate(0, 0, 1) {
-		days = append(days, d)
-	}
-
-	return days
+func (w *WakatimeImporter) ImportAll(user *models.User) (<-chan *models.Heartbeat, error) {
+	if strings.Contains(user.WakaTimeURL(config.WakatimeApiUrl), "wakatime.com") {
+		return NewWakatimeDumpImporter(w.apiKey).ImportAll(user)
+	}
+	return NewWakatimeHeartbeatImporter(w.apiKey).ImportAll(user)
 }

services/imports/wakatime_dump.go

@@ -0,0 +1,160 @@
+package imports
+
+import (
+	"bytes"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+	"time"
+
+	"github.com/emvi/logbuch"
+	"github.com/muety/artifex/v2"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	wakatime "github.com/muety/wakapi/models/compat/wakatime/v1"
+)
+
+// data example: https://github.com/muety/wakapi/issues/323#issuecomment-1627467052
+
+type WakatimeDumpImporter struct {
+	apiKey     string
+	httpClient *http.Client
+	queue      *artifex.Dispatcher
+}
+
+func NewWakatimeDumpImporter(apiKey string) *WakatimeDumpImporter {
+	return &WakatimeDumpImporter{
+		apiKey:     apiKey,
+		httpClient: &http.Client{Timeout: 10 * time.Second},
+		queue:      config.GetQueue(config.QueueImports),
+	}
+}
+
+func (w *WakatimeDumpImporter) Import(user *models.User, minFrom time.Time, maxTo time.Time) (<-chan *models.Heartbeat, error) {
+	out := make(chan *models.Heartbeat)
+	logbuch.Info("running wakatime dump import for user '%s'", user.ID)
+
+	url := config.WakatimeApiUrl + config.WakatimeApiDataDumpUrl // this importer only works with wakatime currently, so no point in using user's custom wakatime api url
+	req, _ := http.NewRequest(http.MethodPost, url, bytes.NewBuffer([]byte(`{ "type": "heartbeats", "email_when_finished": false }`)))
+	res, err := utils.RaiseForStatus(w.httpClient.Do(w.withHeaders(req)))
+
+	if err != nil && res.StatusCode == http.StatusBadRequest {
+		var datadumpError wakatime.DataDumpResultErrorModel
+		if err := json.NewDecoder(res.Body).Decode(&datadumpError); err != nil {
+			return nil, err
+		}
+		// in case of this error message, a dump had already been requested before and can simply be downloaded now
+		// -> just keep going as usual (kick off poll loop), otherwise yield error
+		if datadumpError.Error == "Wait for your current export to expire before creating another." {
+			logbuch.Info("failed to request new dump, because other non-expired dump already existing, using that one")
+		} else {
+			return nil, err
+		}
+	} else if err != nil {
+		return nil, err
+	}
+	defer res.Body.Close()
+
+	var readyPollTimer *artifex.DispatchTicker
+
+	// callbacks
+	checkDumpAvailable := func(user *models.User) (bool, *wakatime.DataDumpData, error) {
+		req, _ := http.NewRequest(http.MethodGet, url, nil)
+		res, err := utils.RaiseForStatus(w.httpClient.Do(w.withHeaders(req)))
+		if err != nil {
+			return false, nil, err
+		}
+
+		var datadumpData wakatime.DataDumpViewModel
+		if err := json.NewDecoder(res.Body).Decode(&datadumpData); err != nil {
+			return false, nil, err
+		}
+
+		if len(datadumpData.Data) < 1 {
+			return false, nil, errors.New("no dumps available")
+		}
+
+		return datadumpData.Data[0].Status == "Completed", datadumpData.Data[0], nil
+	}
+
+	onDumpFailed := func(err error, user *models.User) {
+		config.Log().Error("fetching data dump for user '%s' failed - %v", user.ID, err)
+		readyPollTimer.Stop()
+		close(out)
+	}
+
+	onDumpReady := func(dump *wakatime.DataDumpData, user *models.User, out chan *models.Heartbeat) {
+		config.Log().Info("data dump for user '%s' is available for download", user.ID)
+		readyPollTimer.Stop()
+		defer close(out)
+
+		// download
+		req, _ := http.NewRequest(http.MethodGet, dump.DownloadUrl, nil)
+		res, err := utils.RaiseForStatus((&http.Client{Timeout: 5 * time.Minute}).Do(req))
+		if err != nil {
+			config.Log().Error("failed to download %s - %v", dump.DownloadUrl, err)
+			return
+		}
+		defer res.Body.Close()
+
+		logbuch.Info("fetched %d bytes data dump for user '%s'", res.ContentLength, user.ID)
+
+		// decode
+		var data wakatime.JsonExportViewModel
+		if err := json.NewDecoder(res.Body).Decode(&data); err != nil {
+			config.Log().Error("failed to decode data dump for user '%s' ('%s') - %v", user.ID, dump.DownloadUrl, err)
+			return
+		}
+
+		// fetch user agents and machine names
+		var userAgents map[string]*wakatime.UserAgentEntry
+		if userAgents, err = fetchUserAgents(config.WakatimeApiUrl, w.apiKey); err != nil {
+			config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
+			return
+		}
+		var machinesNames map[string]*wakatime.MachineEntry
+		if machinesNames, err = fetchMachineNames(config.WakatimeApiUrl, w.apiKey); err != nil {
+			config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
+			return
+		}
+
+		// stream
+		for _, d := range data.Days {
+			for _, h := range d.Heartbeats {
+				hb := mapHeartbeat(h, userAgents, machinesNames, user)
+				if hb.Time.T().Before(minFrom) || hb.Time.T().After(maxTo) {
+					continue
+				}
+				out <- hb
+			}
+		}
+	}
+
+	// start polling for dump to be ready
+	readyPollTimer, err = w.queue.DispatchEvery(func() {
+		u := *user
+		ok, dump, err := checkDumpAvailable(&u)
+		if err != nil {
+			onDumpFailed(err, &u)
+		} else if ok {
+			logbuch.Info("waiting for data dump '%s' for user '%s' to become downloadable (%.2f percent complete)", dump.Id, u.ID, dump.PercentComplete)
+			onDumpReady(dump, &u, out)
+		}
+	}, 10*time.Second)
+
+	return out, nil
+}
+
+func (w *WakatimeDumpImporter) ImportAll(user *models.User) (<-chan *models.Heartbeat, error) {
+	return w.Import(user, time.Time{}, time.Now())
+}
+
+func (w *WakatimeDumpImporter) withHeaders(req *http.Request) *http.Request {
+	req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(w.apiKey))))
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Accept", "application/json")
+	return req
+}

services/imports/wakatime_heartbeats.go

@@ -0,0 +1,223 @@
+package imports
+
+import (
+	"context"
+	"encoding/base64"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"github.com/duke-git/lancet/v2/datetime"
+	"github.com/muety/artifex/v2"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/emvi/logbuch"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	wakatime "github.com/muety/wakapi/models/compat/wakatime/v1"
+	"go.uber.org/atomic"
+	"golang.org/x/sync/semaphore"
+)
+
+const OriginWakatime = "wakatime"
+const (
+	// wakatime api permits a max. rate of 10 req / sec
+	// https://github.com/wakatime/wakatime/issues/261
+	// with 5 workers, each sleeping slightly over 1/2 sec after every req., we should stay well below that limit
+	maxWorkers    = 5
+	throttleDelay = 550 * time.Millisecond
+)
+
+type WakatimeHeartbeatsImporter struct {
+	apiKey     string
+	httpClient *http.Client
+	queue      *artifex.Dispatcher
+}
+
+func NewWakatimeHeartbeatImporter(apiKey string) *WakatimeHeartbeatsImporter {
+	return &WakatimeHeartbeatsImporter{
+		apiKey:     apiKey,
+		httpClient: &http.Client{Timeout: 10 * time.Second},
+		queue:      config.GetQueue(config.QueueImports),
+	}
+}
+
+func (w *WakatimeHeartbeatsImporter) Import(user *models.User, minFrom time.Time, maxTo time.Time) (<-chan *models.Heartbeat, error) {
+	out := make(chan *models.Heartbeat)
+
+	process := func(user *models.User, minFrom time.Time, maxTo time.Time, out chan *models.Heartbeat) {
+		logbuch.Info("running wakatime import for user '%s'", user.ID)
+
+		baseUrl := user.WakaTimeURL(config.WakatimeApiUrl)
+
+		startDate, endDate, err := w.fetchRange(baseUrl)
+		if err != nil {
+			config.Log().Error("failed to fetch date range while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
+			return
+		}
+
+		if startDate.Before(minFrom) {
+			startDate = minFrom
+		}
+		if endDate.After(maxTo) {
+			endDate = maxTo
+		}
+
+		userAgents := map[string]*wakatime.UserAgentEntry{}
+		if data, err := fetchUserAgents(baseUrl, w.apiKey); err == nil {
+			userAgents = data
+		} else if strings.Contains(baseUrl, "wakatime.com") {
+			// when importing from wakatime, resolving user agents is mandatorily required
+			config.Log().Error("failed to fetch user agents while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
+			return
+		}
+
+		machinesNames := map[string]*wakatime.MachineEntry{}
+		if data, err := fetchMachineNames(baseUrl, w.apiKey); err == nil {
+			machinesNames = data
+		} else if strings.Contains(baseUrl, "wakatime.com") {
+			// when importing from wakatime, resolving machine names is mandatorily required
+			config.Log().Error("failed to fetch machine names while importing wakatime heartbeats for user '%s' - %v", user.ID, err)
+			return
+		}
+
+		days := generateDays(startDate, endDate)
+
+		c := atomic.NewUint32(uint32(len(days)))
+		ctx := context.TODO()
+		sem := semaphore.NewWeighted(maxWorkers)
+
+		for _, d := range days {
+			if err := sem.Acquire(ctx, 1); err != nil {
+				logbuch.Error("failed to acquire semaphore - %v", err)
+				break
+			}
+
+			go func(day time.Time) {
+				defer sem.Release(1)
+				defer time.Sleep(throttleDelay)
+
+				d := day.Format(config.SimpleDateFormat)
+				heartbeats, err := w.fetchHeartbeats(d, baseUrl)
+				if err != nil {
+					config.Log().Error("failed to fetch heartbeats for day '%s' and user '%s' - %v", d, user.ID, err)
+				}
+
+				for _, h := range heartbeats {
+					hb := mapHeartbeat(h, userAgents, machinesNames, user)
+					if hb.Time.T().Before(minFrom) || hb.Time.T().After(maxTo) {
+						continue
+					}
+					out <- hb
+				}
+
+				if c.Dec() == 0 {
+					close(out)
+				}
+			}(d)
+		}
+	}
+
+	if minDataAge := user.MinDataAge(); minFrom.Before(minDataAge) {
+		logbuch.Info("wakatime data import for user '%s' capped to [%v, &v]", user.ID, minDataAge, maxTo)
+	}
+
+	logbuch.Info("scheduling wakatime import for user '%s' (interval [%v, %v])", user.ID, minFrom, maxTo)
+	if err := w.queue.Dispatch(func() {
+		process(user, minFrom, maxTo, out)
+	}); err != nil {
+		config.Log().Error("failed to dispatch wakatime import job for user '%s', %v", user.ID, err)
+	}
+
+	return out, nil
+}
+
+func (w *WakatimeHeartbeatsImporter) ImportAll(user *models.User) (<-chan *models.Heartbeat, error) {
+	return w.Import(user, time.Time{}, time.Now())
+}
+
+// https://wakatime.com/api/v1/users/current/heartbeats?date=2021-02-05
+// https://pastr.de/p/b5p4od5s8w0pfntmwoi117jy
+func (w *WakatimeHeartbeatsImporter) fetchHeartbeats(day string, baseUrl string) ([]*wakatime.HeartbeatEntry, error) {
+	req, err := http.NewRequest(http.MethodGet, baseUrl+config.WakatimeApiHeartbeatsUrl, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	q := req.URL.Query()
+	q.Add("date", day)
+	req.URL.RawQuery = q.Encode()
+
+	var empty []*wakatime.HeartbeatEntry
+
+	res, err := w.httpClient.Do(w.withHeaders(req))
+	if err != nil {
+		return empty, err
+	} else if res.StatusCode == 402 {
+		return empty, nil // date outside free plan range -> return empty data, but do not throw error
+	} else if res.StatusCode >= 400 {
+		return empty, errors.New(fmt.Sprintf("got status %d from wakatime api", res.StatusCode))
+	}
+	defer res.Body.Close()
+
+	var heartbeatsData wakatime.HeartbeatsViewModel
+	if err := json.NewDecoder(res.Body).Decode(&heartbeatsData); err != nil {
+		return empty, err
+	}
+
+	return heartbeatsData.Data, nil
+}
+
+// https://wakatime.com/api/v1/users/current/all_time_since_today
+// https://pastr.de/p/w8xb4biv575pu32pox7jj2gr
+func (w *WakatimeHeartbeatsImporter) fetchRange(baseUrl string) (time.Time, time.Time, error) {
+	notime := time.Time{}
+
+	req, err := http.NewRequest(http.MethodGet, baseUrl+config.WakatimeApiAllTimeUrl, nil)
+	if err != nil {
+		return notime, notime, err
+	}
+
+	res, err := w.httpClient.Do(w.withHeaders(req))
+	if err != nil {
+		return notime, notime, err
+	}
+
+	// see https://github.com/muety/wakapi/issues/370
+	allTimeData, err := utils.ParseJsonDropKeys[wakatime.AllTimeViewModel](res.Body, "text")
+	if err != nil {
+		return notime, notime, err
+	}
+
+	startDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.StartDate)
+	if err != nil {
+		return notime, notime, err
+	}
+
+	endDate, err := time.Parse(config.SimpleDateFormat, allTimeData.Data.Range.EndDate)
+	if err != nil {
+		return notime, notime, err
+	}
+
+	return startDate, endDate, nil
+}
+
+func (w *WakatimeHeartbeatsImporter) withHeaders(req *http.Request) *http.Request {
+	req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(w.apiKey))))
+	return req
+}
+
+func generateDays(from, to time.Time) []time.Time {
+	days := make([]time.Time, 0)
+
+	from = datetime.BeginOfDay(from)
+	to = datetime.BeginOfDay(to.AddDate(0, 0, 1))
+
+	for d := from; d.Before(to); d = d.AddDate(0, 0, 1) {
+		days = append(days, d)
+	}
+
+	return days
+}

services/imports/wakatime_utils.go

@@ -0,0 +1,140 @@
+package imports
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"github.com/muety/wakapi/config"
+	"github.com/muety/wakapi/models"
+	wakatime "github.com/muety/wakapi/models/compat/wakatime/v1"
+	"github.com/muety/wakapi/utils"
+	"net/http"
+	"time"
+)
+
+// https://wakatime.com/api/v1/users/current/machine_names
+// https://pastr.de/p/v58cv0xrupp3zvyyv8o6973j
+func fetchMachineNames(baseUrl, apiKey string) (map[string]*wakatime.MachineEntry, error) {
+	httpClient := &http.Client{Timeout: 10 * time.Second}
+
+	machines := make(map[string]*wakatime.MachineEntry)
+
+	for page := 1; ; page++ {
+		url := fmt.Sprintf("%s%s?page=%d", baseUrl, config.WakatimeApiMachineNamesUrl, page)
+		req, err := http.NewRequest(http.MethodGet, url, nil)
+		req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(apiKey))))
+		if err != nil {
+			return nil, err
+		}
+
+		res, err := httpClient.Do(req)
+		if err != nil {
+			return nil, err
+		}
+		defer res.Body.Close()
+
+		var machineData wakatime.MachineViewModel
+		if err := json.NewDecoder(res.Body).Decode(&machineData); err != nil {
+			return nil, err
+		}
+
+		for _, ma := range machineData.Data {
+			machines[ma.Id] = ma
+		}
+
+		if page == machineData.TotalPages {
+			break
+		}
+	}
+
+	return machines, nil
+}
+
+// https://wakatime.com/api/v1/users/current/user_agents
+// https://pastr.de/p/05k5do8q108k94lic4lfl3pc
+func fetchUserAgents(baseUrl, apiKey string) (map[string]*wakatime.UserAgentEntry, error) {
+	httpClient := &http.Client{Timeout: 10 * time.Second}
+
+	userAgents := make(map[string]*wakatime.UserAgentEntry)
+
+	for page := 1; ; page++ {
+		url := fmt.Sprintf("%s%s?page=%d", baseUrl, config.WakatimeApiUserAgentsUrl, page)
+		req, err := http.NewRequest(http.MethodGet, url, nil)
+		req.Header.Set("Authorization", fmt.Sprintf("Basic %s", base64.StdEncoding.EncodeToString([]byte(apiKey))))
+		if err != nil {
+			return nil, err
+		}
+
+		res, err := httpClient.Do(req)
+		if err != nil {
+			return nil, err
+		}
+		defer res.Body.Close()
+
+		var userAgentsData wakatime.UserAgentsViewModel
+		if err := json.NewDecoder(res.Body).Decode(&userAgentsData); err != nil {
+			return nil, err
+		}
+
+		for _, ua := range userAgentsData.Data {
+			userAgents[ua.Id] = ua
+		}
+
+		if page == userAgentsData.TotalPages {
+			break
+		}
+	}
+
+	return userAgents, nil
+}
+
+func mapHeartbeat(
+	entry *wakatime.HeartbeatEntry,
+	userAgents map[string]*wakatime.UserAgentEntry,
+	machineNames map[string]*wakatime.MachineEntry,
+	user *models.User,
+) *models.Heartbeat {
+	ua := userAgents[entry.UserAgentId]
+	if ua == nil {
+		// try to parse id as an actual user agent string (as returned by wakapi)
+		if opSys, editor, err := utils.ParseUserAgent(entry.UserAgentId); err == nil {
+			ua = &wakatime.UserAgentEntry{
+				Editor: editor,
+				Os:     opSys,
+			}
+		} else {
+			ua = &wakatime.UserAgentEntry{
+				Editor: "unknown",
+				Os:     "unknown",
+			}
+		}
+	}
+
+	ma := machineNames[entry.MachineNameId]
+	if ma == nil {
+		ma = &wakatime.MachineEntry{
+			Id:    entry.MachineNameId,
+			Value: entry.MachineNameId,
+		}
+	}
+
+	return (&models.Heartbeat{
+		User:            user,
+		UserID:          user.ID,
+		Entity:          entry.Entity,
+		Type:            entry.Type,
+		Category:        entry.Category,
+		Project:         entry.Project,
+		Branch:          entry.Branch,
+		Language:        entry.Language,
+		IsWrite:         entry.IsWrite,
+		Editor:          ua.Editor,
+		OperatingSystem: ua.Os,
+		Machine:         ma.Value,
+		UserAgent:       ua.Value,
+		Time:            models.CustomTime(time.Unix(0, int64(entry.Time*1e9))),
+		Origin:          OriginWakatime,
+		OriginId:        entry.Id,
+		CreatedAt:       models.CustomTime(entry.CreatedAt),
+	}).Hashed()
+}

services/leaderboard.go

@@ -223,11 +223,13 @@ func (srv *LeaderboardService) GenerateByUser(user *models.User, interval *model
 		return nil, err
 	}
 
+	// exclude unknown language (will also exclude browsing time by chrome-wakatime plugin)
+	total := summary.TotalTime() - summary.TotalTimeByKey(models.SummaryLanguage, models.UnknownSummaryKey)
 	return &models.LeaderboardItem{
 		User:     user,
 		UserID:   user.ID,
 		Interval: (*interval)[0],
-		Total:    summary.TotalTime(),
+		Total:    total,
 	}, nil
 }