📈 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 the ability to get projects and information to them
Yevhenii Kulisidibd13eea17b42
diff --git a/src/tg-integration/tg.module.ts b/src/tg-integration/tg.module.tsindex 4f9d43ab6..929d25480 100644--- a/src/tg-integration/tg.module.ts+++ b/src/tg-integration/tg.module.ts@@ -1,9 +1,10 @@import { Module } from '@nestjs/common'+import { ProjectModule } from 'src/project/project.module'import { UserModule } from 'src/user/user.module'import { SwetrixUpdate } from './tg.update'@Module({- imports: [UserModule],+ imports: [UserModule, ProjectModule],providers: [SwetrixUpdate],})export class TGModule {}diff --git a/src/tg-integration/tg.update.ts b/src/tg-integration/tg.update.tsindex 08469695d..9184e6429 100644--- a/src/tg-integration/tg.update.ts+++ b/src/tg-integration/tg.update.ts@@ -1,11 +1,21 @@-import { Ctx, On, Sender, Start, Update } from 'nestjs-telegraf'+import { Ctx, Hears, On, Sender, Start, Update } from 'nestjs-telegraf'+import { ProjectService } from 'src/project/project.service'import { SWETRIX_SETTINGS_URL } from 'src/tg-integration/constants'import { UserService } from 'src/user/user.service'import { Context } from 'telegraf'+import * as dayjs from 'dayjs'+import * as utc from 'dayjs/plugin/utc'+import * as timezone from 'dayjs/plugin/timezone'++dayjs.extend(utc)+dayjs.extend(timezone)@Update()export class SwetrixUpdate {- constructor(private readonly userService: UserService) {}+ constructor(+ private readonly userService: UserService,+ private readonly projectService: ProjectService,+ ) {}@Start()async start(@@ -13,6 +23,7 @@ export class SwetrixUpdate {@Sender('first_name') firstName: string,@Sender('id') chatId: string,): Promise<void> {+ const user = await this.userService.findOneWhere({ telegramChatId: chatId })const text =`Hello, *${firstName}*!` +'\n' +@@ -22,22 +33,40 @@ export class SwetrixUpdate {await ctx.reply(text, {parse_mode: 'Markdown',disable_web_page_preview: true,+ ...(user.telegramChatId && {+ reply_markup: {+ keyboard: [[{ text: 'Projects' }]],+ resize_keyboard: true,+ },+ }),})}@On('callback_query')- async callbackQuery(@Ctx() ctx: Context): Promise<void> {- const [action, userId] = ctx.callbackQuery?.['data'].split(':')+ async callbackQuery(+ @Ctx() ctx: Context,+ @Sender('id') chatId: string,+ ): Promise<void> {+ const [action, entityId] = ctx.callbackQuery?.['data'].split(':')if (action === 'confirmTelegramChatId') {- await ctx.telegram.editMessageText(+ // delete the message with the button+ await ctx.telegram.deleteMessage(ctx.chat.id,ctx.callbackQuery?.['message'].message_id,- undefined,+ )+ await ctx.telegram.sendMessage(+ ctx.chat.id,'✅ Your Telegram account is connected to your Swetrix account.',+ {+ reply_markup: {+ keyboard: [[{ text: 'Projects' }]],+ resize_keyboard: true,+ },+ },)- await this.userService.update(userId, {+ await this.userService.update(entityId, {telegramChatId: ctx.chat.id,isTelegramChatIdConfirmed: true,})@@ -51,9 +80,108 @@ export class SwetrixUpdate {'❌ Your Telegram account is not connected to your Swetrix account.',)- await this.userService.update(userId, {+ await this.userService.update(entityId, {telegramChatId: null,})}++ if (action === 'project') {+ const project = await this.projectService.findOne(entityId)++ if (!project) {+ return+ }++ const user = await this.userService.findOneWhere({+ telegramChatId: chatId,+ })++ if (!user) {+ return+ }++ const text = `*${project.name}*\nID: \`${project.id}\`\nActive: \`${+ project.active ? 'yes' : 'no'+ }\`\nPublic: \`${project.public ? 'yes' : 'no'}\n\`Created: \`${dayjs+ .utc(project.created)+ .tz(user.timezone)+ .format('YYYY-MM-DD HH:mm:ss')}\``+ await ctx.editMessageText(text, {+ parse_mode: 'Markdown',+ reply_markup: {+ inline_keyboard: [+ [+ {+ text: '⬅️ Back',+ callback_data: 'projects',+ },+ ],+ ],+ },+ })+ }++ if (action === 'projects') {+ const user = await this.userService.findOneWhere({+ telegramChatId: chatId,+ })++ if (!user) {+ return+ }++ const projects = await this.projectService.findWhere({ admin: user.id })++ if (projects.length === 0) {+ await ctx.reply('You have no projects yet.')+ return+ }++ const keyboard = projects.map(project => [+ {+ text: project.name,+ callback_data: `project:${project.id}`,+ },+ ])++ await ctx.editMessageText('Your projects:', {+ reply_markup: {+ inline_keyboard: keyboard,+ },+ })+ }+ }++ @Hears('Projects')+ async projects(+ @Sender('id') chatId: string,+ @Ctx() ctx: Context,+ ): Promise<void> {+ const user = await this.userService.findOneWhere({ telegramChatId: chatId })++ if (!user) {+ return+ }++ const projects = await this.projectService.findWhere({ admin: user.id })++ if (projects.length === 0) {+ await ctx.reply('You have no projects yet.')+ return+ }++ const keyboard = projects.map(project => [+ {+ text: project.name,+ callback_data: `project:${project.id}`,+ },+ ])++ await ctx.reply('Your projects:', {+ reply_markup: {+ inline_keyboard: keyboard,+ resize_keyboard: true,+ },+ })}}