Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

Fix an issue with live visitors and hb endpoint returning different results; rename liveVisitors to live-visitors

Blue Mousea18d1c483632
diff --git a/backend/apps/cloud/src/analytics/analytics.controller.ts b/backend/apps/cloud/src/analytics/analytics.controller.ts
index a3e04af71..9b229f4be 100644
--- a/backend/apps/cloud/src/analytics/analytics.controller.ts
+++ b/backend/apps/cloud/src/analytics/analytics.controller.ts
@@ -987,7 +987,7 @@ export class AnalyticsController {
return result
}
- @Get('liveVisitors')
+ @Get('live-visitors')
@Auth([], true, true)
async getLiveVisitors(
@Query() queryParams: LiveVisitorsDto,
@@ -1024,12 +1024,10 @@ export class AnalyticsController {
dv,
br,
os,
- cc,
- created
+ cc
FROM analytics
WHERE
psid IN ({ psids: Array(String) })
- AND created > ({ createdAfter: String })
AND pid = ({ pid: FixedString(12) })
UNION ALL
SELECT
@@ -1037,12 +1035,10 @@ export class AnalyticsController {
dv,
br,
os,
- cc,
- created
+ cc
FROM customEV
WHERE
psid IN ({ psids: Array(String) })
- AND created > ({ createdAfter: String })
AND pid = ({ pid: FixedString(12) })
)
GROUP BY psid
@@ -1053,10 +1049,6 @@ export class AnalyticsController {
query,
query_params: {
psids,
- createdAfter: dayjs
- .utc()
- .subtract(3, 'hours')
- .format('YYYY-MM-DDTHH:mm:ss'),
pid,
},
})
diff --git a/backend/apps/community/src/analytics/analytics.controller.ts b/backend/apps/community/src/analytics/analytics.controller.ts
index 5e06fb618..088bc5508 100644
--- a/backend/apps/community/src/analytics/analytics.controller.ts
+++ b/backend/apps/community/src/analytics/analytics.controller.ts
@@ -786,7 +786,7 @@ export class AnalyticsController {
return result
}
- @Get('liveVisitors')
+ @Get('live-visitors')
@Auth([], true, true)
async getLiveVisitors(
@Query() queryParams: LiveVisitorsDto,
@@ -822,12 +822,10 @@ export class AnalyticsController {
dv,
br,
os,
- cc,
- created
+ cc
FROM analytics
WHERE
psid IN ({ psids: Array(String) })
- AND created > ({ createdAfter: String })
AND pid = ({ pid: FixedString(12) })
UNION ALL
SELECT
@@ -835,12 +833,10 @@ export class AnalyticsController {
dv,
br,
os,
- cc,
- created
+ cc
FROM customEV
WHERE
psid IN ({ psids: Array(String) })
- AND created > ({ createdAfter: String })
AND pid = ({ pid: FixedString(12) })
)
GROUP BY psid
@@ -851,10 +847,6 @@ export class AnalyticsController {
query,
query_params: {
psids,
- createdAfter: dayjs
- .utc()
- .subtract(3, 'hours')
- .format('YYYY-MM-DDTHH:mm:ss'),
pid,
},
})
diff --git a/web/app/api/index.ts b/web/app/api/index.ts
index e8813d39f..56906ee71 100644
--- a/web/app/api/index.ts
+++ b/web/app/api/index.ts
@@ -1014,7 +1014,7 @@ export interface GetLiveVisitorsInfo {
export const getLiveVisitorsInfo = (pid: string, password?: string) =>
api
- .get(`log/liveVisitors?pid=${pid}`, {
+ .get(`log/live-visitors?pid=${pid}`, {
headers: {
'x-password': password,
},