From f6f056859470970669e59c1b6aeac6fdaccfd9af Mon Sep 17 00:00:00 2001
From: me <me@alloca.space>
Date: Tue, 17 Dec 2024 10:47:00 +0200
Subject: [PATCH] a few more fixes

---
 app/DB.hs            | 12 ++++++------
 app/Routes.hs        |  6 +++---
 src/Fedi/Requests.hs |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/DB.hs b/app/DB.hs
index 434a1bf..f6eac8d 100644
--- a/app/DB.hs
+++ b/app/DB.hs
@@ -29,7 +29,7 @@ data DB
   , insertNote :: NoteEntry -> IO (DB.Int64, Note)
   , insertFollower ::
       forall a. Typeable a => FollowerEntry -> (DB.Int64 -> IO a) -> IO a
-  , deleteFollower :: FollowerEntry -> IO DB.Int64
+  , deleteFollower :: FollowerEntry -> IO (Maybe DB.Int64)
   , getFollowers :: IO [Follower]
   }
 
@@ -156,10 +156,10 @@ insertFollowerToDb follower = do
   [n] <- map decodeIntRow <$> uncurry DB.runWith (insertFollowerSQL follower)
   pure n
 
-deleteFollowerFromDb :: FollowerEntry -> DB.SQLite DB.Int64
+deleteFollowerFromDb :: FollowerEntry -> DB.SQLite (Maybe DB.Int64)
 deleteFollowerFromDb follower = do
-  [n] <- map decodeIntRow <$> uncurry DB.runWith (deleteFollowerSQL follower)
-  pure n
+  ns <- map decodeIntRow <$> uncurry DB.runWith (deleteFollowerSQL follower)
+  pure $ listToMaybe ns
 
 getFollowersFromDb :: Url -> DB.SQLite [Follower]
 getFollowersFromDb url =
@@ -248,7 +248,7 @@ deleteFollowerSQL follower =
   ( [r|
       DELETE FROM follower
       WHERE follow_id = ? AND actor = ?
-      RETURNING follow_id
+      RETURNING id
     |]
   ,
     [ DB.SQLText follower.followId
@@ -310,7 +310,7 @@ decodeNoteRow = \case
 decodeIntRow :: [DB.SQLData] -> DB.Int64
 decodeIntRow = \case
   [DB.SQLInteger fid] -> fid
-  row -> error $ "Couldn't decode row as NoteId: " <> show row
+  row -> error $ "Couldn't decode row as id: " <> show row
 
 decodeFollowerRow :: [DB.SQLData] -> Follower
 decodeFollowerRow = \case
diff --git a/app/Routes.hs b/app/Routes.hs
index 4d5d134..383604e 100644
--- a/app/Routes.hs
+++ b/app/Routes.hs
@@ -146,7 +146,7 @@ handleInbox db detailsFile activity = do
                   )
                 callback =
                   ( \(insertId :: DB.Int64) -> do
-                    (result :: A.Value) <- Fedi.sendPost
+                    result <- Fedi.sendPost
                       details
                       (actor.unwrap <> "/inbox")
                       ( Fedi.makeAccept
@@ -196,5 +196,5 @@ sendFollowers details db message = do
   followers <- db.getFollowers
   Fedi.for_ followers \follower -> do
     Async.async $ do
-      result <- Fedi.sendPost @A.Value details (T.unpack follower.actorId <> "/inbox") message
-      print (follower.actorId, A.encode result)
+      bs <- Fedi.sendPost details (T.unpack follower.actorId <> "/inbox") message
+      print (follower.actorId, bs)
diff --git a/src/Fedi/Requests.hs b/src/Fedi/Requests.hs
index da47ec8..9211fd2 100644
--- a/src/Fedi/Requests.hs
+++ b/src/Fedi/Requests.hs
@@ -13,11 +13,11 @@ import Text.URI qualified as URI
 import Data.Text qualified as T
 
 sendPost
-  :: (A.FromJSON output, A.ToJSON input)
+  :: A.ToJSON input
   => UserDetails
   -> String
   -> input
-  -> IO output
+  -> IO ByteString
 sendPost details url payload = do
   uri <- URI.mkURI $ fromString url
   let encoded = BSL.toStrict $ A.encode payload
@@ -29,7 +29,7 @@ sendPost details url payload = do
         Req.POST
         url'
         (Req.ReqBodyBs encoded)
-        Req.jsonResponse
+        Req.bsResponse
         ( scheme
           <> sigHeaders httpSignature
         )