revert github builder to ubuntu 18.04

Add user's email to remark if exists
Fix false reports
Fix some translations
Fix dockerfile

.github/workflows/release.yml

@@ -4,9 +4,10 @@ on:
     tags:
       - "*"
   workflow_dispatch:
+
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     steps:
@@ -23,7 +24,7 @@ jobs:
   linuxamd64build:
     name: build x-ui amd64 version
     needs: release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Go
@@ -63,7 +64,7 @@ jobs:
   linuxarm64build:
     name: build x-ui arm64 version
     needs: release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Go
@@ -105,7 +106,7 @@ jobs:
   linuxs390xbuild:
     name: build x-ui s390x version
     needs: release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up Go

Dockerfile

@@ -7,10 +7,10 @@ RUN go build main.go
 
 FROM alpine
 LABEL org.opencontainers.image.authors="alireza7@gmail.com"
-RUN apk add ca-certificates tzdata
 ENV TZ=Asia/Tehran
 WORKDIR /app
+
+RUN apk add ca-certificates tzdata && mkdir bin
 COPY --from=builder  /app/main /app/x-ui
-COPY ./bin/. /app/bin/.
 VOLUME [ "/etc/x-ui" ]
 CMD [ "./x-ui" ]

config/version

@@ -1 +1 @@
-0.2.0
+0.2.1

web/assets/js/model/xray.js

@@ -952,8 +952,7 @@ class Inbound extends XrayCommonClass {
                 address = this.stream.tls.server;
             }
         }
-
+        
-        remark = this.settings.vmesses[clientIndex].email ?? remark;
         let obj = {
             v: '2',
             ps: remark,
@@ -976,7 +975,6 @@ 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");
@@ -1061,16 +1059,27 @@ class Inbound extends XrayCommonClass {
 
     genTrojanLink(address='', remark='', clientIndex=0) {
         let settings = this.settings;
-        remark = settings.trojans[clientIndex].email ?? remark;
         return `trojan://${settings.trojans[clientIndex].password}@${address}:${this.port}#${encodeURIComponent(remark)}`;
     }
 
     genLink(address='', remark='', clientIndex=0) {
         switch (this.protocol) {
-            case Protocols.VMESS: return this.genVmessLink(address, remark, clientIndex);
+            case Protocols.VMESS:
-            case Protocols.VLESS: return this.genVLESSLink(address, remark, clientIndex);
+                if (this.settings.vmesses[clientIndex].email != ""){
+                    remark += '-' + this.settings.vmesses[clientIndex].email
+                }
+                return this.genVmessLink(address, remark, clientIndex);
+            case Protocols.VLESS:
+                if (this.settings.vlesses[clientIndex].email != ""){
+                    remark += '-' + this.settings.vlesses[clientIndex].email
+                }
+                return this.genVLESSLink(address, remark, clientIndex);
             case Protocols.SHADOWSOCKS: return this.genSSLink(address, remark);
-            case Protocols.TROJAN: return this.genTrojanLink(address, remark, clientIndex);
+            case Protocols.TROJAN:
+                if (this.settings.trojans[clientIndex].email != ""){
+                    remark += '-' + this.settings.trojans[clientIndex].email
+                }
+                return this.genTrojanLink(address, remark, clientIndex);
             default: return '';
         }
     }

web/html/xui/inbound_client_table.html

@@ -6,14 +6,14 @@
           <a-menu>
             <a-menu-item v-if="record.hasLink()" @click="showQrcode(record,index);"><a-icon type="qrcode"></a-icon>{{ i18n "qrCode" }}</a-menu-item>
             <a-menu-item @click="showInfo(record,index);"><a-icon type="info-circle"></a-icon>{{ i18n "info" }}</a-menu-item>
-            <a-menu-item @click="resetClientTraffic(client,record,$event)"><a-icon type="retweet"></a-icon>{{ i18n "pages.inbounds.resetTraffic" }}</a-menu-item>
+            <a-menu-item @click="resetClientTraffic(client,record,$event)" v-if="client.email != ''"><a-icon type="retweet"></a-icon>{{ i18n "pages.inbounds.resetTraffic" }}</a-menu-item>
           </a-menu>
         </template>
     </a-dropdown>
 </template>
 <template slot="client" slot-scope="text, client">
     [[ client.email ]]
-    <a-tag v-if="!isClientEnabled(record, client.email)" color="red"> expired</a-tag>
+    <a-tag v-if="!isClientEnabled(record, client.email)" color="red">{{ i18n "disabled" }}</a-tag>
 </template>                                    
 <template slot="traffic" slot-scope="text, client">
     <a-tag v-if="client._totalGB === 0" color="blue">{{ i18n "usage" }}: [[ sizeFormat(getUpStats(record, client.email) + getDownStats(record, client.email)) ]]</a-tag>

web/html/xui/inbounds.html

@@ -475,6 +475,9 @@
                         }
                     }
                 }
