merge and removed hehe

cnb.hs

@@ -81,8 +81,8 @@ deleteKeyValue key = do
   let sn = [(k,v) | (k,v) <- s, k /= key]
   putStore (sn)
   
-matches :: String -> MyStateM (Maybe Value)
-matches s = do
+match :: String -> MyStateM (Maybe Value)
+match s = do
   st <- getStore
   case (find (\(key, value) -> s =~ key) st) of
     Nothing -> return Nothing
@@ -120,7 +120,7 @@ evalPrivmsg (Just m@(Message n _ te)) = do
   let pat = nick ++ ":(.*)"
   let r = te =~ pat :: [[String]]
   case r of
-    [] -> do m <- matches te
+    [] -> do m <- Main.match te
              case m of
                Just v -> privmsg v
                Nothing -> return ()
@@ -144,7 +144,7 @@ action "list" (Message n _ _) = do
   mapM (\(k,v) -> msg (k ++ "~" ++ v) n) st
   return () 
 action "leave" (Message n _ _) = do
-  leave ("Fuck you " ++ n ++ ", I'm quitting!")
+  leave ("Ok " ++ n ++ ", I'm quitting!")
 action "implode" (Message n _ _) = do
     leave ("whoooooooshhhhh ...")
 action "explode" (Message n _ _) = do
@@ -246,8 +246,8 @@ startStore = [
     ("(E|e)rlang", "Oh yeah!"),
     ("(H|h)askell", "Ich bin in Haskell geschrieben."),
     ("danke", "np"),
-    ("^np$", "schmück dich nicht mit fremden Federn."),
-    ("^hehe$", "was gibt es da zu lachen?")
+    -- ("^hehe$", "was gibt es da zu lachen?"),
+    ("^np$", "schmück dich nicht mit fremden Federn.")
   ]
   
 -- ü