3 files changed, 7 insertions, 4 deletions

diff --git a/Announcer.hs b/Announcer.hs
index 37ed03ef..ef931cce 100644
--- a/Announcer.hs
+++ b/Announcer.hs
@@ -17,6 +17,7 @@ module Announcer
     , stopAnnouncer
     , cancel
     , itemStatusNum
+    , runAction
 
     -- lower level, Announcer.Tox needs these.
     , scheduleImmediately
@@ -111,6 +112,9 @@ scheduleAbs :: Announcer -> AnnounceKey -> ScheduledItem -> POSIXTime -> STM ()
 scheduleAbs announcer k item absTime =
     writeTChan (commander announcer) $ ScheduleAction (k, absTime, item)
 
+runAction :: Announcer -> IO () -> STM ()
+runAction announcer = writeTChan (commander announcer) . RunAction
+
 -- | Terminate the 'Announcer' thread.  Don't use the Announcer after this.
 stopAnnouncer :: Announcer -> IO ()
 stopAnnouncer announcer = do
@@ -139,7 +143,7 @@ readTChanTimeout delay pktChannel = do
 toMicroseconds :: POSIXTime -> Int
 toMicroseconds = round . (* 1000) . (* 1000)
 
-data SchedulerCommand = ShutdownScheduler | ScheduleAction KPS
+data SchedulerCommand = ShutdownScheduler | ScheduleAction KPS | RunAction (IO ())
 
 listener :: Announcer -> IO ()
 listener announcer = relisten
@@ -174,6 +178,7 @@ listener announcer = relisten
         handleCommand =
           \case
             ShutdownScheduler -> atomically declareInactive
+            RunAction io -> io >> relisten
             ScheduleAction (k, p, s) -> do
               atomically $
                 modifyTVar
diff --git a/Announcer/Tox.hs b/Announcer/Tox.hs
index d0fc828f..38741d10 100644
--- a/Announcer/Tox.hs
+++ b/Announcer/Tox.hs
@@ -185,8 +185,7 @@ scheduleSearch announcer k SearchMethod{sSearch,sWithResult,sNearestNodes,sTarge
     ns <- atomically $ newTVar MM.empty
     let astate = AnnounceState st ns
         onResult sr = do
-                -- XXX: Using /k/ here as the announce key is causing the search not to repeat.
-                scheduleImmediately announcer k $ ScheduledItem $ \_ _ _ -> return $ do
+                runAction announcer $ do
                     got <- sWithResult r sr
                     -- If we had a way to get the source of a search result, we might want to
                     -- treat it similarly to an announcing node and remember it in the 'aStoringNodes'
diff --git a/ToxToXMPP.hs b/ToxToXMPP.hs
index c61764ef..9391a232 100644
--- a/ToxToXMPP.hs
+++ b/ToxToXMPP.hs
@@ -175,7 +175,6 @@ startConnecting0 tx them contact = do
                     -- likelihood of failure as the chances of packet loss
                     -- happening to all (up to to 8) packets sent is low.
                     --
-            -- TODO: Reschedule this as appropriate within 'dispatch' function.
             scheduleSearch announcer
                      akey
                      (SearchMethod   (toxQSearch tox)