From dc82128f6f0ffef9f6973baed3ad63d89802c898 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Mar 2013 16:29:19 -0400 Subject: tag xmpp pushes with jid This fixes the issue mentioned in the last commit. Turns out just collecting UUID of clients behind a XMPP remote is insufficient (although I should probably still do it for other reasons), because a single remote repo might be connected via both XMPP and local pairing. So a way is needed to know when a push was received from any client using a given XMPP remote over XMPP, as opposed to via ssh. --- Assistant/Types/DaemonStatus.hs | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'Assistant/Types/DaemonStatus.hs') diff --git a/Assistant/Types/DaemonStatus.hs b/Assistant/Types/DaemonStatus.hs index 7da85daa0..a22223476 100644 --- a/Assistant/Types/DaemonStatus.hs +++ b/Assistant/Types/DaemonStatus.hs @@ -15,6 +15,7 @@ import Assistant.Pairing import Utility.NotificationBroadcaster import Logs.Transfer import Assistant.Types.ThreadName +import Assistant.Types.NetMessager import Control.Concurrent.STM import Control.Concurrent.Async @@ -57,6 +58,8 @@ data DaemonStatus = DaemonStatus , alertNotifier :: NotificationBroadcaster -- Broadcasts notifications when the syncRemotes change , syncRemotesNotifier :: NotificationBroadcaster + -- When the XMPP client is in use, this will contain its JI. + , xmppClientID :: Maybe ClientID } type TransferMap = M.Map Transfer TransferInfo @@ -83,3 +86,4 @@ newDaemonStatus = DaemonStatus <*> newNotificationBroadcaster <*> newNotificationBroadcaster <*> newNotificationBroadcaster + <*> pure Nothing -- cgit v1.2.3