Show Friend requests.

1 files changed, 13 insertions, 1 deletions

diff --git a/examples/dhtd.hs b/examples/dhtd.hs
index 9966fb32..4d9072b5 100644
--- a/examples/dhtd.hs
+++ b/examples/dhtd.hs
@@ -46,6 +46,8 @@ import GHC.Conc                  (labelThread)
 #endif
 import qualified Data.HashMap.Strict as HashMap
 import qualified Data.Vector as V
+import qualified Data.Text as T
+import qualified Data.Text.Encoding as T
 
 import Crypto.Tox -- (zeros32,SecretKey,PublicKey, generateSecretKey, toPublic, encodeSecret, decodeSecret, userKeys)
 import Network.UPNP as UPNP
@@ -450,7 +452,17 @@ clientSession s@Session{..} sock cnum h = do
                             forM pairs $ \(_,pk) -> delRoster roster pk
                             readTVar userkeys
                         hPutClient h . showReport $ map mkrow ks
-        ("roster", s) -> cmd0 $ atomically (dnsPresentation roster) >>= hPutClient h
+        ("roster", s) -> cmd0 $ join $ atomically $ do
+            dns <- dnsPresentation roster
+            fs <- HashMap.toList <$> friendRequests roster
+            let showFriend (remotekey,fr) =
+                    ("  " ++ show remotekey, T.unpack $ T.decodeUtf8 $ Tox.friendRequestText fr)
+                showAccount (me,cs) =
+                    [(show me,"")] ++ map showFriend cs
+                frs = fs >>= showAccount
+            return $ do
+                hPutClientChunk h $ unlines [ dns, "", "Friend Requests" ]
+                hPutClient h $ showReport frs
         ("g", s) | Just DHT{..} <- Map.lookup netname dhts
                     -> cmd0 $ do
                         -- arguments: method