Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(start-command): Updated start command #8

Merged
merged 4 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions .github/workflows/cd-dev.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: CD Dev

on:
workflow_run:
workflows: ["CI"]
types:
- completed

jobs:
deploy_to_dev:
name: Deploy to Dev
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'dev' }}
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
attestations: write
id-token: write
steps:
- name: Check out the repo
uses: actions/checkout@v4

- name: Set short git commit SHA
id: vars
run: |
calculatedSha=$(git rev-parse --short ${{ github.sha }})
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV

- name: Log in to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push Docker image
id: push
uses: docker/build-push-action@v5
with:
context: .
file: ./Dockerfile
push: true
tags: |
shampiniony/dishdash-bot:dev
shampiniony/dishdash-bot:dev-${{ env.COMMIT_SHORT_SHA }}

- name: Trigger Watchtower to update dev container
shell: bash
run: |
curl -H "Authorization: Bearer ${{ secrets.WATCHTOWER_HTTP_API_TOKEN }}" ${{ secrets.WATCHTOWER_UPDATE_ENDPOINT_DEV }}
2 changes: 1 addition & 1 deletion src/bot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ app.use(bot.webhookCallback("/webhook"));

app.get("/app", (req, res) => {
res.redirect(
`${FRONTEND_URL}${req.query.tgWebAppStartParam && "/" + req.query.tgWebAppStartParam.toString()}`,
`${FRONTEND_URL}${req.query.tgWebAppStartParam ? "/" + req.query.tgWebAppStartParam.toString() : ""}`,
);
});

Expand Down
12 changes: 12 additions & 0 deletions src/commands/start.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ export function setupStartCommand(bot: Telegraf<Context>) {
const username = ctx.from.username || "unknown";
await ctx.reply(
`Добро пожаловать, @${username}!\nЧтобы воспользоваться ботом, тгени его в любой беседе @${BOT_USERNAME}`,
{
reply_markup: {
inline_keyboard: [
[
{
text: "Открыть DishDash 🥪",
switch_inline_query: "",
},
],
],
},
},
);
});
}