Skip to content

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

update event type

Bill Yang545c3bc1747b
diff --git a/server/public/script.js b/server/public/script.js
index 4b60bee31..f805783ca 100644
--- a/server/public/script.js
+++ b/server/public/script.js
@@ -60,7 +60,7 @@
language: navigator.language,
page_title: document.title,
referrer: document.referrer,
- event_type: eventType,
+ type: eventType,
event_name: eventName,
properties:
eventType === "custom_event" ? JSON.stringify(properties) : undefined,
diff --git a/server/src/api/getSessions.ts b/server/src/api/getSessions.ts
index 632fdfa3d..16ea6bdc5 100644
--- a/server/src/api/getSessions.ts
+++ b/server/src/api/getSessions.ts
@@ -62,6 +62,7 @@ WHERE
site_id = ${site}
${filterStatement}
${getTimeStatement(startDate, endDate, timezone)}
+ AND type = 'pageview'
GROUP BY
session_id,
user_id,
diff --git a/server/src/api/getSingleCol.ts b/server/src/api/getSingleCol.ts
index 1fa654eb7..54accab4f 100644
--- a/server/src/api/getSingleCol.ts
+++ b/server/src/api/getSingleCol.ts
@@ -39,6 +39,7 @@ export async function getSingleCol(
site_id = ${site}
${filterStatement}
${getTimeStatement(startDate, endDate, timezone)}
+ AND type = 'pageview'
GROUP BY value ORDER BY count desc
${limit ? `LIMIT ${limit}` : ""};
`;
diff --git a/server/src/db/clickhouse/clickhouse.ts b/server/src/db/clickhouse/clickhouse.ts
index 29644d9a6..3051387d7 100644
--- a/server/src/db/clickhouse/clickhouse.ts
+++ b/server/src/db/clickhouse/clickhouse.ts
@@ -31,7 +31,7 @@ export const initializeClickhouse = async () => {
screen_width UInt16,
screen_height UInt16,
device_type LowCardinality(String),
- event_type LowCardinality(String) DEFAULT 'pageview',
+ type LowCardinality(String) DEFAULT 'pageview',
event_name String,
properties String
)
diff --git a/server/src/tracker/pageviewQueue.ts b/server/src/tracker/pageviewQueue.ts
index 3a83e0881..9ad4e7b02 100644
--- a/server/src/tracker/pageviewQueue.ts
+++ b/server/src/tracker/pageviewQueue.ts
@@ -10,7 +10,7 @@ type TotalPayload = TrackingPayload & {
ua: UAParser.IResult;
referrer: string;
ipAddress: string;
- event_type?: string;
+ type?: string;
event_name?: string;
properties?: string;
};
@@ -85,7 +85,7 @@ class PageviewQueue {
country: countryCode,
iso_3166_2:
countryCode && regionCode ? countryCode + "-" + regionCode : "",
- event_type: pv.event_type || "pageview",
+ type: pv.type || "pageview",
event_name: pv.event_name || "",
properties: pv.properties,
};
diff --git a/server/src/tracker/trackEvent.ts b/server/src/tracker/trackEvent.ts
index ffc2cecfc..3196fce84 100644
--- a/server/src/tracker/trackEvent.ts
+++ b/server/src/tracker/trackEvent.ts
@@ -10,7 +10,7 @@ import {
// Extended type for tracking payloads with event data
export interface EventTrackingPayload extends BaseTrackingPayload {
- event_type: "pageview" | "custom_event";
+ type: "pageview" | "custom_event";
event_name?: string; // Required for custom_event, optional for pageview
properties?: string;
}
@@ -32,7 +32,7 @@ export async function trackEvent(
}
// Validate event data based on type
- const eventType = request.body.event_type || "pageview";
+ const eventType = request.body.type || "pageview";
// Ensure custom events have an event name
if (eventType === "custom_event" && !request.body.event_name) {
diff --git a/server/src/tracker/trackingUtils.ts b/server/src/tracker/trackingUtils.ts
index 4f22434ed..ba4317b64 100644
--- a/server/src/tracker/trackingUtils.ts
+++ b/server/src/tracker/trackingUtils.ts
@@ -11,7 +11,7 @@ import { sitesOverLimit } from "../cron/monthly-usage-checker.js";
// Define extended payload types
export type BaseTrackingPayload = TrackingPayload & {
- event_type?: string;
+ type?: string;
event_name?: string;
properties?: string;
};
@@ -71,7 +71,7 @@ export function createBasePayload(
return {
...(request.body as BaseTrackingPayload),
- event_type: eventType,
+ type: eventType,
ipAddress: ipAddress,
timestamp: new Date().toISOString(),
ua: userAgentParser(userAgent),