ti/hereconnect
1
0
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

add secrets.BOT_WEBHOOK_URL
Deploy app frontend / app frontend (push) Successful in 2m3s
Details
Deploy service couchdb / service couchdb (push) Successful in 26s
Details
Deploy db-migrations / db-migrations (push) Successful in 1m30s
Details
Deploy service message-delivery-method-web-push / service message-delivery-method-web-push (push) Successful in 1m30s
Details
Deploy service tg-bot / service tg-bot (push) Successful in 1m23s
Details

Browse Source
This commit is contained in:
Vasilii Mikhailovskii
2024-12-19 17:25:32 +02:00
parent 0890824807
commit 034a22bd30
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/deploy-service-tg-bot.yaml
+2 -1
View File
@@ -20,10 +20,11 @@ jobs:
COUCHDB_USER: ${{ secrets.COUCHDB_USER }}
COUCHDB_PASSWORD: ${{ secrets.COUCHDB_PASSWORD }}
BOT_TOKEN: ${{ secrets.BOT_TOKEN }}
BOT_WEBHOOK_URL: ${{ secrets.BOT_WEBHOOK_URL }}
BOT_USE_CHANGES_DB_UPDATES: ${{ vars.BOT_USE_CHANGES_DB_UPDATES }}
READ_BASE_URL: ${{ vars.READ_BASE_URL }}
APP_BASE_URL: ${{ vars.APP_BASE_URL }}
HEARTBEAT_INTERVAL: ${{ vars.HEARTBEAT_INTERVAL }}
BOT_USE_CHANGES_DB_UPDATES: ${{ vars.BOT_USE_CHANGES_DB_UPDATES }}
steps:
- uses: actions/checkout@v4
docker-compose.yml
+2 -1
View File
@@ -71,12 +71,13 @@ services:
environment:
- API_URL=http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb:5984
- BOT_TOKEN=${BOT_TOKEN:-}
- BOT_WEBHOOK_URL=${BOT_WEBHOOK_URL:-}
- BOT_USE_CHANGES_DB_UPDATES=${BOT_USE_CHANGES_DB_UPDATES:-}
- READ_BASE_URL=${READ_BASE_URL:-}
- APP_BASE_URL=${APP_BASE_URL:-}
- HEARTBEAT_INTERVAL=${HEARTBEAT_INTERVAL:-30000}
- DEBUG=${TG_BOT_DEBUG:-}
- PUBLIC_API_URL=${PUBLIC_API_URL:-}
- BOT_USE_CHANGES_DB_UPDATES=${BOT_USE_CHANGES_DB_UPDATES:-}
depends_on:
couchdb:
condition: service_healthy
services/tg-bot/src/config/env.ts
+1
View File
@@ -22,6 +22,7 @@ export const env = {
BOT_TOKEN: process.env.BOT_TOKEN,
BOT_USE_CHANGES_DB_UPDATES:
`${process.env.BOT_USE_CHANGES_DB_UPDATES}` === "true",
BOT_WEBHOOK_URL: process.env.BOT_WEBHOOK_URL,
READ_BASE_URL: process.env.READ_BASE_URL,
APP_BASE_URL: process.env.APP_BASE_URL,
API_URL: process.env.API_URL,
services/tg-bot/src/services/setupWebHook.ts
+3 -1
View File
@@ -7,7 +7,9 @@ import { MyContext } from "../types/myContext";
export const setupWebHook = async (bot: Bot<MyContext>) => {
const designDocument = await setupWebhookDesignDocument();
const update: keyof typeof designDocument.updates = "saveUpdate";
const webhookUrl = `${env.PUBLIC_API_URL}/${TG_BOT_UPDATES_DB_NAME}/${designDocument._id}/_update/${update}`;
const webhookUrl =
env.BOT_WEBHOOK_URL ||
`${env.PUBLIC_API_URL}/${TG_BOT_UPDATES_DB_NAME}/${designDocument._id}/_update/${update}`;
if (designDocument.constants.telegram_webhook_url !== webhookUrl) {
await bot.api.setWebhook(webhookUrl, {
secret_token: designDocument.constants.telegram_secret_token,