From 3a835fbeb878eda1fbe84c7537f44245b416703e Mon Sep 17 00:00:00 2001 From: Hamidreza Ghavami <70919649+hamid-gh98@users.noreply.github.com> Date: Sun, 21 May 2023 05:48:19 +0430 Subject: [PATCH] FIX ERROR 'msg and reply are same' in tgbot --- web/service/tgbot.go | 5 +++++ web/translation/translate.en_US.toml | 1 + web/translation/translate.fa_IR.toml | 1 + web/translation/translate.ru_RU.toml | 1 + web/translation/translate.zh_Hans.toml | 1 + 5 files changed, 9 insertions(+) diff --git a/web/service/tgbot.go b/web/service/tgbot.go index 9f86405a..4794dc68 100644 --- a/web/service/tgbot.go +++ b/web/service/tgbot.go @@ -694,6 +694,7 @@ func (t *Tgbot) getClientUsage(chatId int64, tgUserName string, tgUserID string) } output := "" + output += t.I18nBot("tgbot.messages.refreshedOn", "Time=="+time.Now().Format("2006-01-02 15:04:05")) output += t.I18nBot("tgbot.messages.active", "Enable=="+strconv.FormatBool(traffic.Enable)) output += t.I18nBot("tgbot.messages.email", "Email=="+traffic.Email) output += t.I18nBot("tgbot.messages.upload", "Upload=="+common.FormatTraffic(traffic.Up)) @@ -814,6 +815,7 @@ func (t *Tgbot) searchClient(chatId int64, email string, messageID ...int) { } output := "" + output += t.I18nBot("tgbot.messages.refreshedOn", "Time=="+time.Now().Format("2006-01-02 15:04:05")) output += t.I18nBot("tgbot.messages.active", "Enable=="+strconv.FormatBool(traffic.Enable)) output += t.I18nBot("tgbot.messages.email", "Email=="+traffic.Email) output += t.I18nBot("tgbot.messages.upload", "Upload=="+common.FormatTraffic(traffic.Up)) @@ -895,6 +897,7 @@ func (t *Tgbot) searchInbound(chatId int64, remark string) { } output := "" + output += t.I18nBot("tgbot.messages.refreshedOn", "Time=="+time.Now().Format("2006-01-02 15:04:05")) output += t.I18nBot("tgbot.messages.active", "Enable=="+strconv.FormatBool(traffic.Enable)) output += t.I18nBot("tgbot.messages.email", "Email=="+traffic.Email) output += t.I18nBot("tgbot.messages.upload", "Upload=="+common.FormatTraffic(traffic.Up)) @@ -938,6 +941,7 @@ func (t *Tgbot) searchForClient(chatId int64, query string) { } output := "" + output += t.I18nBot("tgbot.messages.refreshedOn", "Time=="+time.Now().Format("2006-01-02 15:04:05")) output += t.I18nBot("tgbot.messages.active", "Enable=="+strconv.FormatBool(traffic.Enable)) output += t.I18nBot("tgbot.messages.email", "Email=="+traffic.Email) output += t.I18nBot("tgbot.messages.upload", "Upload=="+common.FormatTraffic(traffic.Up)) @@ -1042,6 +1046,7 @@ func (t *Tgbot) getExhausted() string { total = common.FormatTraffic((traffic.Total)) } + output += t.I18nBot("tgbot.messages.refreshedOn", "Time=="+time.Now().Format("2006-01-02 15:04:05")) output += t.I18nBot("tgbot.messages.active", "Enable=="+strconv.FormatBool(traffic.Enable)) output += t.I18nBot("tgbot.messages.email", "Email=="+traffic.Email) output += t.I18nBot("tgbot.messages.upload", "Upload=="+common.FormatTraffic(traffic.Up)) diff --git a/web/translation/translate.en_US.toml b/web/translation/translate.en_US.toml index d9158de1..e0159ee8 100644 --- a/web/translation/translate.en_US.toml +++ b/web/translation/translate.en_US.toml @@ -419,6 +419,7 @@ "disabled" = "🛑 Disabled: {{ .Disabled }}\r\n" "depleteSoon" = "🔜 Deplete soon: {{ .Deplete }}\r\n \r\n" "backupTime" = "🗄 Backup Time: {{ .Time }}\r\n" +"refreshedOn" = "🔄🕒 Refreshed On: {{ .Time }}\r\n" [tgbot.buttons] "closeKeyboard" = "❌ Close Keyboard" diff --git a/web/translation/translate.fa_IR.toml b/web/translation/translate.fa_IR.toml index 8c156cc1..310f648a 100644 --- a/web/translation/translate.fa_IR.toml +++ b/web/translation/translate.fa_IR.toml @@ -419,6 +419,7 @@ "disabled" = "🛑 غیرفعال: {{ .Disabled }}\r\n" "depleteSoon" = "🔜 به زودی به پایان خواهد رسید: {{ .Deplete }}\r\n \r\n" "backupTime" = "🗄 زمان پشتیبان‌گیری: {{ .Time }}\r\n" +"refreshedOn" = "🔄🕒 تازه‌سازی شده در: {{ .Time }}\r\n" [tgbot.buttons] "closeKeyboard" = "❌ بستن کیبورد" diff --git a/web/translation/translate.ru_RU.toml b/web/translation/translate.ru_RU.toml index bde97948..a07ea291 100644 --- a/web/translation/translate.ru_RU.toml +++ b/web/translation/translate.ru_RU.toml @@ -419,6 +419,7 @@ "disabled" = "🛑 Отключено: {{ .Disabled }}\r\n" "depleteSoon" = "🔜 Скоро исчерпание: {{ .Deplete }}\r\n \r\n" "backupTime" = "🗄 Время резервного копирования: {{ .Time }}\r\n" +"refreshedOn" = "🔄🕒 Обновлено: {{ .Time }}\r\n" [tgbot.buttons] "closeKeyboard" = "❌ Закрыть клавиатуру" diff --git a/web/translation/translate.zh_Hans.toml b/web/translation/translate.zh_Hans.toml index 64fd33fd..fd2515da 100644 --- a/web/translation/translate.zh_Hans.toml +++ b/web/translation/translate.zh_Hans.toml @@ -419,6 +419,7 @@ "disabled" = "🛑 禁用:{{ .Disabled }}\r\n" "depleteSoon" = "🔜 即将耗尽:{{ .Deplete }}\r\n \r\n" "backupTime" = "🗄 备份时间:{{ .Time }}\r\n" +"refreshedOn" = "🔄🕒 刷新时间:{{ .Time }}\r\n" [tgbot.buttons] "closeKeyboard" = "❌ 关闭键盘"