Alex-Devera/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2025-09-10 12:16:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add gormStatement.RaiseErrorOnNotFound in few places

Browse source
This commit is contained in:
somebodywashere 2024-03-20 18:19:33 +03:00
parent c5b30d6c6c
commit 572b530863
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sub/subService.go
View file

@ -102,6 +102,7 @@ func (s *SubService) GetSubs(subId string, host string) ([]string, string, error
func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error) { func (s *SubService) getInboundsBySubId(subId string) ([]*model.Inbound, error) {
db := database.GetDB() db := database.GetDB()
db.Statement.RaiseErrorOnNotFound = true
var inbounds []*model.Inbound var inbounds []*model.Inbound
err := db.Model(model.Inbound{}).Preload("ClientStats").Where(`id in ( err := db.Model(model.Inbound{}).Preload("ClientStats").Where(`id in (
SELECT DISTINCT inbounds.id SELECT DISTINCT inbounds.id
@ -128,6 +129,7 @@ func (s *SubService) getClientTraffics(traffics []xray.ClientTraffic, email stri
func (s *SubService) getFallbackMaster(dest string, streamSettings string) (string, int, string, error) { func (s *SubService) getFallbackMaster(dest string, streamSettings string) (string, int, string, error) {
db := database.GetDB() db := database.GetDB()
db.Statement.RaiseErrorOnNotFound = true
var inbound *model.Inbound var inbound *model.Inbound
err := db.Model(model.Inbound{}). err := db.Model(model.Inbound{}).
Where("JSON_TYPE(settings, '$.fallbacks') = 'array'"). Where("JSON_TYPE(settings, '$.fallbacks') = 'array'").

7
web/job/check_client_ip_job.go
View file

@ -82,6 +82,7 @@ func (j *CheckClientIpJob) clearAccessLog() {
func (j *CheckClientIpJob) hasLimitIp() bool { func (j *CheckClientIpJob) hasLimitIp() bool {
db := database.GetDB() db := database.GetDB()
db.Statement.RaiseErrorOnNotFound = true
var inbounds []*model.Inbound var inbounds []*model.Inbound
err := db.Model(model.Inbound{}).Find(&inbounds).Error err := db.Model(model.Inbound{}).Find(&inbounds).Error
@ -259,10 +260,9 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun
// check inbound limitation // check inbound limitation
inbound, err := j.getInboundByEmail(clientEmail) inbound, err := j.getInboundByEmail(clientEmail)
j.checkError(err)
if inbound.Settings == "" { if err != nil {
logger.Debug("wrong data ", inbound) logger.Debug(inbound, ":", err)
return false return false
} }
@ -313,6 +313,7 @@ func (j *CheckClientIpJob) updateInboundClientIps(inboundClientIps *model.Inboun
func (j *CheckClientIpJob) getInboundByEmail(clientEmail string) (*model.Inbound, error) { func (j *CheckClientIpJob) getInboundByEmail(clientEmail string) (*model.Inbound, error) {
db := database.GetDB() db := database.GetDB()
db.Statement.RaiseErrorOnNotFound = true
var inbounds *model.Inbound var inbounds *model.Inbound
err := db.Model(model.Inbound{}).Where("settings LIKE ?", "%"+clientEmail+"%").Find(&inbounds).Error err := db.Model(model.Inbound{}).Where("settings LIKE ?", "%"+clientEmail+"%").Find(&inbounds).Error

6
web/service/inbound.go
View file

@ -824,6 +824,7 @@ func (s *InboundService) adjustTraffics(tx *gorm.DB, dbClientTraffics []*xray.Cl
if len(inboundIds) > 0 { if len(inboundIds) > 0 {
var inbounds []*model.Inbound var inbounds []*model.Inbound
tx.Statement.RaiseErrorOnNotFound = true
err := tx.Model(model.Inbound{}).Where("id IN (?)", inboundIds).Find(&inbounds).Error err := tx.Model(model.Inbound{}).Where("id IN (?)", inboundIds).Find(&inbounds).Error
if err != nil { if err != nil {
return nil, err return nil, err
@ -893,6 +894,7 @@ func (s *InboundService) autoRenewClients(tx *gorm.DB) (bool, int64, error) {
for _, traffic := range traffics { for _, traffic := range traffics {
inbound_ids = append(inbound_ids, traffic.InboundId) inbound_ids = append(inbound_ids, traffic.InboundId)
} }
tx.Statement.RaiseErrorOnNotFound = true
err = tx.Model(model.Inbound{}).Where("id IN ?", inbound_ids).Find(&inbounds).Error err = tx.Model(model.Inbound{}).Where("id IN ?", inbound_ids).Find(&inbounds).Error
if err != nil { if err != nil {
return false, 0, err return false, 0, err
@ -1675,12 +1677,10 @@ func (s *InboundService) GetClientTrafficTgBot(tgId string) ([]*xray.ClientTraff
var traffics []*xray.ClientTraffic var traffics []*xray.ClientTraffic
err = db.Model(xray.ClientTraffic{}).Where("email IN ?", emails).Find(&traffics).Error err = db.Model(xray.ClientTraffic{}).Where("email IN ?", emails).Find(&traffics).Error
if err != nil { if err != nil {
if err == gorm.ErrRecordNotFound {
logger.Warning(err) logger.Warning(err)
return nil, err return nil, err
} }
} return traffics, nil
return traffics, err
} }
func (s *InboundService) GetClientTrafficByEmail(email string) (traffic *xray.ClientTraffic, err error) { func (s *InboundService) GetClientTrafficByEmail(email string) (traffic *xray.ClientTraffic, err error) {

2
web/service/tgbot.go
View file

@ -1469,7 +1469,7 @@ func (t *Tgbot) notifyExhausted() {
var disabledClients []xray.ClientTraffic var disabledClients []xray.ClientTraffic
var exhaustedClients []xray.ClientTraffic var exhaustedClients []xray.ClientTraffic
traffics, err := t.inboundService.GetClientTrafficTgBot(client.TgID) traffics, err := t.inboundService.GetClientTrafficTgBot(client.TgID)
if err == nil { if err == nil && len (traffics) > 0 {
output := t.I18nBot("tgbot.messages.exhaustedCount", "Type=="+t.I18nBot("tgbot.clients")) output := t.I18nBot("tgbot.messages.exhaustedCount", "Type=="+t.I18nBot("tgbot.clients"))
for _, traffic := range traffics { for _, traffic := range traffics {
if traffic.Enable { if traffic.Enable {