From 5e4d0c736a29c44f93a41f58d02740585f90b414 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <7190048+kegsay@users.noreply.github.com>
Date: Tue, 12 Aug 2025 16:15:32 +0100
Subject: [PATCH] Only have one context err handling block

---
 roomserver/internal/input/input.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/roomserver/internal/input/input.go b/roomserver/internal/input/input.go
index 6215e6ba..005f4f42 100644
--- a/roomserver/internal/input/input.go
+++ b/roomserver/internal/input/input.go
@@ -271,7 +271,7 @@ func (w *worker) _next() {
 	})
 	msgs, err := w.subscription.Fetch(1, nats.Context(ctx))
 	switch err {
-	case nil, nats.ErrTimeout, context.DeadlineExceeded, context.Canceled:
+	case nil, nats.ErrTimeout:
 		// Is the server shutting down? If so, stop processing.
 		if w.r.ProcessContext.Context().Err() != nil {
 			return
@@ -286,6 +286,10 @@ func (w *worker) _next() {
 			return
 		}
 	case context.DeadlineExceeded, context.Canceled:
+		// Is the server shutting down? If so, stop processing.
+		if w.r.ProcessContext.Context().Err() != nil {
+			return
+		}
 		// The context exceeded, so we've been waiting for more than a
 		// minute for activity in this room. At this point we will shut
 		// down the subscriber to free up resources. It'll get started