From 7167af87edc5a9d883e77d18f6525d9f76f5328a Mon Sep 17 00:00:00 2001
From: Benno <benno@bensge.com>
Date: Wed, 8 Nov 2023 23:28:06 +0100
Subject: [PATCH] Send queued messages to merged user accounts

---
 spybot/recorder/client.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spybot/recorder/client.py b/spybot/recorder/client.py
index 7ae965b..76d62a3 100644
--- a/spybot/recorder/client.py
+++ b/spybot/recorder/client.py
@@ -174,7 +174,7 @@ def handle_old_sessions(self, clients):
         return clients
 
     def send_queued_messages(self, client_id: int, user: TSUser):
-        msgs = QueuedClientMessage.objects.filter(tsuser=user).order_by("-date").all()
+        msgs = QueuedClientMessage.objects.filter(tsuser__in=user.merged_user.tsusers).order_by("-date").all()
 
         for message in msgs:
             self.ts.poke_client(client_id, "You got an important message from Spybot! Check out my private message "