xinyin025/3x-ui
1
0
Fork 0
mirror of https://github.com/MHSanaei/3x-ui.git synced 2026-09-03 00:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(groups): report changed bulk moves without restarting xray (#6199)

Browse Source
This commit is contained in:
n0ctal
2026-08-14 22:50:06 +05:00
committed by GitHub
parent 1396005082
commit 0496c23a26
3 changed files with 53 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/web/service/client_groups.go
+11 -5
View File
@@ -234,7 +234,9 @@ func (s *ClientService) AddToGroup(emails []string, group string) (int, error) {
var records []model.ClientRecord
for _, batch := range chunkStrings(emails, sqlInChunk) {
var rows []model.ClientRecord
if err := db.Where("email IN ?", batch).Find(&rows).Error; err != nil {
if err := db.Where("email IN ?", batch).
Where("group_name IS NULL OR group_name <> ?", group).
Find(&rows).Error; err != nil {
return 0, err
}
records = append(records, rows...)
@@ -248,13 +250,17 @@ func (s *ClientService) AddToGroup(emails []string, group string) (int, error) {
}
tx := db.Begin()
var affected int64
for _, batch := range chunkStrings(affectedEmails, sqlInChunk) {
if err := tx.Model(&model.ClientRecord{}).
result := tx.Model(&model.ClientRecord{}).
Where("email IN ?", batch).
UpdateColumn("group_name", group).Error; err != nil {
Where("group_name IS NULL OR group_name <> ?", group).
UpdateColumn("group_name", group)
if result.Error != nil {
tx.Rollback()
return 0, err
return 0, result.Error
}
affected += result.RowsAffected
}
var inboundIDs []int
@@ -331,7 +337,7 @@ func (s *ClientService) AddToGroup(emails []string, group string) (int, error) {
if err := tx.Commit().Error; err != nil {
return 0, err
}
return len(records), nil
return int(affected), nil
}
func (s *ClientService) replaceGroupValue(oldName, newName string) (int, error) {