π 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!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
Added some analytical data
Yevhenii Kulisidib21c53075c7c
diff --git a/src/analytics/analytics.controller.ts b/src/analytics/analytics.controller.tsindex 62e9dff7f..0aad35b3e 100644--- a/src/analytics/analytics.controller.ts+++ b/src/analytics/analytics.controller.ts@@ -160,7 +160,7 @@ const getElValue = el => {return `'${el}'`}-const getPIDsArray = (pids, pid) => {+export const getPIDsArray = (pids, pid) => {const pidsEmpty = _isEmpty(pids)const pidEmpty = _isEmpty(pid)if (pidsEmpty && pidEmpty)diff --git a/src/tg-integration/tg.module.ts b/src/tg-integration/tg.module.tsindex 929d25480..83f49b817 100644--- a/src/tg-integration/tg.module.ts+++ b/src/tg-integration/tg.module.ts@@ -1,10 +1,11 @@import { Module } from '@nestjs/common'+import { AnalyticsModule } from 'src/analytics/analytics.module'import { ProjectModule } from 'src/project/project.module'import { UserModule } from 'src/user/user.module'import { SwetrixUpdate } from './tg.update'@Module({- imports: [UserModule, ProjectModule],+ imports: [UserModule, ProjectModule, AnalyticsModule],providers: [SwetrixUpdate],})export class TGModule {}diff --git a/src/tg-integration/tg.update.ts b/src/tg-integration/tg.update.tsindex 16f3cf262..879061ce0 100644--- a/src/tg-integration/tg.update.ts+++ b/src/tg-integration/tg.update.ts@@ -6,6 +6,8 @@ import { Context } from 'telegraf'import * as dayjs from 'dayjs'import * as utc from 'dayjs/plugin/utc'import * as timezone from 'dayjs/plugin/timezone'+import { AnalyticsService } from 'src/analytics/analytics.service'+import { getPIDsArray } from 'src/analytics/analytics.controller'dayjs.extend(utc)dayjs.extend(timezone)@@ -15,6 +17,7 @@ export class SwetrixUpdate {constructor(private readonly userService: UserService,private readonly projectService: ProjectService,+ private readonly analyticsService: AnalyticsService,) {}@Start()@@ -99,6 +102,12 @@ export class SwetrixUpdate {return}+ const onlineUserCount = await this.analyticsService.getOnlineUserCount(+ project.id,+ )++ const stats = await this.analyticsService.getSummary([project.id], 'w')+const text =`π *${project.name}*` +'\n\n' +@@ -115,10 +124,18 @@ export class SwetrixUpdate {.tz(user.timezone).format('YYYY-MM-DD HH:mm:ss')}\`` +'\n\n' ++ '*Analytics (last 7 days)*' ++ '\n' ++ `Online users: \`${onlineUserCount.length}\`` ++ '\n' ++ `Page views: \`${stats[project.id].thisWeek}\`` ++ '\n' ++ `Unique page views: \`${stats[project.id].thisWeekUnique}\`` ++ '\n\n' +'*Alerts*' +'\n' +`Online users: \`${- project.alertIfOnlineUsersExceeds ? 'set' : 'not set'+ project.alertIfOnlineUsersExceeds ? 'seted' : 'not seted'}\``await ctx.editMessageText(text, {parse_mode: 'Markdown',