v2.8.2

.github/FUNDING.yml

@@ -11,4 +11,4 @@ issuehunt: # Replace with a single IssueHunt username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 polar: # Replace with a single Polar username
 buy_me_a_coffee: mhsanaei
-custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
+custom: https://nowpayments.io/donation/hsanaei

README.ar_EG.md

@@ -41,15 +41,13 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 **إذا كان هذا المشروع مفيدًا لك، فقد ترغب في إعطائه**:star2:
 
-<p align="left">
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
-    <img src="./media/buymeacoffe.png" alt="Image">
+</a>
-  </a>
+</br>
-</p>
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
-
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
-- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+</a>
-- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
-- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
 
 ## النجوم عبر الزمن
 

README.es_ES.md

@@ -41,15 +41,14 @@ Para documentación completa, visita la [Wiki del proyecto](https://github.com/M
 
 **Si este proyecto te es útil, puedes darle una**:star2:
 
-<p align="left">
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
-    <img src="./media/buymeacoffe.png" alt="Image">
+</a>
-  </a>
-</p>
 
-- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+</br>
-- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
-- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>
 
 ## Estrellas a lo Largo del Tiempo
 

README.fa_IR.md

@@ -41,15 +41,14 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 **اگر این پروژه برای شما مفید است، می‌توانید به آن یک**:star2: بدهید
 
-<p align="left">
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
-    <img src="./media/buymeacoffe.png" alt="Image">
+</a>
-  </a>
-</p>
 
-- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+</br>
-- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
-- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>
 
 ## ستاره‌ها در طول زمان
 

README.md

@@ -41,15 +41,14 @@ For full documentation, please visit the [project Wiki](https://github.com/MHSan
 
 **If this project is helpful to you, you may wish to give it a**:star2:
 
-<p align="left">
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
-    <img src="./media/buymeacoffe.png" alt="Image">
+</a>
-  </a>
-</p>
 
-- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+</br>
-- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
-- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>
 
 ## Stargazers over Time
 

README.ru_RU.md

@@ -41,15 +41,14 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 **Если этот проект полезен для вас, вы можете поставить ему**:star2:
 
-<p align="left">
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
-    <img src="./media/buymeacoffe.png" alt="Image">
+</a>
-  </a>
-</p>
 
-- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+</br>
-- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
-- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>
 
 ## Звезды с течением времени
 

README.zh_CN.md

@@ -41,15 +41,14 @@ bash <(curl -Ls https://raw.githubusercontent.com/mhsanaei/3x-ui/master/install.
 
 **如果这个项目对您有帮助，您可以给它一个**:star2:
 
-<p align="left">
+<a href="https://www.buymeacoffee.com/MHSanaei" target="_blank">
-  <a href="https://buymeacoffee.com/mhsanaei" target="_blank">
+<img src="./media/default-yellow.png" alt="Buy Me A Coffee" style="height: 70px !important;width: 277px !important;" >
-    <img src="./media/buymeacoffe.png" alt="Image">
+</a>
-  </a>
-</p>
 
-- USDT (TRC20): `TXncxkvhkDWGts487Pjqq1qT9JmwRUz8CC`
+</br>
-- POL (polygon): `0x41C9548675D044c6Bfb425786C765bc37427256A`
+<a href="https://nowpayments.io/donation/hsanaei" target="_blank" rel="noreferrer noopener">
-- LTC (Litecoin): `ltc1q2ach7x6d2zq0n4l0t4zl7d7xe2s6fs7a3vspwv`
+   <img src="./media/donation-button-black.svg" alt="Crypto donation button by NOWPayments">
+</a>
 
 ## 随时间变化的星标数
 

config/version

@@ -1 +1 @@
-2.8.1
+2.8.2

database/db.go

@@ -9,10 +9,10 @@ import (
 	"path"
 	"slices"
 
-	"x-ui/config"
+	"github.com/mhsanaei/3x-ui/config"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/util/crypto"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
@@ -141,6 +141,9 @@ func InitDB(dbPath string) error {
 	}
 
 	isUsersEmpty, err := isTableEmpty("users")
+	if err != nil {
+		return err
+	}
 
 	if err := initUser(); err != nil {
 		return err

database/model/model.go

@@ -3,8 +3,8 @@ package model
 import (
 	"fmt"
 
-	"x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/util/json_util"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 )
 
 type Protocol string

go.mod

@@ -1,4 +1,4 @@
-module x-ui
+module github.com/mhsanaei/3x-ui
 
 go 1.25.1
 

main.go

@@ -9,14 +9,14 @@ import (
 	"syscall"
 	_ "unsafe"
 
-	"x-ui/config"
+	"github.com/mhsanaei/3x-ui/config"
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/sub"
+	"github.com/mhsanaei/3x-ui/sub"
-	"x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/util/crypto"
-	"x-ui/web"
+	"github.com/mhsanaei/3x-ui/web"
-	"x-ui/web/global"
+	"github.com/mhsanaei/3x-ui/web/global"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 
 	"github.com/joho/godotenv"
 	"github.com/op/go-logging"

sub/sub.go

@@ -13,13 +13,13 @@ import (
 	"strconv"
 	"strings"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	webpkg "x-ui/web"
+	webpkg "github.com/mhsanaei/3x-ui/web"
-	"x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/web/locale"
-	"x-ui/web/middleware"
+	"github.com/mhsanaei/3x-ui/web/middleware"
-	"x-ui/web/network"
+	"github.com/mhsanaei/3x-ui/web/network"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 
 	"github.com/gin-gonic/gin"
 )

sub/subController.go

@@ -4,7 +4,8 @@ import (
 	"encoding/base64"
 	"fmt"
 	"strings"
-	"x-ui/config"
+
+	"github.com/mhsanaei/3x-ui/config"
 
 	"github.com/gin-gonic/gin"
 )

sub/subJsonService.go

@@ -6,12 +6,12 @@ import (
 	"fmt"
 	"strings"
 
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/util/json_util"
-	"x-ui/util/random"
+	"github.com/mhsanaei/3x-ui/util/random"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 )
 
 //go:embed default.json

sub/subService.go

@@ -11,13 +11,13 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/goccy/go-json"
 
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	"x-ui/util/random"
+	"github.com/mhsanaei/3x-ui/util/random"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 )
 
 type SubService struct {

util/common/err.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
 )
 
 func NewErrorf(format string, a ...any) error {

web/controller/api.go

@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 
 	"github.com/gin-gonic/gin"
 )

web/controller/base.go

@@ -3,9 +3,9 @@ package controller
 import (
 	"net/http"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/web/locale"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/web/session"
 
 	"github.com/gin-gonic/gin"
 )

web/controller/inbound.go

@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"strconv"
 
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/web/session"
 
 	"github.com/gin-gonic/gin"
 )

web/controller/index.go

@@ -5,18 +5,18 @@ import (
 	"text/template"
 	"time"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/web/session"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
 )
 
 type LoginForm struct {
-	Username    	string `json:"username" form:"username"`
+	Username      string `json:"username" form:"username"`
-	Password    	string `json:"password" form:"password"`
+	Password      string `json:"password" form:"password"`
-	TwoFactorCode	string `json:"twoFactorCode" form:"twoFactorCode"`
+	TwoFactorCode string `json:"twoFactorCode" form:"twoFactorCode"`
 }
 
 type IndexController struct {

web/controller/server.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"time"
 
-	"x-ui/web/global"
+	"github.com/mhsanaei/3x-ui/web/global"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 
 	"github.com/gin-gonic/gin"
 )

web/controller/setting.go

@@ -4,10 +4,10 @@ import (
 	"errors"
 	"time"
 
-	"x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/util/crypto"
-	"x-ui/web/entity"
+	"github.com/mhsanaei/3x-ui/web/entity"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
-	"x-ui/web/session"
+	"github.com/mhsanaei/3x-ui/web/session"
 
 	"github.com/gin-gonic/gin"
 )

web/controller/util.go

@@ -5,9 +5,9 @@ import (
 	"net/http"
 	"strings"
 
-	"x-ui/config"
+	"github.com/mhsanaei/3x-ui/config"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/web/entity"
+	"github.com/mhsanaei/3x-ui/web/entity"
 
 	"github.com/gin-gonic/gin"
 )

web/controller/xray_setting.go

@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 
 	"github.com/gin-gonic/gin"
 )

web/entity/entity.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
 )
 
 type Msg struct {

web/html/index.html

@@ -431,12 +431,12 @@
       CPU History
       <a-select size="small" v-model="cpuHistoryModal.bucket" class="ml-10" style="width: 80px"
         @change="fetchCpuHistoryBucket">
-        <a-select-option :value="2">2s</a-select-option>
+        <a-select-option :value="2">2m</a-select-option>
-        <a-select-option :value="30">30s</a-select-option>
+        <a-select-option :value="30">30m</a-select-option>
-        <a-select-option :value="60">1m</a-select-option>
+        <a-select-option :value="60">1h</a-select-option>
-        <a-select-option :value="120">2m</a-select-option>
+        <a-select-option :value="120">2h</a-select-option>
-        <a-select-option :value="180">3m</a-select-option>
+        <a-select-option :value="180">3h</a-select-option>
-        <a-select-option :value="300">5m</a-select-option>
+        <a-select-option :value="300">5h</a-select-option>
       </a-select>
     </template>
     <div style="padding:16px">
@@ -1124,4 +1124,4 @@
     },
   });
 </script>
