VPN/remnawave-bedolaga-telegram-bot
1
0
Fork 0
mirror of https://github.com/BEDOLAGA-DEV/remnawave-bedolaga-telegram-bot.git synced 2026-01-20 03:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2255 from BEDOLAGA-DEV/main

Browse Source 
ц
This commit is contained in:
Egor
2026-01-11 02:55:55 +03:00
committed by GitHub
parent deae83d2cd 11a35e1058
commit cb6aa4bad4
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/docker-hub.yml vendored
View File

@@ -36,15 +36,15 @@ jobs:
TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}"
echo "🏷️ Собираем релизную версию: $VERSION"
elif [[ $GITHUB_REF == refs/heads/main ]]; then
VERSION="v2.9.5-$(git rev-parse --short HEAD)"
VERSION="v2.9.6-$(git rev-parse --short HEAD)"
TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:latest,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}"
echo "🚀 Собираем версию из main: $VERSION"
elif [[ $GITHUB_REF == refs/heads/dev ]]; then
VERSION="v2.9.5-dev-$(git rev-parse --short HEAD)"
VERSION="v2.9.6-dev-$(git rev-parse --short HEAD)"
TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:dev,fr1ngg/remnawave-bedolaga-telegram-bot:${VERSION}"
echo "🧪 Собираем dev версию: $VERSION"
else
VERSION="v2.9.5-pr-$(git rev-parse --short HEAD)"
VERSION="v2.9.6-pr-$(git rev-parse --short HEAD)"
TAGS="fr1ngg/remnawave-bedolaga-telegram-bot:pr-$(git rev-parse --short HEAD)"
echo "🔀 Собираем PR версию: $VERSION"
fi

6
.github/workflows/docker-registry.yml vendored
View File

@@ -49,13 +49,13 @@ jobs:
VERSION=${GITHUB_REF#refs/tags/}
echo "🏷️ Building release version: $VERSION"
elif [[ $GITHUB_REF == refs/heads/main ]]; then
VERSION="v2.9.5-$(git rev-parse --short HEAD)"
VERSION="v2.9.6-$(git rev-parse --short HEAD)"
echo "🚀 Building main version: $VERSION"
elif [[ $GITHUB_REF == refs/heads/dev ]]; then
VERSION="v2.9.5-dev-$(git rev-parse --short HEAD)"
VERSION="v2.9.6-dev-$(git rev-parse --short HEAD)"
echo "🧪 Building dev version: $VERSION"
else
VERSION="v2.9.5-pr-$(git rev-parse --short HEAD)"
VERSION="v2.9.6-pr-$(git rev-parse --short HEAD)"
echo "🔀 Building PR version: $VERSION"
fi
echo "version=$VERSION" >> $GITHUB_OUTPUT

2
Dockerfile
View File

@@ -14,7 +14,7 @@ RUN pip install --no-cache-dir --upgrade pip && \
FROM python:3.13-slim
ARG VERSION="v2.9.5"
ARG VERSION="v2.9.6"
ARG BUILD_DATE
ARG VCS_REF

19
miniapp/index.html
View File

@@ -8916,8 +8916,8 @@
trafficTopupBtn.classList.remove('hidden');
// Сохраняем данные для модального окна
window._trafficTopupPackages = trafficTopupPackages;
window._subscriptionId = userData?.subscription_id;
window._userBalance = userData?.balance_kopeks || 0;
window._subscriptionId = userData?.subscription_id ?? userData?.subscriptionId;
window._userBalance = userData?.balance_kopeks || userData?.balanceKopeks || 0;
} else {
trafficTopupBtn.classList.add('hidden');
}
@@ -12251,14 +12251,19 @@
clearTrafficTopupError();
try {
const initData = tg.initData || '';
const requestBody = {
initData: initData,
gb: gb
};
if (window._subscriptionId) {
requestBody.subscriptionId = window._subscriptionId;
}
const response = await fetch('/miniapp/subscription/traffic-topup', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
initData: window._initData,
subscriptionId: window._subscriptionId,
gb: gb
})
body: JSON.stringify(requestBody)
});
const data = await response.json();