Merge pull request #1314 from vicke4/canary

feat: notifications to specific Telegram topics

apps/dokploy/components/dashboard/settings/notifications/handle-notifications.tsx

@@ -65,6 +65,7 @@ export const notificationSchema = z.discriminatedUnion("type", [
 			type: z.literal("telegram"),
 			botToken: z.string().min(1, { message: "Bot Token is required" }),
 			chatId: z.string().min(1, { message: "Chat ID is required" }),
+			messageThreadId: z.string().optional(),
 		})
 		.merge(notificationBaseSchema),
 	z
@@ -214,6 +215,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 					dokployRestart: notification.dokployRestart,
 					databaseBackup: notification.databaseBackup,
 					botToken: notification.telegram?.botToken,
+					messageThreadId: notification.telegram?.messageThreadId || "",
 					chatId: notification.telegram?.chatId,
 					type: notification.notificationType,
 					name: notification.name,
@@ -309,6 +311,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 				dokployRestart: dokployRestart,
 				databaseBackup: databaseBackup,
 				botToken: data.botToken,
+				messageThreadId: data.messageThreadId || "",
 				chatId: data.chatId,
 				name: data.name,
 				dockerCleanup: dockerCleanup,
@@ -561,8 +564,26 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 													<FormControl>
 														<Input placeholder="431231869" {...field} />
 													</FormControl>
+													<FormMessage />
+												</FormItem>
+											)}
+										/>
+
+										<FormField
+											control={form.control}
+											name="messageThreadId"
+											render={({ field }) => (
+												<FormItem>
+													<FormLabel>Message Thread ID</FormLabel>
+													<FormControl>
+														<Input placeholder="11" {...field} />
+													</FormControl>
 
 													<FormMessage />
+													<FormDescription>
+														Optional. Use it when you want to send notifications
+														to a specific topic in a group.
+													</FormDescription>
 												</FormItem>
 											)}
 										/>
@@ -1014,6 +1035,7 @@ export const HandleNotifications = ({ notificationId }: Props) => {
 										await testTelegramConnection({
 											botToken: form.getValues("botToken"),
 											chatId: form.getValues("chatId"),
+											messageThreadId: form.getValues("messageThreadId") || "",
 										});
 									} else if (type === "discord") {
 										await testDiscordConnection({

apps/dokploy/drizzle/0067_condemned_sugar_man.sql

@@ -0,0 +1 @@
+ALTER TABLE "telegram" ADD COLUMN "messageThreadId" text;

apps/dokploy/drizzle/meta/_journal.json

@@ -470,6 +470,13 @@
       "when": 1739426913392,
       "tag": "0066_yielding_echo",
       "breakpoints": true
+    },
+    {
+      "idx": 67,
+      "version": "7",
+      "when": 1740892043121,
+      "tag": "0067_condemned_sugar_man",
+      "breakpoints": true
     }
   ]
 }

apps/dokploy/pages/index.tsx

@@ -67,8 +67,8 @@ export default function Home({ IS_CLOUD }: Props) {
 	const loginForm = useForm<LoginForm>({
 		resolver: zodResolver(LoginSchema),
 		defaultValues: {
-			email: "siumauricio@hotmail.com",
+			email: "",
-			password: "Password123",
+			password: "",
 		},
 	});
 

apps/dokploy/pages/register.tsx

@@ -78,10 +78,10 @@ const Register = ({ isCloud }: Props) => {
 
 	const form = useForm<Register>({
 		defaultValues: {
-			name: "Mauricio Siu",
+			name: "",
-			email: "user5@yopmail.com",
+			email: "",
-			password: "Password123",
+			password: "",
-			confirmPassword: "Password123",
+			confirmPassword: "",
 		},
 		resolver: zodResolver(registerSchema),
 	});

packages/server/src/db/schema/notification.ts

@@ -65,6 +65,7 @@ export const telegram = pgTable("telegram", {
 		.$defaultFn(() => nanoid()),
 	botToken: text("botToken").notNull(),
 	chatId: text("chatId").notNull(),
+	messageThreadId: text("messageThreadId"),
 });
 
 export const discord = pgTable("discord", {
@@ -169,6 +170,7 @@ export const apiCreateTelegram = notificationsSchema
 	.extend({
 		botToken: z.string().min(1),
 		chatId: z.string().min(1),
+		messageThreadId: z.string(),
 	})
 	.required();
 
@@ -181,6 +183,7 @@ export const apiUpdateTelegram = apiCreateTelegram.partial().extend({
 export const apiTestTelegramConnection = apiCreateTelegram.pick({
 	botToken: true,
 	chatId: true,
+	messageThreadId: true,
 });
 
 export const apiCreateDiscord = notificationsSchema

packages/server/src/services/notification.ts

@@ -122,6 +122,7 @@ export const createTelegramNotification = async (
 			.values({
 				botToken: input.botToken,
 				chatId: input.chatId,
+				messageThreadId: input.messageThreadId,
 			})
 			.returning()
 			.then((value) => value[0]);
@@ -193,6 +194,7 @@ export const updateTelegramNotification = async (
 			.set({
 				botToken: input.botToken,
 				chatId: input.chatId,
+				messageThreadId: input.messageThreadId,
 			})
 			.where(eq(telegram.telegramId, input.telegramId))
 			.returning()

packages/server/src/utils/notifications/utils.ts

@@ -68,6 +68,7 @@ export const sendTelegramNotification = async (
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify({
 				chat_id: connection.chatId,
+				message_thread_id: connection.messageThreadId,
 				text: messageText,
 				parse_mode: "HTML",
 				disable_web_page_preview: true,