typos

1 files changed, 4 insertions, 5 deletions

diff --git a/server/src/Thermoprint/Server.hs b/server/src/Thermoprint/Server.hs
index eff6c3a..8cbe71d 100644
--- a/server/src/Thermoprint/Server.hs
+++ b/server/src/Thermoprint/Server.hs
@@ -41,8 +41,8 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
-import Data.Sequence (Map)
-import qualified Data.Sequence as Map
+import Data.Map (Map)
+import qualified Data.Map as Map
 
 import qualified Network.Wai.Handler.Warp as Warp
 import Network.Wai (Application)
@@ -70,7 +70,6 @@ data HandlerInput = HandlerInput { sqlPool :: ConnectionPool
 
 share [mkPersist sqlSettings, mkMigrate "migrateAll"] [persistLowerCase|
 Job
-    printer PrinterId
     content Printout
 Draft
     title DraftTitle Maybe
@@ -115,13 +114,13 @@ infixr 9 <||>
 
 thermoprintServer' :: ServerT ThermoprintAPI Handler
 thermoprintServer' = listPrinters
-                     :<|> listJobs <||> queueJob
+                     :<|> (listJobs :<|> queueJob)
                      :<|> getJob <||> jobStatus <||> deleteJob
                      :<|> (listDrafts :<|> addDraft)
                      :<|> updateDraft <||> getDraft <||> deleteDraft <||> printDraft
 
 
-listPrinters :: Handler (Set PrinterId)
+listPrinters :: Handler (Map PrinterId PrinterStatus)
 listPrinters = return Set.empty
 
 queueJob :: Maybe PrinterId -> Printout -> Handler API.JobId