1 files changed, 10 insertions, 9 deletions

diff --git a/Announcer.hs b/Announcer.hs
index 9558e3eb..e9d83e65 100644
--- a/Announcer.hs
+++ b/Announcer.hs
@@ -57,9 +57,10 @@ unpackAnnounceKey _ (AnnounceKey bs) = return $ Char8.unpack bs
 -- 'Announce'.
 data ScheduledItem
     = DeleteAnnouncement
+      -- NewAnnouncement searchAgain search announce aInterval
     | NewAnnouncement (STM (IO ())) (IO ()) (IO ()) POSIXTime
     | Announce (STM (IO ())) (IO ()) POSIXTime
-    | SearchResult (STM (IO ()))
+    | ScheduledItem (Announcer -> AnnounceKey -> POSIXTime -> STM (IO ()))
     | StopAnnouncer
  -- Can't use Data because STM and IO. :(
  --   deriving Data {- itemStatusNum sch = constrIndex $ toConstr sch -}
@@ -73,7 +74,7 @@ itemStatusNum :: ScheduledItem -> Int
 itemStatusNum (DeleteAnnouncement   ) = 0
 itemStatusNum (NewAnnouncement    {}) = 1
 itemStatusNum (Announce           {}) = 2
-itemStatusNum (SearchResult       {}) = 3
+itemStatusNum (ScheduledItem      {}) = 3
 itemStatusNum (StopAnnouncer        ) = 4
 itemStatusNum _                       = error "itemStatusNum not in sync with ScheduledItem declaration."
 
@@ -182,7 +183,7 @@ schedule announcer k AnnounceMethod{aSearch,aPublish,aBuckets,aTarget,aInterval}
         onResult sr
             | Right _     <- aPublish = return True
             | Left sendit <- aPublish = do
-                scheduleImmediately announcer k $ SearchResult $ return $ do
+                scheduleImmediately announcer k $ ScheduledItem $ \_ _ _ -> return $ do
                     got <- sendit 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'
@@ -269,7 +270,12 @@ announceThread announcer = do
 performScheduledItem :: Announcer -> POSIXTime -> Binding' AnnounceKey POSIXTime ScheduledItem -> STM (Maybe (IO ()))
 performScheduledItem announcer now = \case
 
-    (Binding _ StopAnnouncer _) ->  return Nothing
+    (Binding _ StopAnnouncer _)          -> return Nothing
+
+    -- announcement removed:
+    (Binding _ DeleteAnnouncement _)     -> return $ Just $ return ()
+
+    (Binding k (ScheduledItem action) _) -> Just <$> action announcer k now
 
     -- announcement started:
     (Binding k (NewAnnouncement checkFin search announce interval) _) -> do
@@ -277,9 +283,6 @@ performScheduledItem announcer now = \case
                    (PSQ.insert' k (Announce checkFin announce interval) (now + interval))
         return $ Just $ void $ fork search
 
-    -- announcement removed:
-    (Binding k DeleteAnnouncement _) -> return $ Just $ return ()
-
     -- time for periodic announce:
     --   (re-)announce to the current known set of storing-nodes.
     --   TODO: If the search is finished, restart the search.
@@ -292,6 +295,4 @@ performScheduledItem announcer now = \case
             hPutStrLn stderr $ "This print avoids negative-time future scheduling. Weird bug. TODO: fix it. "++show now
             announce
 
-    (Binding _ (SearchResult action) _) -> Just <$> action
-