From d971a61afcc54eff68d7ebede73c6d90e14b1dfe Mon Sep 17 00:00:00 2001
From: Alireza Ahmadi <alireza.ahmadi@tzconnect.com>
Date: Sat, 11 Feb 2023 09:41:58 +0100
Subject: [PATCH] Client email as remark in multi-user

---
 web/assets/js/model/xray.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/web/assets/js/model/xray.js b/web/assets/js/model/xray.js
index fdc5741e..b18914b1 100644
--- a/web/assets/js/model/xray.js
+++ b/web/assets/js/model/xray.js
@@ -953,6 +953,7 @@ class Inbound extends XrayCommonClass {
             }
         }
 
+        remark = this.settings.vmesses[clientIndex].email ?? remark;
         let obj = {
             v: '2',
             ps: remark,
@@ -975,6 +976,7 @@ class Inbound extends XrayCommonClass {
         const port = this.port;
         const type = this.stream.network;
         const params = new Map();
+        remark = settings.vlesses[clientIndex].email ?? remark;
         params.set("type", this.stream.network);
         if (this.xtls) {
             params.set("security", "xtls");
@@ -1059,7 +1061,8 @@ class Inbound extends XrayCommonClass {
 
     genTrojanLink(address='', remark='', clientIndex=0) {
         let settings = this.settings;
-        return `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark+"-"+settings.trojans[clientIndex].email)}`;
+        remark = settings.trojans[clientIndex].email ?? remark;
+        return `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;
     }
 
     genLink(address='', remark='', clientIndex=0) {