diff options
| -rw-r--r-- | Omni/Jr.hs | 1 | ||||
| -rw-r--r-- | Omni/Task.hs | 1 | ||||
| -rw-r--r-- | Omni/Task/Core.hs | 18 |
3 files changed, 2 insertions, 18 deletions
@@ -4,7 +4,6 @@ -- : out jr -- : dep sqlite-simple --- : dep sqids -- : dep warp -- : dep servant-server -- : dep lucid diff --git a/Omni/Task.hs b/Omni/Task.hs index 83b8e0d..3f21b80 100644 --- a/Omni/Task.hs +++ b/Omni/Task.hs @@ -5,7 +5,6 @@ -- : out task -- : dep sqlite-simple --- : dep sqids -- : modified by benign worker module Omni.Task where diff --git a/Omni/Task/Core.hs b/Omni/Task/Core.hs index bf52c2c..a68f37b 100644 --- a/Omni/Task/Core.hs +++ b/Omni/Task/Core.hs @@ -3,7 +3,6 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE NoImplicitPrelude #-} --- : dep sqids -- : dep http-api-data module Omni.Task.Core where @@ -24,7 +23,6 @@ import System.Directory (createDirectoryIfMissing, doesFileExist) import System.Environment (lookupEnv) import System.IO.Unsafe (unsafePerformIO) import Web.HttpApiData (FromHttpApiData (..)) -import qualified Web.Sqids as Sqids -- Core data types data Task = Task @@ -290,23 +288,11 @@ initTaskDb = do \ reason TEXT NOT NULL \ \)" --- Sqids configuration: lowercase alphabet only, minimum length 8 -sqidsOptions :: Sqids.SqidsOptions -sqidsOptions = - Sqids.defaultSqidsOptions - { Sqids.alphabet = "abcdefghijklmnopqrstuvwxyz0123456789", - Sqids.minLength = 8, - Sqids.blocklist = [] - } - --- Generate a short ID using sqids with sequential counter +-- Generate a sequential task ID (t-1, t-2, t-3, ...) generateId :: IO Text generateId = do counter <- getNextCounter - let encoded = case Sqids.runSqids sqidsOptions (Sqids.encode [counter]) of - Left _ -> "00000000" - Right sqid -> sqid - pure <| "t-" <> encoded + pure <| "t-" <> T.pack (show counter) -- Get the next counter value (atomically increments) getNextCounter :: IO Int |