asakul
/
pontarius-xmpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

rename StanzaID to StanzaId

master
Philipp Balzarek 13 years ago
parent
aebbabcef1
commit
c64beff3f6
3 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      source/Network/Xmpp/Concurrent/Types.hs
  2. 2
      source/Network/Xmpp/IM/Message.hs
  3. 16
      source/Network/Xmpp/Types.hs

2
source/Network/Xmpp/Concurrent/Types.hs
Unescape View File

@ -52,7 +52,7 @@ data Session = Session
-- | IQHandlers holds the registered channels for incomming IQ requests and -- | IQHandlers holds the registered channels for incomming IQ requests and
-- TMVars of and TMVars for expected IQ responses -- TMVars of and TMVars for expected IQ responses
type IQHandlers = (Map.Map (IQRequestType, Text) (TChan IQRequestTicket) type IQHandlers = (Map.Map (IQRequestType, Text) (TChan IQRequestTicket)
, Map.Map StanzaID (TMVar IQResponse) , Map.Map StanzaId (TMVar IQResponse)
) )
-- | Contains whether or not a reply has been sent, and the IQ request body to -- | Contains whether or not a reply has been sent, and the IQ request body to

2
source/Network/Xmpp/IM/Message.hs
Unescape View File

@ -80,7 +80,7 @@ body m = bodyContent <$> listToMaybe (bodies m)
-- | Generate a new instant message -- | Generate a new instant message
newIM newIM
:: Jid :: Jid
-> Maybe StanzaID -> Maybe StanzaId
-> Maybe LangTag -> Maybe LangTag
-> MessageType -> MessageType
-> Maybe MessageSubject -> Maybe MessageSubject

16
source/Network/Xmpp/Types.hs
Unescape View File

@ -27,7 +27,7 @@ module Network.Xmpp.Types
, StanzaError(..) , StanzaError(..)
, StanzaErrorCondition(..) , StanzaErrorCondition(..)
, StanzaErrorType(..) , StanzaErrorType(..)
, StanzaID(..) , StanzaId(..)
, XmppFailure(..) , XmppFailure(..)
, StreamErrorCondition(..) , StreamErrorCondition(..)
, Version(..) , Version(..)
@ -104,7 +104,7 @@ data Stanza = IQRequestS !IQRequest
-- | A "request" Info/Query (IQ) stanza is one with either "get" or "set" as -- | A "request" Info/Query (IQ) stanza is one with either "get" or "set" as
-- type. It always contains an xml payload. -- type. It always contains an xml payload.
data IQRequest = IQRequest { iqRequestID :: !StanzaID data IQRequest = IQRequest { iqRequestID :: !StanzaId
, iqRequestFrom :: !(Maybe Jid) , iqRequestFrom :: !(Maybe Jid)
, iqRequestTo :: !(Maybe Jid) , iqRequestTo :: !(Maybe Jid)
, iqRequestLangTag :: !(Maybe LangTag) , iqRequestLangTag :: !(Maybe LangTag)
@ -132,7 +132,7 @@ data IQResponse = IQResponseError IQError
deriving Show deriving Show
-- | The (non-error) answer to an IQ request. -- | The (non-error) answer to an IQ request.
data IQResult = IQResult { iqResultID :: !StanzaID data IQResult = IQResult { iqResultID :: !StanzaId
, iqResultFrom :: !(Maybe Jid) , iqResultFrom :: !(Maybe Jid)
, iqResultTo :: !(Maybe Jid) , iqResultTo :: !(Maybe Jid)
, iqResultLangTag :: !(Maybe LangTag) , iqResultLangTag :: !(Maybe LangTag)
@ -140,7 +140,7 @@ data IQResult = IQResult { iqResultID :: !StanzaID
} deriving Show } deriving Show
-- | The answer to an IQ request that generated an error. -- | The answer to an IQ request that generated an error.
data IQError = IQError { iqErrorID :: !StanzaID data IQError = IQError { iqErrorID :: !StanzaId
, iqErrorFrom :: !(Maybe Jid) , iqErrorFrom :: !(Maybe Jid)
, iqErrorTo :: !(Maybe Jid) , iqErrorTo :: !(Maybe Jid)
, iqErrorLangTag :: !(Maybe LangTag) , iqErrorLangTag :: !(Maybe LangTag)
@ -149,7 +149,7 @@ data IQError = IQError { iqErrorID :: !StanzaID
} deriving Show } deriving Show
-- | The message stanza. Used for /push/ type communication. -- | The message stanza. Used for /push/ type communication.
data Message = Message { messageID :: !(Maybe StanzaID) data Message = Message { messageID :: !(Maybe StanzaId)
, messageFrom :: !(Maybe Jid) , messageFrom :: !(Maybe Jid)
, messageTo :: !(Maybe Jid) , messageTo :: !(Maybe Jid)
, messageLangTag :: !(Maybe LangTag) , messageLangTag :: !(Maybe LangTag)
@ -158,7 +158,7 @@ data Message = Message { messageID :: !(Maybe StanzaID)
} deriving Show } deriving Show
-- | An error stanza generated in response to a 'Message'. -- | An error stanza generated in response to a 'Message'.
data MessageError = MessageError { messageErrorID :: !(Maybe StanzaID) data MessageError = MessageError { messageErrorID :: !(Maybe StanzaId)
, messageErrorFrom :: !(Maybe Jid) , messageErrorFrom :: !(Maybe Jid)
, messageErrorTo :: !(Maybe Jid) , messageErrorTo :: !(Maybe Jid)
, messageErrorLangTag :: !(Maybe LangTag) , messageErrorLangTag :: !(Maybe LangTag)
@ -218,7 +218,7 @@ instance Read MessageType where
readsPrec _ _ = [(Normal, "")] readsPrec _ _ = [(Normal, "")]
-- | The presence stanza. Used for communicating status updates. -- | The presence stanza. Used for communicating status updates.
data Presence = Presence { presenceID :: !(Maybe StanzaID) data Presence = Presence { presenceID :: !(Maybe StanzaId)
, presenceFrom :: !(Maybe Jid) , presenceFrom :: !(Maybe Jid)
, presenceTo :: !(Maybe Jid) , presenceTo :: !(Maybe Jid)
, presenceLangTag :: !(Maybe LangTag) , presenceLangTag :: !(Maybe LangTag)
@ -228,7 +228,7 @@ data Presence = Presence { presenceID :: !(Maybe StanzaID)
-- | An error stanza generated in response to a 'Presence'. -- | An error stanza generated in response to a 'Presence'.
data PresenceError = PresenceError { presenceErrorID :: !(Maybe StanzaID) data PresenceError = PresenceError { presenceErrorID :: !(Maybe StanzaId)
, presenceErrorFrom :: !(Maybe Jid) , presenceErrorFrom :: !(Maybe Jid)
, presenceErrorTo :: !(Maybe Jid) , presenceErrorTo :: !(Maybe Jid)
, presenceErrorLangTag :: !(Maybe LangTag) , presenceErrorLangTag :: !(Maybe LangTag)

Write Preview
Loading…
Cancel
Save