Other cosmetics + version upgrade.
This commit is contained in:
parent
2318d55bdc
commit
7cefea4cbc
3 changed files with 3 additions and 3 deletions
|
@ -82,7 +82,7 @@ theDuck (DuckArgs channel seconds) = do
|
||||||
ducksWaitingForDeath <- if empty then return 0
|
ducksWaitingForDeath <- if empty then return 0
|
||||||
else liftIO $ modifyMVar ducksMVar (\x -> return (x - shots, x))
|
else liftIO $ modifyMVar ducksMVar (\x -> return (x - shots, x))
|
||||||
_ <- update' statDB . UpdateScore (getSender msg) $ computeScore ducksWaitingForDeath shots
|
_ <- update' statDB . UpdateScore (getSender msg) $ computeScore ducksWaitingForDeath shots
|
||||||
when (and [ ducksWaitingForDeath > 0, shots >= ducksWaitingForDeath ]) $ do
|
when ((ducksWaitingForDeath > 0) && (shots >= ducksWaitingForDeath)) $ do
|
||||||
_ <- liftIO $ takeMVar ducksMVar
|
_ <- liftIO $ takeMVar ducksMVar
|
||||||
time <- liftIO $ readMVar timeMVar
|
time <- liftIO $ readMVar timeMVar
|
||||||
duckSpawner channel time ducksMVar
|
duckSpawner channel time ducksMVar
|
||||||
|
|
|
@ -44,7 +44,7 @@ hasAccess (Just mask) right =
|
||||||
where
|
where
|
||||||
accessMatch :: AccessList -> Bool
|
accessMatch :: AccessList -> Bool
|
||||||
accessMatch (AccessList amask arights)
|
accessMatch (AccessList amask arights)
|
||||||
| mask == amask = or [Admin `L.elem` arights, right `L.elem` arights]
|
| mask == amask = (Admin `L.elem` arights) || (right `L.elem` arights)
|
||||||
| otherwise = False
|
| otherwise = False
|
||||||
|
|
||||||
-- Helpers
|
-- Helpers
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
Name: hsbot
|
Name: hsbot
|
||||||
Version: 0.4.16
|
Version: 0.4.17
|
||||||
Cabal-version: >=1.2
|
Cabal-version: >=1.2
|
||||||
Synopsis: A multipurposes IRC bot
|
Synopsis: A multipurposes IRC bot
|
||||||
Description:
|
Description:
|
||||||
|
|
Reference in a new issue