Handle requests

3 files changed, 7 insertions, 4 deletions

diff --git a/src/Data/Message.hs b/src/Data/Message.hs
index dfbc20b..c218cdc 100644
--- a/src/Data/Message.hs
+++ b/src/Data/Message.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DeriveGeneric #-}
 module Data.Message
     ( InMessage (..)
     , GMIUrl (..)
@@ -21,15 +22,17 @@ import qualified Text.URI as URI
 
 data InMessage = InMessage
     { hasAttach :: !Bool
-    , groupId   :: !Word
+    , groupId   :: !Text
     , isUser    :: !Bool
     , text      :: !Text
-    } deriving Show
+    } deriving (Show, Generic)
+
+instance NFData InMessage
 
 instance Ae.FromJSON InMessage where
     parseJSON = Ae.withObject "InMessage" $ \o -> InMessage
         <$> (o .: "attachments" >>= Ae.withArray "attachments" (pure . not . null))
-        <*> o .: "group-id"
+        <*> o .: "group_id"
         <*> ((==) ("user" :: Text) <$> o .: "sender_type")
         <*> o .: "text"
 
diff --git a/src/Tomato/.Post.hs.swp b/src/Tomato/.Post.hs.swp
deleted file mode 100644
index f823f90..0000000
--- a/src/Tomato/.Post.hs.swp
+++ /dev/null
diff --git a/src/Tomato/Validate.hs b/src/Tomato/Validate.hs
index a3dd328..0afc4b5 100644
--- a/src/Tomato/Validate.hs
+++ b/src/Tomato/Validate.hs
@@ -10,7 +10,7 @@ import Data.Message (InMessage (..))
 isTomato :: InMessage -> Bool
 isTomato m =
     not (hasAttach m) &&
-    groupId m == 87220147 && 
+    groupId m == "87220147" && 
     isUser m &&
     text m == "tomato"