-{{ template "page/body_end" .}}
+{{ template "page/body_end" .}}

web/job/check_client_ip_job.go

@@ -12,10 +12,10 @@ import (
 	"sort"
 	"time"
 
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 )
 
 type CheckClientIpJob struct {

web/job/check_cpu_usage.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"time"
 
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 
 	"github.com/shirou/gopsutil/v4/cpu"
 )

web/job/check_hash_storage.go

@@ -1,7 +1,7 @@
 package job
 
 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 )
 
 type CheckHashStorageJob struct {

web/job/check_xray_running_job.go

@@ -1,8 +1,8 @@
 package job
 
 import (
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 )
 
 type CheckXrayRunningJob struct {

web/job/clear_logs_job.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 )
 
 type ClearLogsJob struct{}

web/job/periodic_traffic_reset_job.go

@@ -1,8 +1,8 @@
 package job
 
 import (
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 )
 
 type Period string

web/job/stats_notify_job.go

@@ -1,7 +1,7 @@
 package job
 
 import (
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 )
 
 type LoginStatus byte

web/job/xray_traffic_job.go

@@ -2,9 +2,10 @@ package job
 
 import (
 	"encoding/json"
-	"x-ui/logger"
+
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/xray"
 
 	"github.com/valyala/fasthttp"
 )

web/locale/locale.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
 
 	"github.com/gin-gonic/gin"
 	"github.com/nicksnyder/go-i18n/v2/i18n"

web/service/inbound.go

@@ -8,11 +8,11 @@ import (
 	"strings"
 	"time"
 
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 
 	"gorm.io/gorm"
 )
@@ -1953,7 +1953,6 @@ func (s *InboundService) GetClientTrafficByEmail(email string) (traffic *xray.Cl
 	if t != nil && client != nil {
 		t.Enable = client.Enable
 		t.SubId = client.SubID
-		t.UUID = client.ID
 		return t, nil
 	}
 	return nil, nil
@@ -1995,7 +1994,6 @@ func (s *InboundService) GetClientTrafficByID(id string) ([]xray.ClientTraffic,
 		if ct, client, e := s.GetClientByEmail(traffics[i].Email); e == nil && ct != nil && client != nil {
 			traffics[i].Enable = client.Enable
 			traffics[i].SubId = client.SubID
-			traffics[i].UUID = client.ID
 		}
 	}
 	return traffics, err

web/service/outbound.go

@@ -1,10 +1,10 @@
 package service
 
 import (
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 
 	"gorm.io/gorm"
 )

web/service/panel.go

@@ -5,7 +5,7 @@ import (
 	"syscall"
 	"time"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
 )
 
 type PanelService struct{}

web/service/server.go

@@ -19,12 +19,12 @@ import (
 	"sync"
 	"time"
 
-	"x-ui/config"
+	"github.com/mhsanaei/3x-ui/config"
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	"x-ui/util/sys"
+	"github.com/mhsanaei/3x-ui/util/sys"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 
 	"github.com/google/uuid"
 	"github.com/shirou/gopsutil/v4/cpu"

web/service/setting.go

@@ -10,14 +10,14 @@ import (
 	"strings"
 	"time"
 
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	"x-ui/util/random"
+	"github.com/mhsanaei/3x-ui/util/random"
-	"x-ui/util/reflect_util"
+	"github.com/mhsanaei/3x-ui/util/reflect_util"
-	"x-ui/web/entity"
+	"github.com/mhsanaei/3x-ui/web/entity"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 )
 
 //go:embed config.json

web/service/tgbot.go

@@ -18,14 +18,14 @@ import (
 	"strings"
 	"time"
 
-	"x-ui/config"
+	"github.com/mhsanaei/3x-ui/config"
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	"x-ui/web/global"
+	"github.com/mhsanaei/3x-ui/web/global"
-	"x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/web/locale"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 
 	"github.com/google/uuid"
 	"github.com/mymmrac/telego"
@@ -1581,23 +1581,6 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 		)
 		prompt_message := t.I18nBot("tgbot.messages.comment_prompt", "ClientComment=="+client_Comment)
 		t.SendMsgToTgbot(chatId, prompt_message, cancel_btn_markup)
-	default:
-		// dynamic callbacks
-		if strings.HasPrefix(callbackQuery.Data, "client_sub_links ") {
-			email := strings.TrimPrefix(callbackQuery.Data, "client_sub_links ")
-			t.sendClientSubLinks(chatId, email)
-			return
-		}
-		if strings.HasPrefix(callbackQuery.Data, "client_individual_links ") {
-			email := strings.TrimPrefix(callbackQuery.Data, "client_individual_links ")
-			t.sendClientIndividualLinks(chatId, email)
-			return
-		}
-		if strings.HasPrefix(callbackQuery.Data, "client_qr_links ") {
-			email := strings.TrimPrefix(callbackQuery.Data, "client_qr_links ")
-			t.sendClientQRLinks(chatId, email)
-			return
-		}
 	case "add_client_ch_default_traffic":
 		inlineKeyboard := tu.InlineKeyboard(
 			tu.InlineKeyboardRow(
@@ -1813,6 +1796,22 @@ func (t *Tgbot) answerCallback(callbackQuery *telego.CallbackQuery, isAdmin bool
 			t.SendMsgToTgbot(chatId, msg, tu.ReplyKeyboardRemove())
 
 		}
+	default:
+		if after, ok := strings.CutPrefix(callbackQuery.Data, "client_sub_links "); ok {
+			email := after
+			t.sendClientSubLinks(chatId, email)
+			return
+		}
+		if after, ok := strings.CutPrefix(callbackQuery.Data, "client_individual_links "); ok {
+			email := after
+			t.sendClientIndividualLinks(chatId, email)
+			return
+		}
+		if after, ok := strings.CutPrefix(callbackQuery.Data, "client_qr_links "); ok {
+			email := after
+			t.sendClientQRLinks(chatId, email)
+			return
+		}
 	}
 }
 

web/service/user.go

@@ -3,10 +3,10 @@ package service
 import (
 	"errors"
 
-	"x-ui/database"
+	"github.com/mhsanaei/3x-ui/database"
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/crypto"
+	"github.com/mhsanaei/3x-ui/util/crypto"
 
 	"github.com/xlzd/gotp"
 	"gorm.io/gorm"

web/service/warp.go

@@ -7,8 +7,9 @@ import (
 	"net/http"
 	"os"
 	"time"
-	"x-ui/logger"
+
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/logger"
+	"github.com/mhsanaei/3x-ui/util/common"
 )
 
 type WarpService struct {

web/service/xray.go

@@ -6,8 +6,8 @@ import (
 	"runtime"
 	"sync"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 
 	"go.uber.org/atomic"
 )

web/service/xray_setting.go

@@ -4,8 +4,8 @@ import (
 	_ "embed"
 	"encoding/json"
 
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	"x-ui/xray"
+	"github.com/mhsanaei/3x-ui/xray"
 )
 
 type XraySettingService struct {

web/session/session.go

@@ -4,7 +4,7 @@ import (
 	"encoding/gob"
 	"net/http"
 
-	"x-ui/database/model"
+	"github.com/mhsanaei/3x-ui/database/model"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"

web/web.go

@@ -14,15 +14,15 @@ import (
 	"strings"
 	"time"
 
-	"x-ui/config"
+	"github.com/mhsanaei/3x-ui/config"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
-	"x-ui/web/controller"
+	"github.com/mhsanaei/3x-ui/web/controller"
-	"x-ui/web/job"
+	"github.com/mhsanaei/3x-ui/web/job"
-	"x-ui/web/locale"
+	"github.com/mhsanaei/3x-ui/web/locale"
-	"x-ui/web/middleware"
+	"github.com/mhsanaei/3x-ui/web/middleware"
-	"x-ui/web/network"
+	"github.com/mhsanaei/3x-ui/web/network"
-	"x-ui/web/service"
+	"github.com/mhsanaei/3x-ui/web/service"
 
 	"github.com/gin-contrib/gzip"
 	"github.com/gin-contrib/sessions"

xray/api.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"regexp"
 	"time"
-	"math"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
 
 	"github.com/xtls/xray-core/app/proxyman/command"
 	statsService "github.com/xtls/xray-core/app/stats/command"

xray/client_traffic.go

@@ -5,7 +5,6 @@ type ClientTraffic struct {
 	InboundId  int    `json:"inboundId" form:"inboundId"`
 	Enable     bool   `json:"enable" form:"enable"`
 	Email      string `json:"email" form:"email" gorm:"unique"`
-	UUID       string `json:"uuid" form:"uuid" gorm:"unique;type:char(36)"`
 	SubId      string `json:"subId" form:"subId" gorm:"-"`
 	Up         int64  `json:"up" form:"up"`
 	Down       int64  `json:"down" form:"down"`

xray/config.go

@@ -3,7 +3,7 @@ package xray
 import (
 	"bytes"
 
-	"x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/util/json_util"
 )
 
 type Config struct {

xray/inbound.go

@@ -3,7 +3,7 @@ package xray
 import (
 	"bytes"
 
-	"x-ui/util/json_util"
+	"github.com/mhsanaei/3x-ui/util/json_util"
 )
 
 type InboundConfig struct {

xray/log_writer.go

@@ -5,7 +5,7 @@ import (
 	"runtime"
 	"strings"
 
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
 )
 
 func NewLogWriter() *LogWriter {

xray/process.go

@@ -13,9 +13,9 @@ import (
 	"syscall"
 	"time"
 
-	"x-ui/config"
+	"github.com/mhsanaei/3x-ui/config"
-	"x-ui/logger"
+	"github.com/mhsanaei/3x-ui/logger"
-	"x-ui/util/common"
+	"github.com/mhsanaei/3x-ui/util/common"
 )
 
 func GetBinaryName() string {