From d2ca3eb961745a7222cfc13474b433eb681e74c1 Mon Sep 17 00:00:00 2001
From: Chang lue Tsen <tension@ppanel.dev>
Date: Sat, 27 Sep 2025 10:18:08 -0400
Subject: [PATCH] fix(subscribe): add Enabled filter to node query parameters

---
 internal/logic/subscribe/subscribeLogic.go | 3 +++
 internal/model/node/model.go               | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/internal/logic/subscribe/subscribeLogic.go b/internal/logic/subscribe/subscribeLogic.go
index f523e89..9634b82 100644
--- a/internal/logic/subscribe/subscribeLogic.go
+++ b/internal/logic/subscribe/subscribeLogic.go
@@ -212,12 +212,15 @@ func (l *SubscribeLogic) getServers(userSub *user.Subscribe) ([]*node.Node, erro
 
 	l.Debugf("[Generate Subscribe]nodes: %v, NodeTags: %v", nodeIds, tags)
 
+	enable := true
+
 	_, nodes, err := l.svc.NodeModel.FilterNodeList(l.ctx.Request.Context(), &node.FilterNodeParams{
 		Page:     1,
 		Size:     1000,
 		ServerId: nodeIds,
 		Tag:      tool.RemoveDuplicateElements(tags...),
 		Preload:  true,
+		Enabled:  &enable, // Only get enabled nodes
 	})
 
 	l.Debugf("[Query Subscribe]found servers: %v", len(nodes))
diff --git a/internal/model/node/model.go b/internal/model/node/model.go
index 25b0748..b255bbc 100644
--- a/internal/model/node/model.go
+++ b/internal/model/node/model.go
@@ -37,6 +37,7 @@ type FilterNodeParams struct {
 	Search   string   // Search Address or Name
 	Protocol string   // Protocol
 	Preload  bool     // Preload Server
+	Enabled  *bool    // Enabled
 }
 
 // FilterServerList Filter Server List
@@ -88,6 +89,10 @@ func (m *customServerModel) FilterNodeList(ctx context.Context, params *FilterNo
 		query = query.Where("protocol = ?", params.Protocol)
 	}
 
+	if params.Enabled != nil {
+		query = query.Where("enabled = ?", *params.Enabled)
+	}
+
 	if params.Preload {
 		query = query.Preload("Server")
 	}