Diagnostic comments and debug print.

1 files changed, 9 insertions, 0 deletions

diff --git a/Presence/Presence.hs b/Presence/Presence.hs
index 4aa24eb5..c6bf9ffa 100644
--- a/Presence/Presence.hs
+++ b/Presence/Presence.hs
@@ -1007,6 +1007,14 @@ peerSubscriptionRequest state fail k stanza chan = do
     flip (maybe fail) mto_u $ \u -> do
     flip (maybe fail) mfrom_u $ \from_u -> do
     let profile = fromMaybe "." $ clientProfile <$> Map.lookup k cmap
+    -- XXX profile is wrong.
+    -- TODO Likely the problem is that k is a peer ConnectionKey and of course
+    --      will have no entry in the cmap.  Thus giving "." even though it ought
+    --      to be using a tox profile.
+    --
+    -- Solution 1: Only .tox peers go in a tox profile.
+    -- Solution 2: Duplicate non .tox peers in all profiles.
+    -- Solution 3: Only one profile is active at a time.
     resolved_subs <- resolvedFromRoster ConfigFiles.getSubscribers u profile
     let already_subscribed = elem (mfrom_u,k) resolved_subs
         is_wanted = case stanzaType stanza of
@@ -1151,6 +1159,7 @@ peerInformSubscription state fail k stanza = do
     was_solicited <- removeFromRosterFile ConfigFiles.modifySolicited user profile from'' addrs
     subs <- resolvedFromRoster ConfigFiles.getSubscribers user profile
     let is_sub = not . null $ map ((from_u,) . PeerKey) addrs `intersect` subs
+    putStrLn $ "DEBUG peerInformSubscription (is_sub,typ)=" ++ show (is_sub,stanzaType stanza)
     let (relationship,addf,remf) =
          case stanzaType stanza of
            PresenceInformSubscription True ->