core: redeem badge codes (#7438)

apps/simplex-directory-service/src/Directory/Service.hs

@@ -47,9 +47,9 @@ import Directory.Options
 import Directory.Search
 import Directory.Store
 import Directory.Store.Migrate
-import Directory.Util
 import Simplex.Chat.Bot
 import Simplex.Chat.Bot.KnownContacts
+import Simplex.Chat.Bot.Store
 import Simplex.Chat.Controller
 import Simplex.Chat.Core
 import Simplex.Chat.Library.Internal (setGroupLinkData)

apps/simplex-directory-service/src/Directory/Store.hs

@@ -68,7 +68,7 @@ import qualified Data.Text as T
 import Data.Text.Encoding (encodeUtf8)
 import Data.Time.Clock (UTCTime (..), getCurrentTime)
 import Directory.Search
-import Directory.Util
+import Simplex.Chat.Bot.Store
 import Simplex.Chat.Controller
 import Simplex.Chat.Names (claimDomain)
 import Simplex.Chat.Options.DB (FromField (..), ToField (..))

apps/simplex-directory-service/src/Directory/Util.hs

@@ -1,31 +0,0 @@
-{-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE NamedFieldPuns #-}
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE ScopedTypeVariables #-}
-
-module Directory.Util where
-
-import Control.Logger.Simple
-import Control.Monad.Except
-import Data.Text (Text)
-import qualified Data.Text as T
-import Simplex.Chat.Controller
-import Simplex.Chat.Types
-import Simplex.Messaging.Agent.Store.Common (withTransaction)
-import qualified Simplex.Messaging.Agent.Store.DB as DB
-import Simplex.Messaging.Util (catchAll)
-
-storeCxt :: ChatController -> StoreCxt
-storeCxt ChatController {config} = mkStoreCxt config
-{-# INLINE storeCxt #-}
-
-withDB' :: Text -> ChatController -> (DB.Connection -> IO a) -> IO (Either String a)
-withDB' cxt cc a = withDB cxt cc $ ExceptT . fmap Right . a
-
-withDB :: Text -> ChatController -> (DB.Connection -> ExceptT String IO a) -> IO (Either String a)
-withDB cxt ChatController {chatStore} action = do
-  r_ <- withTransaction chatStore (runExceptT . action) `catchAll` (pure . Left . show)
-  case r_ of
-    Left e -> logError $ "Database error: " <> cxt <> " " <> T.pack e
-    Right _ -> pure ()
-  pure r_