🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Enhance live user count functionality to support dynamic time intervals
Bill Yang52332296bacc
diff --git a/client/src/api/analytics/useLiveUserCount.ts b/client/src/api/analytics/useLiveUserCount.tsindex bd907231e..c8ce720de 100644--- a/client/src/api/analytics/useLiveUserCount.ts+++ b/client/src/api/analytics/useLiveUserCount.ts@@ -3,14 +3,14 @@ import { useStore } from "../../lib/store";import { BACKEND_URL } from "../../lib/const";import { authedFetch } from "../utils";-export function useGetLiveUsercount() {+export function useGetLiveUsercount(minutes = 5) {const { site } = useStore();return useQuery({- queryKey: ["live-user-count", site],+ queryKey: ["live-user-count", site, minutes],refetchInterval: 5000,queryFn: () =>- authedFetch(`${BACKEND_URL}/live-user-count/${site}`).then((res) =>- res.json()- ),+ authedFetch(+ `${BACKEND_URL}/live-user-count/${site}?minutes=${minutes}`+ ).then((res) => res.json()),});}diff --git a/client/src/app/[site]/Header/LiveUserCount.tsx b/client/src/app/[site]/Header/LiveUserCount.tsxindex 4b89c5088..93e8ed751 100644--- a/client/src/app/[site]/Header/LiveUserCount.tsx+++ b/client/src/app/[site]/Header/LiveUserCount.tsx@@ -7,7 +7,7 @@ import {import NumberFlow from "@number-flow/react";export default function LiveUserCount() {- const { data } = useGetLiveUsercount();+ const { data } = useGetLiveUsercount(5);return (<div className="flex items-center gap-[6px] text-base text-neutral-200 cursor-default">diff --git a/server/src/api/getLiveUsercount.ts b/server/src/api/getLiveUsercount.tsindex 5a6c79bd2..e7940388a 100644--- a/server/src/api/getLiveUsercount.ts+++ b/server/src/api/getLiveUsercount.ts@@ -4,20 +4,25 @@ import { getUserHasAccessToSite } from "../lib/auth-utils.js";import { processResults } from "./utils.js";export const getLiveUsercount = async (- req: FastifyRequest<{ Params: { site: string } }>,+ req: FastifyRequest<{+ Params: { site: string };+ Querystring: { minutes: number };+ }>,res: FastifyReply) => {const { site } = req.params;+ const { minutes } = req.query;const userHasAccessToSite = await getUserHasAccessToSite(req, site);if (!userHasAccessToSite) {return res.status(403).send({ error: "Forbidden" });}const query = await clickhouse.query({- query: `SELECT COUNT(DISTINCT(session_id)) AS count FROM pageviews WHERE timestamp > now() - interval '5 minute' AND site_id = {siteId:Int32}`,+ query: `SELECT COUNT(DISTINCT(session_id)) AS count FROM pageviews WHERE timestamp > now() - interval '${minutes} minute' AND site_id = {siteId:Int32}`,format: "JSONEachRow",query_params: {siteId: Number(site),+ minutes: Number(minutes || 5),},});