diff options
author | joe <joe@jerkface.net> | 2013-07-14 03:53:39 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2013-07-14 03:53:39 -0400 |
commit | a48e699c956b66de5591638eddb68e251800ad51 (patch) | |
tree | 78e4249a43722b404f812f599d2b0e1293e9063a /Presence/XMPP.hs | |
parent | 1c02ee32d1986f011b4a8f28c0bde8a3a189cdcc (diff) |
Removed old or wrong comments
Diffstat (limited to 'Presence/XMPP.hs')
-rw-r--r-- | Presence/XMPP.hs | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/Presence/XMPP.hs b/Presence/XMPP.hs index 153e70f9..4c103880 100644 --- a/Presence/XMPP.hs +++ b/Presence/XMPP.hs | |||
@@ -162,20 +162,6 @@ gatherElement opentag empty = loop (empty `mplus` return opentag) 1 | |||
162 | _ | eventIsBeginElement tag -> loop ts' (cnt+1) | 162 | _ | eventIsBeginElement tag -> loop ts' (cnt+1) |
163 | _ -> loop ts' cnt | 163 | _ -> loop ts' cnt |
164 | 164 | ||
165 | {- | ||
166 | sourceStanza :: Monad m => Event -> ConduitM Event Event m () | ||
167 | sourceStanza opentag = yield opentag >> loop 1 | ||
168 | where | ||
169 | loop 0 = return () | ||
170 | loop cnt = do | ||
171 | e <- await | ||
172 | let go tag cnt = yield tag >> loop cnt | ||
173 | case e of | ||
174 | Just tag | eventIsEndElement tag -> go tag (cnt-1) | ||
175 | Just tag | eventIsBeginElement tag -> go tag (cnt+1) | ||
176 | Just tag -> go tag cnt | ||
177 | Nothing -> return () | ||
178 | -} | ||
179 | 165 | ||
180 | voidMaybeT body = (>> return ()) . runMaybeT $ body | 166 | voidMaybeT body = (>> return ()) . runMaybeT $ body |
181 | fixMaybeT f = (>> return ()) . runMaybeT . fix $ f | 167 | fixMaybeT f = (>> return ()) . runMaybeT . fix $ f |
@@ -369,14 +355,6 @@ handleIQGet session cmdChan tag = do | |||
369 | atomically . writeTChan cmdChan . Send $ pong | 355 | atomically . writeTChan cmdChan . Send $ pong |
370 | "{jabber:iq:roster}query" -> liftIO $ do | 356 | "{jabber:iq:roster}query" -> liftIO $ do |
371 | putStrLn $ "REQUESTED ROSTER " ++ show tag | 357 | putStrLn $ "REQUESTED ROSTER " ++ show tag |
372 | -- REQUESTED ROSTER EventBeginElement | ||
373 | -- (Name {nameLocalName = "iq", nameNamespace = Just "jabber:client", namePrefix = Nothing}) | ||
374 | -- [(Name { nameLocalName = "id" | ||
375 | -- , nameNamespace = Nothing | ||
376 | -- , namePrefix = Nothing}, | ||
377 | -- [ContentText "32a337c2-7b22-45b6-9d21-15ded0d079ec"]) | ||
378 | -- ,(Name {nameLocalName = "type", nameNamespace = Nothing, namePrefix = Nothing}, | ||
379 | -- [ContentText "get"])] | ||
380 | roster <- getRoster session stanza_id | 358 | roster <- getRoster session stanza_id |
381 | atomically $ do | 359 | atomically $ do |
382 | writeTChan cmdChan InterestedInRoster | 360 | writeTChan cmdChan InterestedInRoster |
@@ -766,7 +744,6 @@ clientRequestsSubscription session cmdChan stanza = do | |||
766 | then do | 744 | then do |
767 | addSolicited session to_str' to_jid | 745 | addSolicited session to_str' to_jid |
768 | putStrLn $ "added to solicited: " ++ show to_jid | 746 | putStrLn $ "added to solicited: " ++ show to_jid |
769 | -- TODO: notify peer. | ||
770 | else do | 747 | else do |
771 | -- addLocalSubscriber session to_str | 748 | -- addLocalSubscriber session to_str |
772 | -- self <- getJID session | 749 | -- self <- getJID session |
@@ -948,16 +925,6 @@ presenceStanza sock fromjid tojid typ = do | |||
948 | , EventEndElement "{jabber:server}presence" | 925 | , EventEndElement "{jabber:server}presence" |
949 | ] | 926 | ] |
950 | 927 | ||
951 | {- | ||
952 | toPeerChain | ||
953 | :: SocketLike sock => | ||
954 | sock | ||
955 | -> CachedMessages | ||
956 | -> TChan OutBoundMessage | ||
957 | -> Sink ByteString IO b | ||
958 | -> IO b | ||
959 | toPeerChain sock cache chan snk = toPeer sock cache chan $$ renderChunks =$ snk | ||
960 | -} | ||
961 | 928 | ||
962 | toPeer | 929 | toPeer |
963 | :: SocketLike sock => | 930 | :: SocketLike sock => |
@@ -1052,14 +1019,10 @@ seekRemotePeers config chan server_connections = do | |||
1052 | forM_ (Set.toList peers) $ \peer -> do | 1019 | forM_ (Set.toList peers) $ \peer -> do |
1053 | when (is_remote peer) $ | 1020 | when (is_remote peer) $ |
1054 | liftIO $ sendMessage server_connections (OutBoundPresence p) peer | 1021 | liftIO $ sendMessage server_connections (OutBoundPresence p) peer |
1055 | -- TODO: send presence probes for buddies | ||
1056 | -- TODO: cache remote presences for clients | ||
1057 | _ -> return (Just ()) | 1022 | _ -> return (Just ()) |
1058 | loop | 1023 | loop |
1059 | 1024 | ||
1060 | xmlifyPresenceForPeer sock (Presence jid stat) = do | 1025 | xmlifyPresenceForPeer sock (Presence jid stat) = do |
1061 | -- TODO: accept socket argument and determine local ip address | ||
1062 | -- connected to this peer. | ||
1063 | addr <- getSocketName sock | 1026 | addr <- getSocketName sock |
1064 | let n = name jid | 1027 | let n = name jid |
1065 | rsc = resource jid | 1028 | rsc = resource jid |