Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor event API endpoint and update client fetch logic

Bill Yangecd8e4ceadd1
diff --git a/client/src/api/analytics/events/useGetEvents.ts b/client/src/api/analytics/events/useGetEvents.ts
index e224ca8dc..157aa87f7 100644
--- a/client/src/api/analytics/events/useGetEvents.ts
+++ b/client/src/api/analytics/events/useGetEvents.ts
@@ -45,7 +45,7 @@ export function useGetEvents(count = 10) {
queryKey: ["events", site, count],
refetchInterval: 5000,
queryFn: () =>
- authedFetch<{ data: Event[] }>(`/recent-events/${site}`, {
+ authedFetch<{ data: Event[] }>(`/events/${site}`, {
count,
}).then((res) => res.data),
});
diff --git a/server/src/index.ts b/server/src/index.ts
index 7869e6e75..9556700c3 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -149,7 +149,6 @@ const ANALYTICS_ROUTES = [
"/api/site-is-public/",
"/api/sessions/",
"/api/session/",
- "/api/recent-events/",
"/api/users/",
"/api/user/info/",
"/api/user/session-count/",
@@ -234,8 +233,7 @@ server.get("/api/site-has-data/:site", getSiteHasData);
server.get("/api/site-is-public/:site", getSiteIsPublic);
server.get("/api/sessions/:site", getSessions);
server.get("/api/session/:sessionId/:site", getSession);
-server.get("/api/recent-events/:site", getEvents); // Legacy endpoint for backward compatibility
-server.get("/api/events/:site", getEvents); // New endpoint with filtering and pagination
+server.get("/api/events/:site", getEvents);
server.get("/api/users/:site", getUsers);
server.get("/api/user/:userId/sessions/:site", getUserSessions);
server.get("/api/user/session-count/:site", getUserSessionCount);