summaryrefslogtreecommitdiff
path: root/ToxToXMPP.hs
diff options
context:
space:
mode:
Diffstat (limited to 'ToxToXMPP.hs')
-rw-r--r--ToxToXMPP.hs14
1 files changed, 2 insertions, 12 deletions
diff --git a/ToxToXMPP.hs b/ToxToXMPP.hs
index e2cefc9d..b004083f 100644
--- a/ToxToXMPP.hs
+++ b/ToxToXMPP.hs
@@ -14,7 +14,6 @@ module ToxToXMPP
14 , interweave 14 , interweave
15 ) where 15 ) where
16 16
17import Control.Monad.IO.Class
18import Data.Conduit as C 17import Data.Conduit as C
19import qualified Data.Conduit.List as CL 18import qualified Data.Conduit.List as CL
20import Data.XML.Types as XML 19import Data.XML.Types as XML
@@ -43,31 +42,22 @@ import qualified Network.Tox as Tox
43import Network.Tox.ContactInfo as Tox 42import Network.Tox.ContactInfo as Tox
44import qualified Network.Tox.Crypto.Handlers as Tox 43import qualified Network.Tox.Crypto.Handlers as Tox
45-- import qualified Network.Tox.DHT.Handlers as Tox 44-- import qualified Network.Tox.DHT.Handlers as Tox
46import Announcer
47import ClientState 45import ClientState
48import Control.Concurrent.STM
49import Control.Monad
50import Crypto.Tox
51import Data.Bits 46import Data.Bits
52import Data.Function 47import Data.Function
53import qualified Data.Map as Map 48import qualified Data.Map as Map
54import qualified Data.Set as Set 49import Data.Text (Text)
55import qualified Data.Text as T
56 ;import Data.Text (Text)
57import Data.Word 50import Data.Word
58import qualified Network.Kademlia.Routing as R 51import qualified Network.Kademlia.Routing as R
59import Network.Tox 52import Network.Tox
60import Network.Tox.ContactInfo
61import Network.Tox.DHT.Handlers 53import Network.Tox.DHT.Handlers
62import qualified Network.Tox.DHT.Transport as Tox 54import qualified Network.Tox.DHT.Transport as Tox
63 ;import Network.Tox.DHT.Transport (dhtpk, FriendRequest (..)) 55 ;import Network.Tox.DHT.Transport (FriendRequest (..), dhtpk)
64import Network.Tox.NodeId 56import Network.Tox.NodeId
65import qualified Network.Tox.Onion.Handlers as Tox 57import qualified Network.Tox.Onion.Handlers as Tox
66import qualified Network.Tox.Onion.Transport as Tox 58import qualified Network.Tox.Onion.Transport as Tox
67 ;import Network.Tox.Onion.Transport (OnionData (..)) 59 ;import Network.Tox.Onion.Transport (OnionData (..))
68import Presence 60import Presence
69import Presence
70import System.IO
71import Text.Read 61import Text.Read
72import XMPPServer (ConnectionKey) 62import XMPPServer (ConnectionKey)
73#ifdef THREAD_DEBUG 63#ifdef THREAD_DEBUG