From 7cefea4cbc17dda9cb59b8cb93c81472ce323225 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Sat, 1 Oct 2011 00:49:49 +0200
Subject: Other cosmetics + version upgrade.

---
 Hsbot/Plugin/Duck.hs | 2 +-
 Hsbot/Utils.hs       | 2 +-
 hsbot.cabal          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Hsbot/Plugin/Duck.hs b/Hsbot/Plugin/Duck.hs
index 1044591..c630c6a 100644
--- a/Hsbot/Plugin/Duck.hs
+++ b/Hsbot/Plugin/Duck.hs
@@ -82,7 +82,7 @@ theDuck (DuckArgs channel seconds) = do
                     ducksWaitingForDeath <- if empty then return 0
                                                      else liftIO $ modifyMVar ducksMVar (\x -> return (x - shots, x))
                     _ <- update' statDB . UpdateScore (getSender msg) $ computeScore ducksWaitingForDeath shots
-                    when (and [ ducksWaitingForDeath > 0, shots >= ducksWaitingForDeath ]) $ do
+                    when ((ducksWaitingForDeath > 0) && (shots >= ducksWaitingForDeath)) $ do
                         _ <- liftIO $ takeMVar ducksMVar
                         time <- liftIO $ readMVar timeMVar
                         duckSpawner channel time ducksMVar
diff --git a/Hsbot/Utils.hs b/Hsbot/Utils.hs
index 821f610..5d5c424 100644
--- a/Hsbot/Utils.hs
+++ b/Hsbot/Utils.hs
@@ -44,7 +44,7 @@ hasAccess (Just mask) right =
   where
     accessMatch :: AccessList -> Bool
     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
 
 -- Helpers
diff --git a/hsbot.cabal b/hsbot.cabal
index efcd91d..215d280 100644
--- a/hsbot.cabal
+++ b/hsbot.cabal
@@ -1,5 +1,5 @@
 Name:               hsbot
-Version:            0.4.16
+Version:            0.4.17
 Cabal-version:      >=1.2
 Synopsis:           A multipurposes IRC bot
 Description:
-- 
cgit v1.2.3