Garmelon/euph-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix update sometimes tracking the bot itself

Browse source
This commit is contained in:
Joscha 2018-02-25 21:54:52 +00:00
parent 01454fe6d1
commit 883c905797
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/EuphApi/Utils/Listing.hs
View file

@ -56,8 +56,10 @@ fromList = Listing . M.fromList . map (\s -> (E.sessSessionID s, s))
-- The 'TVar' containing the listing should be a part of the connection specific -- The 'TVar' containing the listing should be a part of the connection specific
-- bot data. -- bot data.
update :: TVar Listing -> E.Event -> E.Bot b c () update :: TVar Listing -> E.Event -> E.Bot b c ()
update lVar (E.SnapshotEvent _ list _ _) = update lVar (E.SnapshotEvent _ list _ _) = do
liftIO $ atomically $ writeTVar lVar (fromList list) myID <- E.sessSessionID <$> E.getOwnView
let l = remove myID $ fromList list
liftIO $ atomically $ writeTVar lVar l
update lVar (E.JoinEvent s) = update lVar (E.JoinEvent s) =
withAskWho lVar $ liftIO $ atomically $ do withAskWho lVar $ liftIO $ atomically $ do
(Listing m) <- readTVar lVar (Listing m) <- readTVar lVar
@ -78,7 +80,11 @@ update _ _ = return ()
withAskWho :: TVar Listing -> E.Bot b c Bool -> E.Bot b c () withAskWho :: TVar Listing -> E.Bot b c Bool -> E.Bot b c ()
withAskWho lVar f = do withAskWho lVar f = do
ask <- f ask <- f
when ask $ E.fork $ E.who >>= (liftIO . atomically . writeTVar lVar . fromList) when ask $ E.fork $ do
myID <- E.sessSessionID <$> E.getOwnView
list <- E.who
let l = remove myID $ fromList list
liftIO $ atomically $ writeTVar lVar l
-- | Add a new 'E.SessionView' to the listing (call on a 'E.JoinEvent'). -- | Add a new 'E.SessionView' to the listing (call on a 'E.JoinEvent').
add :: E.SessionView -> Listing -> Listing add :: E.SessionView -> Listing -> Listing