v2.3.1: fix QR top margin, use domain instead of IP for pro-mode links

This commit is contained in:
anten-ka
2026-04-09 00:59:42 +03:00
parent 96cbd243d9
commit a21d2ebea2
3 changed files with 57 additions and 14 deletions

View File

@@ -112,8 +112,7 @@ show_main_menu() {
if command -v qrencode &>/dev/null; then
echo ""
echo ""
qrencode -t UTF8 -m 1 "$link" 2>/dev/null | while IFS= read -r qr_line; do
qrencode -t UTF8 -m 2 "$link" 2>/dev/null | while IFS= read -r qr_line; do
echo " ${qr_line}"
done
echo ""
@@ -455,11 +454,21 @@ menu_status() {
# ── Ссылка ───────────────────────────────────────────────────────────────────
menu_link() {
local secret port ip link
local secret port ip link mode domain
secret=$(get_config_value secret)
port=$(get_config_value port)
ip=$(get_server_ip)
link=$(generate_proxy_link "$ip" "$port" "$secret")
mode=$(config_get mode 2>/dev/null || echo "lite")
domain=$(config_get domain 2>/dev/null || echo "")
if [ "$mode" = "pro" ] && [ -n "$domain" ]; then
local domain_hex faketls_secret
domain_hex=$(printf '%s' "$domain" | xxd -p | tr -d '\n')
faketls_secret="ee${secret}${domain_hex}"
link="tg://proxy?server=${domain}&port=${port}&secret=${faketls_secret}"
else
link=$(generate_proxy_link "$ip" "$port" "$secret")
fi
echo ""
echo -e " ${BOLD}${WHITE}🔗 Ссылка для подключения:${NC}"
@@ -474,18 +483,30 @@ menu_link() {
# ── Поделиться ───────────────────────────────────────────────────────────────
menu_share() {
local secret port ip link
local secret port ip link mode domain server_display
secret=$(get_config_value secret)
port=$(get_config_value port)
ip=$(get_server_ip)
link=$(generate_proxy_link "$ip" "$port" "$secret")
mode=$(config_get mode 2>/dev/null || echo "lite")
domain=$(config_get domain 2>/dev/null || echo "")
if [ "$mode" = "pro" ] && [ -n "$domain" ]; then
local domain_hex faketls_secret
domain_hex=$(printf '%s' "$domain" | xxd -p | tr -d '\n')
faketls_secret="ee${secret}${domain_hex}"
link="tg://proxy?server=${domain}&port=${port}&secret=${faketls_secret}"
server_display="$domain"
else
link=$(generate_proxy_link "$ip" "$port" "$secret")
server_display="$ip"
fi
echo ""
echo -e " ${BOLD}📤 Перешлите это сообщение:${NC}"
echo ""
echo "🔐 MTProxy для Telegram (GoTelegram v${GOTELEGRAM_VERSION})"
echo ""
echo "🌍 Сервер: $ip"
echo "🌍 Сервер: $server_display"
echo "🔌 Порт: $port"
echo ""
echo "👉 Подключиться одним нажатием:"