Merge branch 'master' of github.com:centrifugal/centrifugo

centrifugal · Sep 20, 2023 · 5de3b4d · 5de3b4d
2 parents d134e8f + c6416a6
commit 5de3b4d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/internal/proxy/subscribe_handler.go b/internal/proxy/subscribe_handler.go
@@ -142,6 +142,7 @@ func (h *SubscribeHandler) Handle(node *centrifuge.Node) SubscribeHandlerFunc {
 
 		var info []byte
 		var data []byte
+		var expireAt int64
 		var extra SubscribeExtra
 		if subscribeRep.Result != nil {
 			if subscribeRep.Result.B64Info != "" {
@@ -182,10 +183,13 @@ func (h *SubscribeHandler) Handle(node *centrifuge.Node) SubscribeHandlerFunc {
 			if result.Override != nil && result.Override.ForcePositioning != nil {
 				positioning = result.Override.ForcePositioning.Value
 			}
+
+			expireAt = result.ExpireAt
 		}
 
 		return centrifuge.SubscribeReply{
 			Options: centrifuge.SubscribeOptions{
+				ExpireAt:          expireAt,
 				ChannelInfo:       info,
 				EmitPresence:      presence,
 				EmitJoinLeave:     joinLeave,