+                else{
+                    return true
+                }
             },
         },
         watch: {

web/translation/translate.en_US.toml

@@ -1,48 +1,48 @@
-"username" = "username"
+"username" = "Username"
-"password" = "password"
+"password" = "Password"
-"login" = "login"
+"login" = "Login"
-"confirm" = "confirm"
+"confirm" = "Confirm"
-"cancel" = "cancel"
+"cancel" = "Cancel"
-"close" = "close"
+"close" = "Close"
-"copy" = "copy"
+"copy" = "Copy"
-"copied" = "copied"
+"copied" = "Copied"
-"download" = "download"
+"download" = "Download"
-"remark" = "remark"
+"remark" = "Remark"
-"enable" = "enable"
+"enable" = "Enable"
-"protocol" = "protocol"
+"protocol" = "Protocol"
-"search" = "search"
+"search" = "Search"
 
 "loading" = "Loading"
-"second" = "second"
+"second" = "Second"
-"minute" = "minute"
+"minute" = "Minute"
-"hour" = "hour"
+"hour" = "Hour"
-"day" = "day"
+"day" = "Day"
-"check" = "check"
+"check" = "Check"
-"indefinite" = "indefinite"
+"indefinite" = "Indefinite"
-"unlimited" = "unlimited"
+"unlimited" = "Unlimited"
-"none" = "none"
+"none" = "None"
 "qrCode" = "QR Code"
 "info" = "More information"
-"edit" = "edit"
+"edit" = "Edit"
-"delete" = "delete"
+"delete" = "Delete"
-"reset" = "reset"
+"reset" = "Reset"
 "copySuccess" = "Copy successfully"
 "sure" = "Sure"
-"encryption" = "encryption"
+"encryption" = "Encryption"
-"transmission" = "transmission"
+"transmission" = "Transmission"
-"host" = "host"
+"host" = "Host"
-"path" = "path"
+"path" = "Path"
-"camouflage" = "camouflage"
+"camouflage" = "Camouflage"
-"enabled" = "enabled"
+"enabled" = "Enabled"
-"disabled" = "disabled"
+"disabled" = "Disabled"
-"domainName" = "domain name"
+"domainName" = "Domain name"
-"additional" = "alter"
+"additional" = "Alter"
 "monitor" = "Listen IP"
-"certificate" = "certificat"
+"certificate" = "Certificat"
-"fail" = "fail"
+"fail" = "Fail"
-"success" = " success"
+"success" = " Success"
-"getVersion" = "get version"
+"getVersion" = "Get version"
-"install" = "install"
+"install" = "Install"
 "clients" = "Clients"
 "usage" = "Usage"
 
@@ -66,9 +66,9 @@
 
 
 [pages.index]
-"title" = "system status"
+"title" = "System status"
-"memory" = "memory"
+"memory" = "Memory"
-"hard" = "hard disk"
+"hard" = "Hard disk"
 "xrayStatus" = "xray Status"
 "xraySwitch" = "Switch Version"
 "xraySwitchClick" = "Click on the version you want to switch"
@@ -82,8 +82,8 @@
 "downSpeed" = "Total download speed for all network cards"
 "totalSent" = "Total upload traffic of all network cards since system startup"
 "totalReceive" = "Total download traffic of all network cards since system startup"
-"xraySwitchVersionDialog" = "switch xray version"
+"xraySwitchVersionDialog" = "Switch xray version"
-"xraySwitchVersionDialogDesc" = "whether to switch the xray version to"
+"xraySwitchVersionDialogDesc" = "Whether to switch the xray version to"
 "dontRefreshh" = "Installation is in progress, please do not refresh this page"
 
 
@@ -92,17 +92,17 @@
 "totalDownUp" = "Total uploads/downloads"
 "totalUsage" = "Total usage"
 "inboundCount" = "Number of inbound"
-"operate" = "operate"
+"operate" = "Operate"
-"enable" = "enable"
+"enable" = "Enable"
-"remark" = "remark"
+"remark" = "Remark"
-"protocol" = "protocol"
+"protocol" = "Protocol"
-"port" = "port"
+"port" = "Port"
-"traffic" = "traffic"
+"traffic" = "Traffic"
-"details" = "details"
+"details" = "Details"
-"transportConfig" = "transport config"
+"transportConfig" = "Transport config"
-"expireDate" = "expire date"
+"expireDate" = "Expire date"
-"resetTraffic" = "reset traffic"
+"resetTraffic" = "Reset traffic"
-"addInbound" = "addInbound"
+"addInbound" = "Add Inbound"
 "addTo" = "Add To"
 "revise" = "Revise"
 "modifyInbound" = "Modify InBound"
@@ -110,44 +110,44 @@
 "deleteInboundContent" = "Are you sure you want to delete inbound?"
 "resetTrafficContent" = "Are you sure you want to reset traffic?"
 "copyLink" = "Copy Link"
-"address" = "address"
+"address" = "Address"
-"network" = "network"
+"network" = "Network"
-"destinationPort" = "destination port"
+"destinationPort" = "Destination port"
-"targetAddress" = "target address"
+"targetAddress" = "Target address"
 "disableInsecureEncryption" = "Disable insecure encryption"
 "monitorDesc" = "Leave blank by default"
-"meansNoLimit" = "means no limit"
+"meansNoLimit" = "Means no limit"
-"totalFlow" = "total flow"
+"totalFlow" = "Total flow"
 "leaveBlankToNeverExpire" = "Leave blank to never expire"
 "noRecommendKeepDefault" = "There are no special requirements to keep the default"
-"certificatePath" = "certificate file path"
+"certificatePath" = "Certificate file path"
-"certificateContent" = "certificate file content"
+"certificateContent" = "Certificate file content"
-"publicKeyPath" = "public key file path"
+"publicKeyPath" = "Public key file path"
-"publicKeyContent" = "public key content"
+"publicKeyContent" = "Public key content"
-"keyPath" = "key file path"
+"keyPath" = "Key file path"
-"keyContent" = "key content"
+"keyContent" = "Key content"
-"clickOnQRcode" = "click on QR Code to Copy"
+"clickOnQRcode" = "Click on QR Code to Copy"
 "client" = "Client"
 
 [pages.inbounds.toasts]
 "obtain" = "Obtain"
 
 [pages.inbounds.stream.general]
-"requestHeader" = "request header"
+"requestHeader" = "Request header"
-"name" = "name"
+"name" = "Name"
-"value" = "value"
+"value" = "Value"
 
 [pages.inbounds.stream.tcp]
-"requestVersion" = "request version"
+"requestVersion" = "Request version"
-"requestMethod" = "request method"
+"requestMethod" = "Request method"
-"requestPath" = "request path"
+"requestPath" = "Request path"
-"responseVersion" = "response version"
+"responseVersion" = "Response version"
-"responseStatus" = "response status"
+"responseStatus" = "Response status"
-"responseStatusDescription" = "response status description"
+"responseStatusDescription" = "Response status description"
-"responseHeader" = "response header"
+"responseHeader" = "Response header"
 
 [pages.inbounds.stream.quic]
-"encryption" = "encryption"
+"encryption" = "Encryption"
 
 
 [pages.setting]
@@ -188,8 +188,8 @@
 "timeZoneDesc" = "The scheduled task runs according to the time in the time zone, and restarts the panel to take effect"
 
 [pages.setting.toasts]
-"modifySetting" = "modify setting"
+"modifySetting" = "Modify setting"
-"getSetting" = "get setting"
+"getSetting" = "Get setting"
-"modifyUser" = "modify user"
+"modifyUser" = "Modify user"
 "originalUserPassIncorrect" = "The original user name or original password is incorrect"
 "userPassMustBeNotEmpty" = "New username and new password cannot be empty"

web/translation/translate.fa_IR.toml

@@ -34,7 +34,7 @@
 "path" = "مسیر"
 "camouflage" = "استتار"
 "enabled" = "فعال"
-"disabled" = "disabled"
+"disabled" = "غیرفعال"
 "domainName" = "آدرس دامنه"
 "additional" = "آی دی جایگزین"
 "monitor" = "آی پی اتصال"