diff --git a/README.md b/README.md index e60d5a95..88ca0956 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ ## Install & Upgrade ``` -bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.sh) +bash <(curl -Ls https://raw.githubusercontent.com/solodecode/3x-ui/master/install.sh) ``` ## Install legacy Version (we don't recommend) @@ -35,7 +35,7 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install. To install your desired version, use following installation command. e.g., ver `v1.7.9`: ``` -VERSION=v1.7.9 && bash <(curl -Ls "https://raw.githubusercontent.com/mhsanaei/3x-ui/$VERSION/install.sh") $VERSION +VERSION=v1.7.9 && bash <(curl -Ls "https://raw.githubusercontent.com/solodecode/3x-ui/$VERSION/install.sh") $VERSION ``` ## SSL Certificate @@ -113,7 +113,7 @@ case "${ARCH}" in esac -wget https://github.com/MHSanaei/3x-ui/releases/latest/download/x-ui-linux-${XUI_ARCH}.tar.gz +wget https://github.com/solodecode/3x-ui/releases/latest/download/x-ui-linux-${XUI_ARCH}.tar.gz ``` 2. Once the compressed package is downloaded, execute the following commands to install or upgrade x-ui: @@ -161,7 +161,7 @@ systemctl restart x-ui 2. **Clone the Project Repository:** ```sh - git clone https://github.com/MHSanaei/3x-ui.git + git clone https://github.com/solodecode/3x-ui.git cd 3x-ui ``` @@ -183,7 +183,7 @@ systemctl restart x-ui --network=host \ --restart=unless-stopped \ --name 3x-ui \ - ghcr.io/mhsanaei/3x-ui:latest + ghcr.io/solodecode/3x-ui:latest ``` 4. **Update to the Latest Version:** diff --git a/install.sh b/install.sh index c6c52000..42a5f45f 100644 --- a/install.sh +++ b/install.sh @@ -202,13 +202,13 @@ install_x-ui() { cd /usr/local/ if [ $# == 0 ]; then - tag_version=$(curl -Ls "https://api.github.com/repos/MHSanaei/3x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') + tag_version=$(curl -Ls "https://api.github.com/repos/solodecode/3x-ui/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/') if [[ ! -n "$tag_version" ]]; then echo -e "${red}Failed to fetch x-ui version, it may be due to GitHub API restrictions, please try it later${plain}" exit 1 fi echo -e "Got x-ui latest version: ${tag_version}, beginning the installation..." - wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/MHSanaei/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz + wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz https://github.com/solodecode/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz if [[ $? -ne 0 ]]; then echo -e "${red}Downloading x-ui failed, please be sure that your server can access GitHub ${plain}" exit 1 @@ -223,7 +223,7 @@ install_x-ui() { exit 1 fi - url="https://github.com/MHSanaei/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz" + url="https://github.com/solodecode/3x-ui/releases/download/${tag_version}/x-ui-linux-$(arch).tar.gz" echo -e "Beginning to install x-ui $1" wget -N --no-check-certificate -O /usr/local/x-ui-linux-$(arch).tar.gz ${url} if [[ $? -ne 0 ]]; then @@ -250,7 +250,7 @@ install_x-ui() { chmod +x x-ui bin/xray-linux-$(arch) cp -f x-ui.service /etc/systemd/system/ - wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/MHSanaei/3x-ui/main/x-ui.sh + wget --no-check-certificate -O /usr/bin/x-ui https://raw.githubusercontent.com/solodecode/3x-ui/main/x-ui.sh chmod +x /usr/local/x-ui/x-ui.sh chmod +x /usr/bin/x-ui config_after_install diff --git a/web/service/tgbot.go b/web/service/tgbot.go index 7c6780d8..5858ec36 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -880,6 +880,8 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool tgUserID := callbackQuery.From.ID t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.clientUsage")) t.getClientUsage(chatId, tgUserID) + case "admin_help": + t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.adminContact")) case "client_commands": t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.commands")) t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.commands.helpClientCommands")) @@ -927,7 +929,7 @@ func (t *Tgbot) SendAnswer(chatId int64, msg string, isAdmin bool) { numericKeyboardClient := tu.InlineKeyboard( tu.InlineKeyboardRow( tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.clientUsage")).WithCallbackData(t.encodeQuery("client_traffic")), - tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.commands")).WithCallbackData(t.encodeQuery("client_commands")), + tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.adminContact")).WithCallbackData(t.encodeQuery("admin_help")), ), ) diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index f185ca3d..63f8f9d0 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -170,8 +170,8 @@ "delDepletedClients" = "Удалить отключенных пользователей" "delDepletedClientsTitle" = "Удаление отключенных пользователей" "delDepletedClientsContent" = "Вы уверены, что хотите удалить всех отключенных пользователей?" -"email" = "Email" -"emailDesc" = "Пожалуйста, укажите уникальный Email" +"email" = "MAC" +"emailDesc" = "Пожалуйста, укажите уникальный MAC-адрес" "IPLimit" = "Ограничение по IP" "IPLimitDesc" = "Сбросить подключение, если подключено больше введенного значения (введите 0, чтобы отключить ограничение IP-адресов)" "IPLimitlog" = "IP лог" @@ -483,8 +483,8 @@ "status" = "✅ Бот работает нормально!" "usage" = "❗ Пожалуйста, укажите текст для поиска!" "getID" = "🆔 Ваш ID: {{ .ID }}" -"helpAdminCommands" = "Для перезапуска Xray Core:\r\n/restart force\r\n\r\nДля поиска электронной почты клиента:\r\n/usage [Email]\r\n\r\nДля поиска входящих (со статистикой клиента):\r\n/inbound [Примечание]\r\n\r\nID чата Telegram:\r\n/id" -"helpClientCommands" = "Для поиска статистики используйте следующую команду:\r\n/usage [Email]\r\n\r\nID чата Telegram:\r\n/id" +"helpAdminCommands" = "Для перезапуска Xray Core:\r\n/restart force\r\n\r\nДля поиска электронной почты клиента:\r\n/usage [MAC-адрес]\r\n\r\nДля поиска входящих (со статистикой клиента):\r\n/inbound [Примечание]\r\n\r\nID чата Telegram:\r\n/id" +"helpClientCommands" = "Для поиска статистики используйте следующую команду:\r\n/usage [MAC-адрес]\r\n\r\nID чата Telegram:\r\n/id" "restartUsage" = "\r\n\r\n/restart force" "restartSuccess" = "✅ Операция успешно завершена!" "restartFailed" = "❗ Ошибка в операции.\r\n\r\nОшибка: {{ .Error }}." @@ -522,7 +522,7 @@ "active" = "💡 Активен: {{ .Enable }}\r\n" "enabled" = "🚨 Включен: {{ .Enable }}\r\n" "online" = "🌐 Статус соединения: {{ .Status }}\r\n" -"email" = "📧 Email: {{ .Email }}\r\n" +"email" = "📧 MAC-адрес роутера: {{ .Email }}\r\n" "upload" = "🔼 Исходящий трафик: ↑{{ .Upload }}\r\n" "download" = "🔽 Входящий трафик: ↓{{ .Download }}\r\n" "total" = "📊 Всего: ↑↓{{ .UpDown }} из {{ .Total }}\r\n"