feature/admin-section #22

Merged
1323ed5 merged 2 commits from feature/admin-section into main 2024-11-15 12:45:56 +00:00
4 changed files with 72 additions and 8 deletions
Showing only changes of commit 18e09119b3 - Show all commits

View File

@ -1,4 +1,5 @@
name: "Telegram Shop Bot CI [DEMO]"
on:
push:
branches: ["demo"]
@ -7,7 +8,23 @@ on:
jobs:
lint:
runs-on: node:22-alpine
runs-on: ubuntu-latest # Запускаем на универсальной платформе
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v3
- name: Set up Node.js 22
run: |
# Устанавливаем nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install 22
nvm use 22
node -v # Проверка установленной версии Node.js
- name: Install dependencies
run: npm install
- name: Run lint
run: npm run lint

View File

@ -1,13 +1,33 @@
name: "Telegram Shop Bot CI [DEV]"
on:
push:
branches: ["dev"]
branches:
- dev
pull_request:
branches: ["dev"]
branches:
- dev
jobs:
lint:
runs-on: node:22-alpine
runs-on: ubuntu-latest # Запуск на Ubuntu
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v3
- name: Set up Node.js 22
run: |
echo "Устанавливаем Node.js 22"
curl -sL https://deb.nodesource.com/setup_22.x | sudo -E bash -
sudo apt-get install -y nodejs
node -v # Проверка установленной версии Node.js
- name: Install dependencies
run: |
echo "Устанавливаем зависимости"
npm install
- name: Run lint
run: |
echo "Запуск линтинга"
npm run lint

View File

@ -1,4 +1,5 @@
name: "Telegram Shop Bot CI [PROD]"
on:
push:
branches: ["prod"]
@ -7,7 +8,23 @@ on:
jobs:
lint:
runs-on: node:22-alpine
runs-on: ubuntu-latest # Запускаем на универсальной платформе
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v3
- name: Set up Node.js 22
run: |
# Устанавливаем nvm (Node Version Manager)
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install 22
nvm use 22
node -v # Проверка установленной версии Node.js
- name: Install dependencies
run: npm install
- name: Run lint
run: npm run lint

View File

@ -79,6 +79,16 @@ bot.on('message', async (msg) => {
return;
}
if (msg.text.toLowerCase() === '/start') {
return;
}
const canUse = await userHandler.canUseBot(msg);
if (!canUse) {
return;
}
try {
// Check for admin location input
if (await adminLocationHandler.handleLocationInput(msg)) {