Jon Kristensen
330030a57f
Merge pull request #33 from jonkri/master
...
Add some `Jid' utility functions; don't allow construction of `Jid'
13 years ago
Jon Kristensen
f561c9aea3
Add some `Jid' utility functions; don't allow construction of `Jid'
...
Fixes #32 .
13 years ago
Philipp Balzarek
87c83080e2
add travis-ci support
13 years ago
Philipp Balzarek
5f1e2f6c3f
Merge branch 'master' into upstream
13 years ago
Philipp Balzarek
5ad6c7f7c0
add a test case for closed connection
13 years ago
Jon Kristensen
32a18eecea
Merge pull request #31 from jonkri/master
...
Provide access to StanzaID generator in Network.Xmpp (`newStanzaID')
13 years ago
Jon Kristensen
8f00c6f7d9
Provide access to StanzaID generator in Network.Xmpp (`newStanzaID')
...
Fixes #22 .
13 years ago
Jon Kristensen
343bc90d97
Merge pull request #30 from jonkri/master
...
Wrap `AuthFailure' in `XmppAuthFailure'
13 years ago
Jon Kristensen
78b9c68c3a
Wrap `AuthFailure' in `XmppAuthFailure'
...
Moved `AuthFailure' to Network.Xmpp.Types.
Fixes #11 .
13 years ago
Philipp Balzarek
6c2830f852
fix log messages in Network.Xmpp.Stream (XMPP => Xmpp)
13 years ago
Philipp Balzarek
e0821567de
run connectionClosedHandler on calls of closeConnection
13 years ago
Philipp Balzarek
53b73bc905
allow read Worker to close streams on read failure and prevent it from stopping itself in this case
13 years ago
Philipp Balzarek
f0d558a528
reinstate withConnection and fix closeConnection
13 years ago
Philipp Balzarek
c56f9c88cd
fix documentation type in Network.Xmpp.Types
13 years ago
Philipp Balzarek
c5f8886152
rename sessionClosedHandler configuration option to onConnectionClosed
13 years ago
Philipp Balzarek
24a97e84eb
remove duplicate export of InstantMessage in Network.Xmpp.IM
13 years ago
Philipp Balzarek
414aa33f86
change loggers in Network.Xmpp.Tls to log to Pontarius.Xmpp.Tls (was Pontarius.Xmpp)
13 years ago
Philipp Balzarek
3ac2079f27
add Finished state to ConnectionState
13 years ago
Philipp Balzarek
2aab7710e1
move SessionConfiguration to Network.Xmpp.Concurrent.Types
13 years ago
Philipp Balzarek
34e80d8fe2
export setConnectionClosedHandler
13 years ago
Jon Kristensen
7be237b83a
Merge pull request #29 from jonkri/master
...
Apply various minor fixes
13 years ago
Jon Kristensen
61d1e6ed7a
examples/echoclient/Main.hs: Adapt to new API
13 years ago
Jon Kristensen
d7de7ee17d
pontarius-xmpp.cabal: Add bugtracker URL and change descriptions
13 years ago
Jon Kristensen
03ec46cd2f
README.md: Clarifications, mention ICU dependency, and conform to API
13 years ago
Jon Kristensen
2ca1ca20bb
Remove IsString instance of `Jid'
...
IsString instances are never supposed to fail, but parsing Strings to
JIDs might. We might do this later with Template Haskell instead, or
something.
13 years ago
Jon Kristensen
08d9439b39
Message.hs: Replace "theadID" with "threadID"
...
Fixes #23 .
13 years ago
Jon Kristensen
762bca6e83
Merge branch 'master' of git://github.com/jonkri/pontarius-xmpp into jonkri-master
...
Conflicts:
source/Network/Xmpp.hs
source/Network/Xmpp/Types.hs
13 years ago
Jon Kristensen
c02f18b997
Add Read and Show instances for Jid
...
Here's a hack with `Read' and `Show' instances for Jid, as discussed.
I didn't have the time or patience to make it elegant, but at least it
does the job.
I'm calling it `jid' instead of `toJid' for the time-being since
`toJid' is already used in the stream configuration record.
Fixes #24 .
13 years ago
Jon Kristensen
c534456767
Remove unsuitable `Read' instance for `Jid'
...
The way I understand it, the `Show' and `Read' instances are for `String' representations that can be Haskell code. A proper `Show' instance of `Jid' would produce something like `Jid (Just "test") "example.com" Nothing'. A proper `Read' instance of `Jid' would parse something like that `String' value, and would stop parsing when completed.
This patch automatically derives the `Show' instance from `Jid'. It also uses the previous `Show' instance to create a pretty printer, `jidToText'. It also provides a (trivial) `jidToTexts'. As an automatically derived `Read' instance could be used to create invalid `Jid' values and affect the correctness of applications using Pontarius XMPP, such a derivation has not been included. This required some changes in the `Jid' marshalling code, which assumed a `Read' instance.
Since we provide `jidFromText', I'm assuming that no-one needs a `Read' instance of `Jid'.
Fixes #24 .
13 years ago
Jon Kristensen
b891ea321b
Merge branch 'master' of github.com:pontarius/pontarius-xmpp
13 years ago
Jon Kristensen
8a58fe9b08
Suggested solution for #8
...
As I think the `SaslHandler's might change relatively frequently
depending on the value of `ConnectionState', I hereby suggest that the
handler value passed to `session' is changed from `[SaslHandler]' to
`(ConnectionState -> [SaslHandler]'.
Most people would probably just do `\_ -> scramSha1...', but I guess
the extra flexibility this provides makes up for the slightly more
complicated API.
13 years ago
Philipp Balzarek
dd442a4446
add Default instance for InstantMessage and IMPresence
13 years ago
Jon Kristensen
42a26924aa
Merge pull request #26 from singpolyma/issue-25
...
Try error before normal
13 years ago
Stephen Paul Weber
46f9ecdd45
Try error before normal
...
Since the normal message parser will actually match the error parser.
Closes #25
13 years ago
Jon Kristensen
e4db793478
pontarius-xmpp.cabal: Changes for new GitHub repository location
13 years ago
Jon Kristensen
ae2effa1cf
Merge pull request #20 from Philonous/master
...
incremental changes
13 years ago
Philipp Balzarek
a2bab58525
add Default instance for Message and Presence
13 years ago
Philipp Balzarek
96b6e5b6e9
derive Show for IMPresence
13 years ago
Philipp Balzarek
c01fe10999
add cleseConnection and endSession
13 years ago
Philipp Balzarek
a03df77a04
fix xpPresence
13 years ago
Philipp Balzarek
ef495426da
Merge remote-tracking branch 'nejla/master'
13 years ago
Philipp Balzarek
a7ac1e59e2
change reader conduit to buffered source
...
kill reader thread when end of stream is reached
13 years ago
Jon Kristensen
fc2ececcf4
Modify `PresenceType'; update pickler; skip Maybe in `presenceType'
...
Fixes #15 .
13 years ago
Philipp Balzarek
a130d611f4
add getStanza and getStanzaChan
13 years ago
Jon Kristensen
b64c61299c
Export various types
...
Types that are exported are:
Network.Xmpp:
* SaslFailure (..)
* StanzaHandler (..)
Network.Xmpp.Internal
* ConnectionState (..)
* Stanza (..)
* TlsBehaviour (..)
Network.Xmpp.IM
* InstantMessage (..)
* Subscription (..)
Fixes #10 .
Fixes #12 .
Fixes #16 .
13 years ago
Jon Kristensen
f0346b92e9
answerMessage: Set "from" to Nothing
...
For some reason, answerMessage used to set messageFrom = messageTo,
while I believe that it should just set it to Nothing (the server will
set the "from" attribute for us).
Fixes #7 .
13 years ago
Jon Kristensen
cd251b3edd
Bumbed dependencies of `containers' and `network'
...
We need 0.5 of `containers' to get Data.Map.Strict
We need 2.4.1 of `network' to get Show instance of PortID
13 years ago
Jon Kristensen
2fd4e9210e
Merge remote-tracking branch 'philonous/master'
...
Conflicts:
source/Network/Xmpp/Concurrent.hs
source/Network/Xmpp/IM/Roster.hs
source/Network/Xmpp/Types.hs
13 years ago
Philipp Balzarek
008398e75f
export nsHack from Network.Xmpp.Stream
13 years ago
Philipp Balzarek
3fd8859e2d
fix debug messages in Network.Xmpp.TLS
13 years ago