diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-03-06 16:29:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-03-06 16:29:19 -0400 |
| commit | dc82128f6f0ffef9f6973baed3ad63d89802c898 (patch) | |
| tree | 93ff21057d04f9d1c48e4c9e2fa75de092dc1908 /Assistant/Types/DaemonStatus.hs | |
| parent | 49b88039e597ec761227d00ddf125f8ebe5c6a4f (diff) | |
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.
Diffstat (limited to 'Assistant/Types/DaemonStatus.hs')
| -rw-r--r-- | Assistant/Types/DaemonStatus.hs | 4 |
1 files changed, 4 insertions, 0 deletions
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 |