diff options
Diffstat (limited to 'src/Erebos/Invite.hs')
| -rw-r--r-- | src/Erebos/Invite.hs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Erebos/Invite.hs b/src/Erebos/Invite.hs index c6e037d..5b35506 100644 --- a/src/Erebos/Invite.hs +++ b/src/Erebos/Invite.hs @@ -190,8 +190,7 @@ acceptInvite -> m () acceptInvite from token = do prev <- find ((Just token ==) . acceptedInviteToken) - . fromSetBy (comparing acceptedInviteToken) . lookupSharedValue . lsShared . fromStored - <$> getLocalHead + . fromSetBy (comparing acceptedInviteToken) <$> lookupSharedValueM accepted <- mergeSorted @AcceptedInvite . (: []) <$> mstore AcceptedInviteData { aidPrev = maybe [] acceptedInviteData prev , aidToken = Just token @@ -261,7 +260,7 @@ instance Service InviteService where serviceHandler = fromStored >>> \case AcceptInvite token -> do - invites <- fromSetBy (comparing inviteToken) . lookupSharedValue . lsShared . fromStored <$> getLocalHead + invites <- fromSetBy (comparing inviteToken) <$> lookupSharedValueM case find ((Just token ==) . inviteToken) invites of Just invite | Just name <- inviteContact invite @@ -296,7 +295,7 @@ instance Service InviteService where asks (inviteHookReplyInvalid . svcAttributes) >>= ($ token) svcModify $ filter (/= token) - accepted <- fromSetBy (comparing acceptedInviteToken) . lookupSharedValue . lsShared . fromStored <$> getLocalHead + accepted <- fromSetBy (comparing acceptedInviteToken) <$> lookupSharedValueM case find ((Just token ==) . acceptedInviteToken) accepted of Just invite -> do aidata <- mstore AcceptedInviteData @@ -316,7 +315,7 @@ instance Service InviteService where then do svcSet $ filter (/= token) waitingTokens - accepted <- fromSetBy (comparing acceptedInviteToken) . lookupSharedValue . lsShared . fromStored <$> getLocalHead + accepted <- fromSetBy (comparing acceptedInviteToken) <$> lookupSharedValueM case find ((Just token ==) . acceptedInviteToken) accepted of Just invite -> do aidata <- mstore AcceptedInviteData @@ -343,7 +342,7 @@ instance Service InviteService where svcPrint $ "Received unknown invite packet" serviceNewPeer = do - invites <- fromSetBy (comparing acceptedInviteToken) . lookupSharedValue . lsShared . fromStored <$> getLocalHead + invites <- fromSetBy (comparing acceptedInviteToken) <$> lookupSharedValueM peerDigests <- asks $ identityOwnerDigests . svcPeerIdentity forM_ invites $ \case AcceptedInvite |