More XEP-45 chatroom stuff.

2 files changed, 5 insertions, 4 deletions

diff --git a/Presence/Stanza/Parse.hs b/Presence/Stanza/Parse.hs
index 0335556b..b025f418 100644
--- a/Presence/Stanza/Parse.hs
+++ b/Presence/Stanza/Parse.hs
@@ -47,9 +47,9 @@ grokStanzaIQGet stanza = do
         "{urn:xmpp:ping}ping"     -> return Ping
         "{jabber:iq:roster}query" -> return RequestRoster
         "{http://jabber.org/protocol/disco#items}query"
-                                  -> return RequestItems
+                                  -> return $ RequestItems $ lookupAttrib "node" $ tagAttrs tag
         "{http://jabber.org/protocol/disco#info}query"
-                                  -> return RequestInfo
+                                  -> return $ RequestInfo $ lookupAttrib "node" $ tagAttrs tag
         name                      -> return $ UnrecognizedQuery name
 
 grokStanzaIQResult :: XML.Event -> NestingXML o IO (Maybe StanzaType)
diff --git a/Presence/Stanza/Types.hs b/Presence/Stanza/Types.hs
index 3e039a34..6c5b8867 100644
--- a/Presence/Stanza/Types.hs
+++ b/Presence/Stanza/Types.hs
@@ -34,9 +34,9 @@ data StanzaType
     | Pong
     | RequestResource (Maybe Text) (Maybe Text) -- ^ Client's name for this host followed by client's requested resource id.
     | SetResource
-    | RequestItems
+    | RequestItems (Maybe Text)
     | Items
-    | RequestInfo
+    | RequestInfo (Maybe Text)
     | Info
     | SessionRequest
     | UnrecognizedQuery Name
@@ -112,6 +112,7 @@ data JabberShow = Offline
  deriving (Show,Enum,Ord,Eq,Read)
 
 class StanzaFirstTag a where
+    -- Peek at the stanza open tag.
     stanzaFirstTag :: StanzaWrap a -> IO XML.Event
 instance StanzaFirstTag (TChan XML.Event) where
     stanzaFirstTag stanza = do