mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-07-08 05:36:09 +00:00
fix(sub): {{INBOUND}} = inbound remark, fix {{TRAFFIC_LEFT}} across inbounds (#5443)
Issue 1: the host endpoint remark no longer substitutes the inbound remark
as the config name. {{INBOUND}} always resolves to the inbound's own remark
and {{HOST}} to the host remark, so both can be shown side by side instead
of the host name appearing twice. configName() drops hostRemark entirely;
token help text updated in all locales.
Issue 2: client_traffics.email is globally unique, so a client shared across
several inbounds of one subscription has a single traffic row owned by one
inbound. statsForClient only searched the current inbound's preloaded
ClientStats, missing on every other inbound's link and falling back to
Up=Down=0 -- so {{TRAFFIC_LEFT}} printed the full quota. Build a per-request
email->stats map from all the subscription's inbounds (no extra queries) and
fall back to it.
This commit is contained in:
@@ -1761,7 +1761,7 @@
|
||||
"time": "Время и статус"
|
||||
},
|
||||
"descEMAIL": "Email клиента",
|
||||
"descINBOUND": "Имя конфигурации: примечание хоста, если задано, иначе примечание входящего",
|
||||
"descINBOUND": "Собственное примечание входящего (имя конфигурации)",
|
||||
"descHOST": "Примечание хоста",
|
||||
"descID": "UUID клиента",
|
||||
"descSHORT_ID": "Первые 8 символов UUID",
|
||||
|
||||
Reference in New Issue
Block a user