rename field of Item data type

source/Network/Xmpp/IM/Roster.hs

@@ -145,23 +145,23 @@ retrieveRoster mbOldRoster sess = do
                                                is)
 
 toItem :: QueryItem -> Item
-toItem qi = Item { approved = fromMaybe False (qiApproved qi)
+toItem qi = Item { riApproved = fromMaybe False (qiApproved qi)
-                 , ask = qiAsk qi
+                 , riAsk = qiAsk qi
-                 , jid = qiJid qi
+                 , riJid = qiJid qi
-                 , name = qiName qi
+                 , riName = qiName qi
-                 , subscription = fromMaybe None (qiSubscription qi)
+                 , riSubscription = fromMaybe None (qiSubscription qi)
-                 , groups = nub $ qiGroups qi
+                 , riGroups = nub $ qiGroups qi
                  }
 
 fromItem :: Item -> QueryItem
 fromItem i = QueryItem { qiApproved = Nothing
                        , qiAsk = False
-                       , qiJid = jid i
+                       , qiJid = riJid i
-                       , qiName = name i
+                       , qiName = riName i
-                       , qiSubscription = case subscription i of
+                       , qiSubscription = case riSubscription i of
                            Remove -> Just Remove
                            _ -> Nothing
-                       , qiGroups = nub $ groups i
+                       , qiGroups = nub $ riGroups i
                        }
 
 xpItems :: PU [Node] [QueryItem]

source/Network/Xmpp/IM/Roster/Types.hs

@@ -25,13 +25,13 @@ data Roster = Roster { ver :: Maybe Text
                      , items :: Map.Map Jid Item } deriving Show
 
 
-
+-- | Roster Items
-data Item = Item { approved :: Bool
+data Item = Item { riApproved :: Bool
-                 , ask :: Bool
+                 , riAsk :: Bool
-                 , jid :: Jid
+                 , riJid :: Jid
-                 , name :: Maybe Text
+                 , riName :: Maybe Text
-                 , subscription :: Subscription
+                 , riSubscription :: Subscription
-                 , groups :: [Text]
+                 , riGroups :: [Text]
                  } deriving Show
 
 data QueryItem = QueryItem { qiApproved :: Maybe Bool