From dd3618bfd95e5e6eef5c71ec31a24c5b7d0bdcaf Mon Sep 17 00:00:00 2001
From: shiqocred <90097870+shiqocred@users.noreply.github.com>
Date: Sun, 12 Jan 2025 00:55:31 +0700
Subject: [PATCH] Add inline button telegram (#3)
* Update utils.ts
add type inline button
* Update dokploy-restart.ts
fixing format massage and adding [] for inline button type
* Update docker-cleanup.ts
fixing telegram message
* Update database-backup.ts
fixing telegram message
* Update build-error.ts
fixing message and adding button logs view
* Update build-success.ts
fixing message, adding domains props, adding inline button
* Update compose.ts
adding get domains compose and send to notif
* Update application.ts
adding get domains and send it to notif
---
packages/server/src/services/application.ts | 4 +++
packages/server/src/services/compose.ts | 4 +++
.../src/utils/notifications/build-error.ts | 25 +++++++------
.../src/utils/notifications/build-success.ts | 36 +++++++++++++------
.../utils/notifications/database-backup.ts | 21 +++++------
.../src/utils/notifications/docker-cleanup.ts | 8 ++---
.../utils/notifications/dokploy-restart.ts | 7 ++--
.../server/src/utils/notifications/utils.ts | 7 ++++
8 files changed, 68 insertions(+), 44 deletions(-)
diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts
index e2ed407f..fa690952 100644
--- a/packages/server/src/services/application.ts
+++ b/packages/server/src/services/application.ts
@@ -176,6 +176,7 @@ export const deployApplication = async ({
}) => {
const application = await findApplicationById(applicationId);
const buildLink = `${await getDokployUrl()}/dashboard/project/${application.projectId}/services/application/${application.applicationId}?tab=deployments`;
+ const domains = application.domains.map(({ host, https }) => ({ host, https }));
const deployment = await createDeployment({
applicationId: applicationId,
title: titleLog,
@@ -213,6 +214,7 @@ export const deployApplication = async ({
applicationType: "application",
buildLink,
adminId: application.project.adminId,
+ domains
});
} catch (error) {
await updateDeploymentStatus(deployment.deploymentId, "error");
@@ -285,6 +287,7 @@ export const deployRemoteApplication = async ({
}) => {
const application = await findApplicationById(applicationId);
const buildLink = `${await getDokployUrl()}/dashboard/project/${application.projectId}/services/application/${application.applicationId}?tab=deployments`;
+ const domains = application.domains.map(({ host, https }) => ({ host, https }));
const deployment = await createDeployment({
applicationId: applicationId,
title: titleLog,
@@ -332,6 +335,7 @@ export const deployRemoteApplication = async ({
applicationType: "application",
buildLink,
adminId: application.project.adminId,
+ domains
});
} catch (error) {
// @ts-ignore
diff --git a/packages/server/src/services/compose.ts b/packages/server/src/services/compose.ts
index 50459c45..2ed3d462 100644
--- a/packages/server/src/services/compose.ts
+++ b/packages/server/src/services/compose.ts
@@ -209,6 +209,7 @@ export const deployCompose = async ({
const buildLink = `${await getDokployUrl()}/dashboard/project/${
compose.projectId
}/services/compose/${compose.composeId}?tab=deployments`;
+ const domains = compose.domains.map(({ host, https }) => ({ host, https }));
const deployment = await createDeploymentCompose({
composeId: composeId,
title: titleLog,
@@ -243,6 +244,7 @@ export const deployCompose = async ({
applicationType: "compose",
buildLink,
adminId: compose.project.adminId,
+ domains
});
} catch (error) {
await updateDeploymentStatus(deployment.deploymentId, "error");
@@ -313,6 +315,7 @@ export const deployRemoteCompose = async ({
const buildLink = `${await getDokployUrl()}/dashboard/project/${
compose.projectId
}/services/compose/${compose.composeId}?tab=deployments`;
+ const domains = compose.domains.map(({ host, https }) => ({ host, https }));
const deployment = await createDeploymentCompose({
composeId: composeId,
title: titleLog,
@@ -366,6 +369,7 @@ export const deployRemoteCompose = async ({
applicationType: "compose",
buildLink,
adminId: compose.project.adminId,
+ domains
});
} catch (error) {
// @ts-ignore
diff --git a/packages/server/src/utils/notifications/build-error.ts b/packages/server/src/utils/notifications/build-error.ts
index 695b3786..ef4c16cc 100644
--- a/packages/server/src/utils/notifications/build-error.ts
+++ b/packages/server/src/utils/notifications/build-error.ts
@@ -3,6 +3,7 @@ import { notifications } from "@dokploy/server/db/schema";
import BuildFailedEmail from "@dokploy/server/emails/emails/build-failed";
import { renderAsync } from "@react-email/components";
import { and, eq } from "drizzle-orm";
+import { format } from "date-fns";
import {
sendDiscordNotification,
sendEmailNotification,
@@ -113,21 +114,19 @@ export const sendBuildErrorNotifications = async ({
}
if (telegram) {
+ const inlineButton = [
+ [
+ {
+ text: "Deployment Logs",
+ url: buildLink,
+ },
+ ],
+ ];
+
await sendTelegramNotification(
telegram,
- `
- ⚠️ Build Failed
-
- Project: ${projectName}
- Application: ${applicationName}
- Type: ${applicationType}
- Time: ${date.toLocaleString()}
-
- Error:
- ${errorMessage}
-
- Build Details: ${buildLink}
- `,
+ `⚠️ Build Failed\n\nProject: ${projectName}\nApplication: ${applicationName}\nType: ${applicationType}\nDate: ${format(date, "PP")}\nTime: ${format(date, "pp")}\n\nError:\n${errorMessage}`,
+ inlineButton
);
}
diff --git a/packages/server/src/utils/notifications/build-success.ts b/packages/server/src/utils/notifications/build-success.ts
index 402b0cd2..3bfa18a8 100644
--- a/packages/server/src/utils/notifications/build-success.ts
+++ b/packages/server/src/utils/notifications/build-success.ts
@@ -16,6 +16,10 @@ interface Props {
applicationType: string;
buildLink: string;
adminId: string;
+ domains: {
+ host: string;
+ https: boolean;
+ }[];
}
export const sendBuildSuccessNotifications = async ({
@@ -24,6 +28,7 @@ export const sendBuildSuccessNotifications = async ({
applicationType,
buildLink,
adminId,
+ domains
}: Props) => {
const date = new Date();
const unixDate = ~~(Number(date) / 1000);
@@ -107,18 +112,29 @@ export const sendBuildSuccessNotifications = async ({
}
if (telegram) {
+ const chunkArray = (array: T[], chunkSize: number): T[][] =>
+ Array.from({ length: Math.ceil(array.length / chunkSize) }, (_, i) => array.slice(i * chunkSize, i * chunkSize + chunkSize)
+ );
+
+ const inlineButton = [
+ [
+ {
+ text: "Deployment Logs",
+ url: buildLink,
+ },
+ ],
+ ...chunkArray(domains, 2).map((chunk) =>
+ chunk.map((data) => ({
+ text: data.host,
+ url: `${data.https ? "https" : "http"}://${data.host}`,
+ }))
+ ),
+ ];
+
await sendTelegramNotification(
telegram,
- `
- ✅ Build Success
-
- Project: ${projectName}
- Application: ${applicationName}
- Type: ${applicationType}
- Time: ${date.toLocaleString()}
-
- Build Details: ${buildLink}
- `,
+ `✅ Build Success\n\nProject: ${projectName}\nApplication: ${applicationName}Type: ${applicationType}\nDate: ${format(date, "PP")}\nTime: ${format(date, "pp")}`,
+ inlineButton
);
}
diff --git a/packages/server/src/utils/notifications/database-backup.ts b/packages/server/src/utils/notifications/database-backup.ts
index 3aec6f3d..6594f87c 100644
--- a/packages/server/src/utils/notifications/database-backup.ts
+++ b/packages/server/src/utils/notifications/database-backup.ts
@@ -3,6 +3,7 @@ import { notifications } from "@dokploy/server/db/schema";
import DatabaseBackupEmail from "@dokploy/server/emails/emails/database-backup";
import { renderAsync } from "@react-email/components";
import { and, eq } from "drizzle-orm";
+import { format } from "date-fns";
import {
sendDiscordNotification,
sendEmailNotification,
@@ -121,19 +122,15 @@ export const sendDatabaseBackupNotifications = async ({
}
if (telegram) {
+ const isError = type === "error" && errorMessage;
+
const statusEmoji = type === "success" ? "✅" : "❌";
- const messageText = `
- ${statusEmoji} Database Backup ${type === "success" ? "Successful" : "Failed"}
-
- Project: ${projectName}
- Application: ${applicationName}
- Type: ${databaseType}
- Time: ${date.toLocaleString()}
-
- Status: ${type === "success" ? "Successful" : "Failed"}
- ${type === "error" && errorMessage ? `Error: ${errorMessage}` : ""}
- `;
- await sendTelegramNotification(telegram, messageText);
+ const typeStatus = type === "success" ? "Successful" : "Failed";
+ const errorMsg = isError ? `\n\nError:\n${errorMessage}` : "";
+
+ const messageText = `${statusEmoji} Database Backup ${typeStatus}\n\nProject: ${projectName}\nApplication: ${applicationName}\nType: ${databaseType}\nDate: ${format(date, "PP")}\nTime: ${format(date, "pp")}${isError ? errorMsg : ""}`;
+
+ await sendTelegramNotification(telegram, messageText, []);
}
if (slack) {
diff --git a/packages/server/src/utils/notifications/docker-cleanup.ts b/packages/server/src/utils/notifications/docker-cleanup.ts
index c95c7906..8623867f 100644
--- a/packages/server/src/utils/notifications/docker-cleanup.ts
+++ b/packages/server/src/utils/notifications/docker-cleanup.ts
@@ -3,6 +3,7 @@ import { notifications } from "@dokploy/server/db/schema";
import DockerCleanupEmail from "@dokploy/server/emails/emails/docker-cleanup";
import { renderAsync } from "@react-email/components";
import { and, eq } from "drizzle-orm";
+import { format } from "date-fns";
import {
sendDiscordNotification,
sendEmailNotification,
@@ -82,11 +83,8 @@ export const sendDockerCleanupNotifications = async (
if (telegram) {
await sendTelegramNotification(
telegram,
- `
- ✅ Docker Cleanup
- Message: ${message}
- Time: ${date.toLocaleString()}
- `,
+ `✅ Docker Cleanup\n\nMessage: ${message}\nDate: ${format(date, "PP")}\nTime: ${format(date, "pp")}`,
+ []
);
}
diff --git a/packages/server/src/utils/notifications/dokploy-restart.ts b/packages/server/src/utils/notifications/dokploy-restart.ts
index 16170349..ffa838b7 100644
--- a/packages/server/src/utils/notifications/dokploy-restart.ts
+++ b/packages/server/src/utils/notifications/dokploy-restart.ts
@@ -9,6 +9,7 @@ import {
sendSlackNotification,
sendTelegramNotification,
} from "./utils";
+import { format } from "date-fns";
export const sendDokployRestartNotifications = async () => {
const date = new Date();
@@ -67,10 +68,8 @@ export const sendDokployRestartNotifications = async () => {
if (telegram) {
await sendTelegramNotification(
telegram,
- `
- ✅ Dokploy Serverd Restarted
- Time: ${date.toLocaleString()}
- `,
+ `✅ Dokploy Serverd Restarted\nDate: ${format(date, "PP")}\nTime: ${format(date, "pp")}`,
+ []
);
}
diff --git a/packages/server/src/utils/notifications/utils.ts b/packages/server/src/utils/notifications/utils.ts
index 8327c33d..96301156 100644
--- a/packages/server/src/utils/notifications/utils.ts
+++ b/packages/server/src/utils/notifications/utils.ts
@@ -55,6 +55,10 @@ export const sendDiscordNotification = async (
export const sendTelegramNotification = async (
connection: typeof telegram.$inferInsert,
messageText: string,
+ inlineButton: {
+ text: string;
+ url: string;
+ }[][]
) => {
try {
const url = `https://api.telegram.org/bot${connection.botToken}/sendMessage`;
@@ -66,6 +70,9 @@ export const sendTelegramNotification = async (
text: messageText,
parse_mode: "HTML",
disable_web_page_preview: true,
+ reply_markup: {
+ inline_keyboard: inlineButton,
+ },
}),
});
} catch (err) {