diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml index 890f944..88328ff 100644 --- a/.gitea/workflows/demo.yaml +++ b/.gitea/workflows/demo.yaml @@ -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 \ No newline at end of file + 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 diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml index c56b602..5432d93 100644 --- a/.gitea/workflows/dev.yaml +++ b/.gitea/workflows/dev.yaml @@ -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 \ No newline at end of file + 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 diff --git a/.gitea/workflows/prod.yaml b/.gitea/workflows/prod.yaml index 429055f..68628b7 100644 --- a/.gitea/workflows/prod.yaml +++ b/.gitea/workflows/prod.yaml @@ -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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/src/index.js b/src/index.js index 72c16ef..c5c250a 100644 --- a/src/index.js +++ b/src/index.js @@ -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)) {