remove refresh button in add client

web/service/tgbot.go

@@ -271,6 +271,12 @@ func (t *Tgbot) OnReceive() {
 		if userState, exists := userStates[message.Chat.ID]; exists {
 			switch userState {
 			case "awaiting_id":
+				if client_Id == strings.TrimSpace(message.Text) {
+					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
+					delete(userStates, message.Chat.ID)
+					return
+				}
+
 				client_Id = strings.TrimSpace(message.Text)
 				if t.isSingleWord(client_Id) {
 					userStates[message.Chat.ID] = "awaiting_id"
@@ -285,8 +291,17 @@ func (t *Tgbot) OnReceive() {
 				} else {
 					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.received_id"), 3, tu.ReplyKeyboardRemove())
 					delete(userStates, message.Chat.ID)
+					inbound, _ := t.inboundService.GetInbound(receiver_inbound_ID)
+					message_text, _ := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
+					t.addClient(message.Chat.ID, message_text)
 				}
 			case "awaiting_password_tr":
+				if client_TrPassword == strings.TrimSpace(message.Text) {
+					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
+					delete(userStates, message.Chat.ID)
+					return
+				}
+
 				client_TrPassword = strings.TrimSpace(message.Text)
 				if t.isSingleWord(client_TrPassword) {
 					userStates[message.Chat.ID] = "awaiting_password_tr"
@@ -301,8 +316,17 @@ func (t *Tgbot) OnReceive() {
 				} else {
 					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.received_password"), 3, tu.ReplyKeyboardRemove())
 					delete(userStates, message.Chat.ID)
+					inbound, _ := t.inboundService.GetInbound(receiver_inbound_ID)
+					message_text, _ := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
+					t.addClient(message.Chat.ID, message_text)
 				}
 			case "awaiting_password_sh":
+				if client_ShPassword == strings.TrimSpace(message.Text) {
+					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
+					delete(userStates, message.Chat.ID)
+					return
+				}
+
 				client_ShPassword = strings.TrimSpace(message.Text)
 				if t.isSingleWord(client_ShPassword) {
 					userStates[message.Chat.ID] = "awaiting_password_sh"
@@ -317,8 +341,17 @@ func (t *Tgbot) OnReceive() {
 				} else {
 					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.received_password"), 3, tu.ReplyKeyboardRemove())
 					delete(userStates, message.Chat.ID)
+					inbound, _ := t.inboundService.GetInbound(receiver_inbound_ID)
+					message_text, _ := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
+					t.addClient(message.Chat.ID, message_text)
 				}
 			case "awaiting_email":
+				if client_Email == strings.TrimSpace(message.Text) {
+					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
+					delete(userStates, message.Chat.ID)
+					return
+				}
+
 				client_Email = strings.TrimSpace(message.Text)
 				if t.isSingleWord(client_Email) {
 					userStates[message.Chat.ID] = "awaiting_email"
@@ -333,11 +366,23 @@ func (t *Tgbot) OnReceive() {
 				} else {
 					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.received_email"), 3, tu.ReplyKeyboardRemove())
 					delete(userStates, message.Chat.ID)
+					inbound, _ := t.inboundService.GetInbound(receiver_inbound_ID)
+					message_text, _ := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
+					t.addClient(message.Chat.ID, message_text)
 				}
 			case "awaiting_comment":
+				if client_Comment == strings.TrimSpace(message.Text) {
+					t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.using_default_value"), 3, tu.ReplyKeyboardRemove())
+					delete(userStates, message.Chat.ID)
+					return
+				}
+
 				client_Comment = strings.TrimSpace(message.Text)
 				t.SendMsgToTgbotDeleteAfter(message.Chat.ID, t.I18nBot("tgbot.messages.received_comment"), 3, tu.ReplyKeyboardRemove())
 				delete(userStates, message.Chat.ID)
+				inbound, _ := t.inboundService.GetInbound(receiver_inbound_ID)
+					message_text, _ := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
+					t.addClient(message.Chat.ID, message_text)
 			}
 
 		} else {
@@ -1235,17 +1280,6 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 		}
 		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.buttons.addClient"))
 		t.SendMsgToTgbot(chatId, t.I18nBot("tgbot.answers.chooseInbound"), inbounds)
-	case "add_client_refresh":
-		messageId := callbackQuery.Message.GetMessageID()
-		inbound, err := t.inboundService.GetInbound(receiver_inbound_ID)
-		if err != nil {
-			t.sendCallbackAnswerTgBot(callbackQuery.ID, err.Error())
-			return
-		}
-		message_text, err := t.BuildInboundClientDataMessage(inbound.Remark, inbound.Protocol)
-
-		t.addClient(chatId,message_text,messageId)
-		t.sendCallbackAnswerTgBot(callbackQuery.ID, t.I18nBot("tgbot.answers.clientRefreshSuccess", "Email=="+client_Email))
 	case "add_client_ch_default_email":
 		userStates[chatId] = "awaiting_email"
 		cancel_btn_markup := tu.InlineKeyboard(
@@ -2171,9 +2205,6 @@ func (t *Tgbot) addClient(chatId int64, msg string, messageID ...int) {
     switch protocol {
     case model.VMESS, model.VLESS:
 		inlineKeyboard := tu.InlineKeyboard(		
-			tu.InlineKeyboardRow(
-				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.refresh")).WithCallbackData("add_client_refresh"),
-			),			
 			tu.InlineKeyboardRow(
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.change_email")).WithCallbackData("add_client_ch_default_email"),
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.change_id")).WithCallbackData("add_client_ch_default_id"),
@@ -2197,9 +2228,6 @@ func (t *Tgbot) addClient(chatId int64, msg string, messageID ...int) {
 		}
 	case model.Trojan:
 		inlineKeyboard := tu.InlineKeyboard(
-			tu.InlineKeyboardRow(
-				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.refresh")).WithCallbackData("add_client_refresh"),
-			),
 			tu.InlineKeyboardRow(
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.change_email")).WithCallbackData("add_client_ch_default_email"),
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.change_password")).WithCallbackData("add_client_ch_default_pass_tr"),
@@ -2224,9 +2252,6 @@ func (t *Tgbot) addClient(chatId int64, msg string, messageID ...int) {
 		
 	case model.Shadowsocks:
 		inlineKeyboard := tu.InlineKeyboard(
-			tu.InlineKeyboardRow(
-				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.refresh")).WithCallbackData("add_client_refresh"),
-			),
 			tu.InlineKeyboardRow(
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.change_email")).WithCallbackData("add_client_ch_default_email"),
 				tu.InlineKeyboardButton(t.I18nBot("tgbot.buttons.change_password")).WithCallbackData("add_client_ch_default_pass_sh"),

web/translation/translate.en_US.toml

@@ -582,10 +582,10 @@
 "yes" = "✅ Yes"
 "no" = "❌ No"
 
-"received_id" = "🔑📥 ID updated. Press refresh to see changes."
+"received_id" = "🔑📥 ID updated."
-"received_password" = "🔑📥 Password updated. Press refresh to see changes."
+"received_password" = "🔑📥 Password updated."
-"received_email" = "📧📥 Email updated. Press refresh to see changes."
+"received_email" = "📧📥 Email updated."
-"received_comment" = "💬📥 Comment updated. Press refresh to see changes."
+"received_comment" = "💬📥 Comment updated."
 "id_prompt" = "🔑 Default ID: {{ .ClientId }}\n\nEnter your id."
 "pass_prompt" = "🔑 Default Password: {{ .ClientPassword }}\n\nEnter your password."
 "email_prompt" = "📧 Default Email: {{ .ClientEmail }}\n\nEnter your email."

web/translation/translate.es_ES.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ Sí"
 "no" = "❌ No"
 
-"received_id" = "🔑📥 ID actualizado. Presiona actualizar para ver los cambios."
+"received_id" = "🔑📥 ID actualizado."
-"received_password" = "🔑📥 Contraseña actualizada. Presiona actualizar para ver los cambios."
+"received_password" = "🔑📥 Contraseña actualizada."
-"received_email" = "📧📥 Correo electrónico actualizado. Presiona actualizar para ver los cambios."
+"received_email" = "📧📥 Correo electrónico actualizado."
-"received_comment" = "💬📥 Comentario actualizado. Presiona actualizar para ver los cambios."
+"received_comment" = "💬📥 Comentario actualizado."
 "id_prompt" = "🔑 ID predeterminado: {{ .ClientId }}\n\nIntroduce tu ID."
 "pass_prompt" = "🔑 Contraseña predeterminada: {{ .ClientPassword }}\n\nIntroduce tu contraseña."
 "email_prompt" = "📧 Correo electrónico predeterminado: {{ .ClientEmail }}\n\nIntroduce tu correo electrónico."

web/translation/translate.fa_IR.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ بله"
 "no" = "❌ خیر"
 
-"received_id" = "🔑📥 شناسه به‌روزرسانی شد. برای مشاهده تغییرات، دکمه تازه‌سازی را فشار دهید."
+"received_id" = "🔑📥 شناسه به‌روزرسانی شد."
-"received_password" = "🔑📥 رمز عبور به‌روزرسانی شد. برای مشاهده تغییرات، دکمه تازه‌سازی را فشار دهید."
+"received_password" = "🔑📥 رمز عبور به‌روزرسانی شد."
-"received_email" = "📧📥 ایمیل به‌روزرسانی شد. برای مشاهده تغییرات، دکمه تازه‌سازی را فشار دهید."
+"received_email" = "📧📥 ایمیل به‌روزرسانی شد."
-"received_comment" = "💬📥 نظر به‌روزرسانی شد. برای مشاهده تغییرات، دکمه تازه‌سازی را فشار دهید."
+"received_comment" = "💬📥 نظر به‌روزرسانی شد."
 "id_prompt" = "🔑 شناسه پیش‌فرض: {{ .ClientId }}\n\nشناسه خود را وارد کنید."
 "pass_prompt" = "🔑 رمز عبور پیش‌فرض: {{ .ClientPassword }}\n\nرمز عبور خود را وارد کنید."
 "email_prompt" = "📧 ایمیل پیش‌فرض: {{ .ClientEmail }}\n\nایمیل خود را وارد کنید."

web/translation/translate.id_ID.toml

@@ -583,10 +583,10 @@
 "yes" = "✅ Ya"
 "no" = "❌ Tidak"
 
-"received_id" = "🔑📥 ID diperbarui. Tekan segarkan untuk melihat perubahan."
+"received_id" = "🔑📥 ID diperbarui."
-"received_password" = "🔑📥 Kata sandi diperbarui. Tekan segarkan untuk melihat perubahan."
+"received_password" = "🔑📥 Kata sandi diperbarui."
-"received_email" = "📧📥 Email diperbarui. Tekan segarkan untuk melihat perubahan."
+"received_email" = "📧📥 Email diperbarui."
-"received_comment" = "💬📥 Komentar diperbarui. Tekan segarkan untuk melihat perubahan."
+"received_comment" = "💬📥 Komentar diperbarui."
 "id_prompt" = "🔑 ID Default: {{ .ClientId }}\n\nMasukkan ID Anda."
 "pass_prompt" = "🔑 Kata Sandi Default: {{ .ClientPassword }}\n\nMasukkan kata sandi Anda."
 "email_prompt" = "📧 Email Default: {{ .ClientEmail }}\n\nMasukkan email Anda."

web/translation/translate.ja_JP.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ はい"
 "no" = "❌ いいえ"
 
-"received_id" = "🔑📥 IDが更新されました。更新ボタンを押して変更を確認してください。"
+"received_id" = "🔑📥 IDが更新されました。"
-"received_password" = "🔑📥 パスワードが更新されました。更新ボタンを押して変更を確認してください。"
+"received_password" = "🔑📥 パスワードが更新されました。"
-"received_email" = "📧📥 メールが更新されました。更新ボタンを押して変更を確認してください。"
+"received_email" = "📧📥 メールが更新されました。"
-"received_comment" = "💬📥 コメントが更新されました。更新ボタンを押して変更を確認してください。"
+"received_comment" = "💬📥 コメントが更新されました。"
 "id_prompt" = "🔑 デフォルトID: {{ .ClientId }}\n\nIDを入力してください。"
 "pass_prompt" = "🔑 デフォルトパスワード: {{ .ClientPassword }}\n\nパスワードを入力してください。"
 "email_prompt" = "📧 デフォルトメール: {{ .ClientEmail }}\n\nメールを入力してください。"

web/translation/translate.pt_BR.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ Sim"
 "no" = "❌ Não"
 
-"received_id" = "🔑📥 ID atualizado. Pressione atualizar para ver as mudanças."
+"received_id" = "🔑📥 ID atualizado."
-"received_password" = "🔑📥 Senha atualizada. Pressione atualizar para ver as mudanças."
+"received_password" = "🔑📥 Senha atualizada."
-"received_email" = "📧📥 E-mail atualizado. Pressione atualizar para ver as mudanças."
+"received_email" = "📧📥 E-mail atualizado."
-"received_comment" = "💬📥 Comentário atualizado. Pressione atualizar para ver as mudanças."
+"received_comment" = "💬📥 Comentário atualizado."
 "id_prompt" = "🔑 ID Padrão: {{ .ClientId }}\n\nDigite seu ID."
 "pass_prompt" = "🔑 Senha Padrão: {{ .ClientPassword }}\n\nDigite sua senha."
 "email_prompt" = "📧 E-mail Padrão: {{ .ClientEmail }}\n\nDigite seu e-mail."

web/translation/translate.ru_RU.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ Да"
 "no" = "❌ Нет"
 
-"received_id" = "🔑📥 ID обновлён. Нажмите обновить, чтобы увидеть изменения."
+"received_id" = "🔑📥 ID обновлён."
-"received_password" = "🔑📥 Пароль обновлён. Нажмите обновить, чтобы увидеть изменения."
+"received_password" = "🔑📥 Пароль обновлён."
-"received_email" = "📧📥 Электронная почта обновлена. Нажмите обновить, чтобы увидеть изменения."
+"received_email" = "📧📥 Электронная почта обновлена."
-"received_comment" = "💬📥 Комментарий обновлён. Нажмите обновить, чтобы увидеть изменения."
+"received_comment" = "💬📥 Комментарий обновлён."
 "id_prompt" = "🔑 Стандартный ID: {{ .ClientId }}\n\nВведите ваш ID."
 "pass_prompt" = "🔑 Стандартный пароль: {{ .ClientPassword }}\n\nВведите ваш пароль."
 "email_prompt" = "📧 Стандартный email: {{ .ClientEmail }}\n\nВведите ваш email."

web/translation/translate.tr_TR.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ Evet"
 "no" = "❌ Hayır"
 
-"received_id" = "🔑📥 Kimlik güncellendi. Değişiklikleri görmek için yenileye basın."
+"received_id" = "🔑📥 Kimlik güncellendi."
-"received_password" = "🔑📥 Şifre güncellendi. Değişiklikleri görmek için yenileye basın."
+"received_password" = "🔑📥 Şifre güncellendi."
-"received_email" = "📧📥 E-posta güncellendi. Değişiklikleri görmek için yenileye basın."
+"received_email" = "📧📥 E-posta güncellendi."
-"received_comment" = "💬📥 Yorum güncellendi. Değişiklikleri görmek için yenileye basın."
+"received_comment" = "💬📥 Yorum güncellendi."
 "id_prompt" = "🔑 Varsayılan Kimlik: {{ .ClientId }}\n\nKimliğinizi girin."
 "pass_prompt" = "🔑 Varsayılan Şifre: {{ .ClientPassword }}\n\nŞifrenizi girin."
 "email_prompt" = "📧 Varsayılan E-posta: {{ .ClientEmail }}\n\nE-postanızı girin."

web/translation/translate.uk_UA.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ Так"
 "no" = "❌ Ні"
 
-"received_id" = "🔑📥 ID оновлено. Натисніть оновити, щоб побачити зміни."
+"received_id" = "🔑📥 ID оновлено."
-"received_password" = "🔑📥 Пароль оновлено. Натисніть оновити, щоб побачити зміни."
+"received_password" = "🔑📥 Пароль оновлено."
-"received_email" = "📧📥 Електронна пошта оновлена. Натисніть оновити, щоб побачити зміни."
+"received_email" = "📧📥 Електронна пошта оновлена."
-"received_comment" = "💬📥 Коментар оновлено. Натисніть оновити, щоб побачити зміни."
+"received_comment" = "💬📥 Коментар оновлено."
 "id_prompt" = "🔑 Стандартний ID: {{ .ClientId }}\n\nВведіть ваш ID."
 "pass_prompt" = "🔑 Стандартний пароль: {{ .ClientPassword }}\n\nВведіть ваш пароль."
 "email_prompt" = "📧 Стандартний email: {{ .ClientEmail }}\n\nВведіть ваш email."

web/translation/translate.vi_VN.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ Có"
 "no" = "❌ Không"
 
-"received_id" = "🔑📥 ID đã được cập nhật. Nhấn làm mới để xem thay đổi."
+"received_id" = "🔑📥 ID đã được cập nhật."
-"received_password" = "🔑📥 Mật khẩu đã được cập nhật. Nhấn làm mới để xem thay đổi."
+"received_password" = "🔑📥 Mật khẩu đã được cập nhật."
-"received_email" = "📧📥 Email đã được cập nhật. Nhấn làm mới để xem thay đổi."
+"received_email" = "📧📥 Email đã được cập nhật."
-"received_comment" = "💬📥 Bình luận đã được cập nhật. Nhấn làm mới để xem thay đổi."
+"received_comment" = "💬📥 Bình luận đã được cập nhật."
 "id_prompt" = "🔑 ID mặc định: {{ .ClientId }}\n\nVui lòng nhập ID của bạn."
 "pass_prompt" = "🔑 Mật khẩu mặc định: {{ .ClientPassword }}\n\nVui lòng nhập mật khẩu của bạn."
 "email_prompt" = "📧 Email mặc định: {{ .ClientEmail }}\n\nVui lòng nhập email của bạn."

web/translation/translate.zh_CN.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ 是的"
 "no" = "❌ 没有"
 
-"received_id" = "🔑📥 ID 已更新。请按刷新查看更改。"
+"received_id" = "🔑📥 ID 已更新。"
-"received_password" = "🔑📥 密码已更新。请按刷新查看更改。"
+"received_password" = "🔑📥 密码已更新。"
-"received_email" = "📧📥 邮箱已更新。请按刷新查看更改。"
+"received_email" = "📧📥 邮箱已更新。"
-"received_comment" = "💬📥 评论已更新。请按刷新查看更改。"
+"received_comment" = "💬📥 评论已更新。"
 "id_prompt" = "🔑 默认 ID: {{ .ClientId }}\n\n请输入您的 ID。"
 "pass_prompt" = "🔑 默认密码: {{ .ClientPassword }}\n\n请输入您的密码。"
 "email_prompt" = "📧 默认邮箱: {{ .ClientEmail }}\n\n请输入您的邮箱。"

web/translation/translate.zh_TW.toml

@@ -584,10 +584,10 @@
 "yes" = "✅ 是的"
 "no" = "❌ 沒有"
 
-"received_id" = "🔑📥 ID 已更新。請按刷新查看變更。"
+"received_id" = "🔑📥 ID 已更新。"
-"received_password" = "🔑📥 密碼已更新。請按刷新查看變更。"
+"received_password" = "🔑📥 密碼已更新。"
-"received_email" = "📧📥 電子郵件已更新。請按刷新查看變更。"
+"received_email" = "📧📥 電子郵件已更新。"
-"received_comment" = "💬📥 評論已更新。請按刷新查看變更。"
+"received_comment" = "💬📥 評論已更新。"
 "id_prompt" = "🔑 預設 ID: {{ .ClientId }}\n\n請輸入您的 ID。"
 "pass_prompt" = "🔑 預設密碼: {{ .ClientPassword }}\n\n請輸入您的密碼。"
 "email_prompt" = "📧 預設電子郵件: {{ .ClientEmail }}\n\n請輸入您的電子郵件。"