Browse Source

rename field of Item data type

master
Philipp Balzarek 13 years ago
parent
commit
08390cc32a
  1. 20
      source/Network/Xmpp/IM/Roster.hs
  2. 14
      source/Network/Xmpp/IM/Roster/Types.hs

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

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

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

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

Loading…
Cancel
Save