PostgreSQL backup tool with Point-In-Time-Recovery and restore verification
TypeScript backupbackupsdatabasedatabase-backupdevopsdockergolangkubernetesmariadbmongodbmysqlpgpostgrespostgresqls3self-hostedsystem-administrationtoolsweb-ui
FEATURE (notifiers): Add thread to Telegram notifications
Rostislav Dugin6a71dd4c3fe7
diff --git a/backend/internal/features/backups/backups/usecases/postgresql/create_backup_uc.go b/backend/internal/features/backups/backups/usecases/postgresql/create_backup_uc.goindex a46c0366..174a4dc3 100644--- a/backend/internal/features/backups/backups/usecases/postgresql/create_backup_uc.go+++ b/backend/internal/features/backups/backups/usecases/postgresql/create_backup_uc.go@@ -71,7 +71,8 @@ func (uc *CreatePostgresqlBackupUsecase) Execute(// Use zstd compression level 5 for PostgreSQL 15+ (better compression and speed)// Fall back to gzip compression level 5 for older versions- if pg.Version == tools.PostgresqlVersion13 || pg.Version == tools.PostgresqlVersion14 || pg.Version == tools.PostgresqlVersion15 {+ if pg.Version == tools.PostgresqlVersion13 || pg.Version == tools.PostgresqlVersion14 ||+ pg.Version == tools.PostgresqlVersion15 {args = append(args, "-Z", "5")uc.logger.Info("Using gzip compression level 5 (zstd not available)", "version", pg.Version)} else {diff --git a/backend/internal/features/notifiers/models/telegram/model.go b/backend/internal/features/notifiers/models/telegram/model.goindex be8a4d8d..56114078 100644--- a/backend/internal/features/notifiers/models/telegram/model.go+++ b/backend/internal/features/notifiers/models/telegram/model.go@@ -7,6 +7,7 @@ import ("log/slog""net/http""net/url"+ "strconv""strings""github.com/google/uuid"@@ -16,6 +17,7 @@ type TelegramNotifier struct {NotifierID uuid.UUID `json:"notifierId" gorm:"primaryKey;column:notifier_id"`BotToken string `json:"botToken" gorm:"not null;column:bot_token"`TargetChatID string `json:"targetChatId" gorm:"not null;column:target_chat_id"`+ ThreadID *int64 `json:"threadId" gorm:"column:thread_id"`}func (t *TelegramNotifier) TableName() string {@@ -47,6 +49,10 @@ func (t *TelegramNotifier) Send(logger *slog.Logger, heading string, message strdata.Set("text", fullMessage)data.Set("parse_mode", "HTML")+ if t.ThreadID != nil && *t.ThreadID != 0 {+ data.Set("message_thread_id", strconv.FormatInt(*t.ThreadID, 10))+ }+req, err := http.NewRequest("POST", apiURL, strings.NewReader(data.Encode()))if err != nil {return fmt.Errorf("failed to create request: %w", err)diff --git a/backend/migrations/20250809062256_add_telegram_thread_id.sql b/backend/migrations/20250809062256_add_telegram_thread_id.sqlnew file mode 100644index 00000000..1085d533--- /dev/null+++ b/backend/migrations/20250809062256_add_telegram_thread_id.sql@@ -0,0 +1,15 @@+-- +goose Up+-- +goose StatementBegin++ALTER TABLE telegram_notifiers+ ADD COLUMN thread_id BIGINT;++-- +goose StatementEnd++-- +goose Down+-- +goose StatementBegin++ALTER TABLE telegram_notifiers+ DROP COLUMN IF EXISTS thread_id;++-- +goose StatementEnddiff --git a/frontend/src/entity/notifiers/models/telegram/TelegramNotifier.ts b/frontend/src/entity/notifiers/models/telegram/TelegramNotifier.tsindex 0647bb8b..b2a58f00 100644--- a/frontend/src/entity/notifiers/models/telegram/TelegramNotifier.ts+++ b/frontend/src/entity/notifiers/models/telegram/TelegramNotifier.ts@@ -1,4 +1,8 @@export interface TelegramNotifier {botToken: string;targetChatId: string;+ threadId?: number;++ // temp field+ isSendToThreadEnabled?: boolean;}diff --git a/frontend/src/entity/notifiers/models/telegram/validateTelegramNotifier.ts b/frontend/src/entity/notifiers/models/telegram/validateTelegramNotifier.tsindex 36fe2eb6..f827bd83 100644--- a/frontend/src/entity/notifiers/models/telegram/validateTelegramNotifier.ts+++ b/frontend/src/entity/notifiers/models/telegram/validateTelegramNotifier.ts@@ -9,5 +9,10 @@ export const validateTelegramNotifier = (notifier: TelegramNotifier): boolean =>return false;}+ // If thread is enabled, thread ID must be present and valid+ if (notifier.isSendToThreadEnabled && (!notifier.threadId || notifier.threadId <= 0)) {+ return false;+ }+return true;};diff --git a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsxindex 3244f8b6..e36da975 100644--- a/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/edit/EditNotifierComponent.tsx@@ -208,7 +208,7 @@ export function EditNotifierComponent({)}<div className="mb-1 flex items-center">- <div className="min-w-[110px]">Type</div>+ <div className="w-[130px] min-w-[130px]">Type</div><Selectvalue={notifier?.notifierType}diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsxindex 3ce434e8..afde3552 100644--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditDiscordNotifierComponent.tsx@@ -12,7 +12,7 @@ export function EditDiscordNotifierComponent({ notifier, setNotifier, setIsUnsavreturn (<><div className="flex">- <div className="max-w-[110px] min-w-[110px] pr-3">Channel webhook URL</div>+ <div className="w-[130px] max-w-[130px] min-w-[130px] pr-3">Channel webhook URL</div><div className="w-[250px]"><Input@@ -35,7 +35,7 @@ export function EditDiscordNotifierComponent({ notifier, setNotifier, setIsUnsav</div></div>- <div className="ml-[110px] max-w-[250px]">+ <div className="ml-[130px] max-w-[250px]"><div className="mt-1 text-xs text-gray-500"><strong>How to get Discord webhook URL:</strong><br />diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsxindex a4685308..f2f33871 100644--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditEmailNotifierComponent.tsx@@ -13,7 +13,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsavedreturn (<><div className="mb-1 flex items-center">- <div className="min-w-[110px]">Target email</div>+ <div className="w-[130px] min-w-[130px]">Target email</div><Inputvalue={notifier?.emailNotifier?.targetEmail || ''}onChange={(e) => {@@ -39,7 +39,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved</div><div className="mb-1 flex items-center">- <div className="min-w-[110px]">SMTP host</div>+ <div className="w-[130px] min-w-[130px]">SMTP host</div><Inputvalue={notifier?.emailNotifier?.smtpHost || ''}onChange={(e) => {@@ -61,7 +61,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved</div><div className="mb-1 flex items-center">- <div className="min-w-[110px]">SMTP port</div>+ <div className="w-[130px] min-w-[130px]">SMTP port</div><Inputtype="number"value={notifier?.emailNotifier?.smtpPort || ''}@@ -84,7 +84,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved</div><div className="mb-1 flex items-center">- <div className="min-w-[110px]">SMTP user</div>+ <div className="w-[130px] min-w-[130px]">SMTP user</div><Inputvalue={notifier?.emailNotifier?.smtpUser || ''}onChange={(e) => {@@ -106,7 +106,7 @@ export function EditEmailNotifierComponent({ notifier, setNotifier, setIsUnsaved</div><div className="mb-1 flex items-center">- <div className="min-w-[110px]">SMTP password</div>+ <div className="w-[130px] min-w-[130px]">SMTP password</div><Inputvalue={notifier?.emailNotifier?.smtpPassword || ''}onChange={(e) => {diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsxindex 7ed26080..308a0b00 100644--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditSlackNotifierComponent.tsx@@ -11,7 +11,7 @@ interface Props {export function EditSlackNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {return (<>- <div className="mb-1 ml-[110px] max-w-[200px]" style={{ lineHeight: 1 }}>+ <div className="mb-1 ml-[130px] max-w-[200px]" style={{ lineHeight: 1 }}><aclassName="text-xs !text-blue-600"href="https://postgresus.com/notifier-slack"@@ -23,7 +23,7 @@ export function EditSlackNotifierComponent({ notifier, setNotifier, setIsUnsaved</div><div className="mb-1 flex items-center">- <div className="min-w-[110px]">Bot token</div>+ <div className="w-[130px] min-w-[130px]">Bot token</div><div className="w-[250px]"><Input@@ -48,7 +48,7 @@ export function EditSlackNotifierComponent({ notifier, setNotifier, setIsUnsaved</div><div className="mb-1 flex items-center">- <div className="min-w-[110px]">Target chat ID</div>+ <div className="w-[130px] min-w-[130px]">Target chat ID</div><div className="w-[250px]"><Inputdiff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsxindex c105423f..ede4d2d7 100644--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditTelegramNotifierComponent.tsx@@ -1,6 +1,6 @@import { InfoCircleOutlined } from '@ant-design/icons';-import { Input, Tooltip } from 'antd';-import { useState } from 'react';+import { Input, Switch, Tooltip } from 'antd';+import { useEffect, useState } from 'react';import type { Notifier } from '../../../../../entity/notifiers';@@ -13,10 +13,22 @@ interface Props {export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsaved }: Props) {const [isShowHowToGetChatId, setIsShowHowToGetChatId] = useState(false);+ useEffect(() => {+ if (notifier.telegramNotifier?.threadId && !notifier.telegramNotifier.isSendToThreadEnabled) {+ setNotifier({+ ...notifier,+ telegramNotifier: {+ ...notifier.telegramNotifier,+ isSendToThreadEnabled: true,+ },+ });+ }+ }, [notifier]);+return (<><div className="flex items-center">- <div className="min-w-[110px]">Bot token</div>+ <div className="w-[130px] min-w-[130px]">Bot token</div><div className="w-[250px]"><Input@@ -39,7 +51,7 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa</div></div>- <div className="mb-1 ml-[110px]">+ <div className="mb-1 ml-[130px]"><aclassName="text-xs !text-blue-600"href="https://www.siteguarding.com/en/how-to-get-telegram-bot-api-token"@@ -51,7 +63,7 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa</div><div className="mb-1 flex items-center">- <div className="min-w-[110px]">Target chat ID</div>+ <div className="w-[130px] min-w-[130px]">Target chat ID</div><div className="w-[250px]"><Input@@ -82,7 +94,7 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa</Tooltip></div>- <div className="ml-[110px] max-w-[250px]">+ <div className="ml-[130px] max-w-[250px]">{!isShowHowToGetChatId ? (<divclassName="mt-1 cursor-pointer text-xs text-blue-600"@@ -107,6 +119,94 @@ export function EditTelegramNotifierComponent({ notifier, setNotifier, setIsUnsa</div>)}</div>++ <div className="mt-4 mb-1 flex items-center">+ <div className="w-[130px] min-w-[130px] break-all">Send to group topic</div>++ <Switch+ checked={notifier?.telegramNotifier?.isSendToThreadEnabled || false}+ onChange={(checked) => {+ if (!notifier?.telegramNotifier) return;++ setNotifier({+ ...notifier,+ telegramNotifier: {+ ...notifier.telegramNotifier,+ isSendToThreadEnabled: checked,+ // Clear thread ID if disabling+ threadId: checked ? notifier.telegramNotifier.threadId : undefined,+ },+ });+ setIsUnsaved(true);+ }}+ size="small"+ />++ <Tooltip+ className="cursor-pointer"+ title="Enable this to send messages to a specific thread in a group chat"+ >+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />+ </Tooltip>+ </div>++ {notifier?.telegramNotifier?.isSendToThreadEnabled && (+ <>+ <div className="mb-1 flex items-center">+ <div className="w-[130px] min-w-[130px]">Thread ID</div>++ <div className="w-[250px]">+ <Input+ value={notifier?.telegramNotifier?.threadId?.toString() || ''}+ onChange={(e) => {+ if (!notifier?.telegramNotifier) return;++ const value = e.target.value.trim();+ const threadId = value ? parseInt(value, 10) : undefined;++ setNotifier({+ ...notifier,+ telegramNotifier: {+ ...notifier.telegramNotifier,+ threadId: !isNaN(threadId!) ? threadId : undefined,+ },+ });+ setIsUnsaved(true);+ }}+ size="small"+ className="w-full"+ placeholder="3"+ type="number"+ min="1"+ />+ </div>++ <Tooltip+ className="cursor-pointer"+ title="The ID of the thread where messages should be sent"+ >+ <InfoCircleOutlined className="ml-2" style={{ color: 'gray' }} />+ </Tooltip>+ </div>++ <div className="ml-[130px] max-w-[250px]">+ <div className="mt-1 text-xs text-gray-500">+ To get the thread ID, go to the thread in your Telegram group, tap on the thread name+ at the top, then tap “Thread Info”. Copy the thread link and take the last+ number from the URL.+ <br />+ <br />+ <strong>Example:</strong> If the thread link is{' '}+ <code className="rounded bg-gray-100 px-1">https://t.me/c/2831948048/3</code>, the+ thread ID is <code className="rounded bg-gray-100 px-1">3</code>+ <br />+ <br />+ <strong>Note:</strong> Thread functionality only works in group chats, not in private+ chats.+ </div>+ </div>+ </>+ )}</>);}diff --git a/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx b/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsxindex 246dc214..e79aa990 100644--- a/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/edit/notifiers/EditWebhookNotifierComponent.tsx@@ -14,7 +14,7 @@ export function EditWebhookNotifierComponent({ notifier, setNotifier, setIsUnsavreturn (<><div className="flex items-center">- <div className="min-w-[110px]">Webhook URL</div>+ <div className="w-[130px] min-w-[130px]">Webhook URL</div><div className="w-[250px]"><Input@@ -37,7 +37,7 @@ export function EditWebhookNotifierComponent({ notifier, setNotifier, setIsUnsav</div><div className="mt-1 flex items-center">- <div className="min-w-[110px]">Method</div>+ <div className="w-[130px] min-w-[130px]">Method</div><div className="w-[250px]"><Selectdiff --git a/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsx b/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsxindex 748eaa05..c4957bd7 100644--- a/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsx+++ b/frontend/src/features/notifiers/ui/show/notifier/ShowTelegramNotifierComponent.tsx@@ -17,6 +17,13 @@ export function ShowTelegramNotifierComponent({ notifier }: Props) {<div className="min-w-[110px]">Target chat ID</div>{notifier?.telegramNotifier?.targetChatId}</div>++ {notifier?.telegramNotifier?.threadId && (+ <div className="mb-1 flex items-center">+ <div className="min-w-[110px]">Topic ID</div>+ {notifier.telegramNotifier.threadId}+ </div>+ )}</>);}