From f0a888decf6b84ccd22a3f18b8ba22969dc497b1 Mon Sep 17 00:00:00 2001
From: nek0 <nek0@nek0.eu>
Date: Wed, 28 Feb 2024 13:09:05 +0100
Subject: [PATCH] some cleaning

---
 app/Main.hs   |  5 +----
 mateamt.cabal |  3 +--
 src/API.hs    | 11 +++++------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/Main.hs b/app/Main.hs
index 990874f..9b62e97 100644
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -11,7 +11,6 @@ module Main where
 import Prelude as P
 
 import Crypto.JWT hiding (Context, header)
-import Crypto.JOSE.JWK hiding (Context)
 
 import Control.Concurrent.STM (newTQueueIO)
 import Control.Concurrent (forkIO)
@@ -20,9 +19,7 @@ import Servant
 import Servant.Server.Experimental.Auth
 import qualified Servant.OpenApi as OA
 import Servant.Swagger.UI
-import Servant.RawM
-
-import qualified Data.Aeson as A
+import Servant.RawM.Server
 
 import Data.Set as S (empty)
 import qualified Data.ByteString.Lazy as B
diff --git a/mateamt.cabal b/mateamt.cabal
index 130ff2b..f3f26aa 100644
--- a/mateamt.cabal
+++ b/mateamt.cabal
@@ -93,7 +93,6 @@ library
     , servant
     , servant-server
     , servant-openapi3
-    , servant-rawm >= 0.3.0.0
     , servant-rawm-server
     , opaleye
     , aeson
@@ -151,7 +150,7 @@ executable mateamt
     , network
     , servant
     , servant-server
-    , servant-rawm
+    , servant-rawm-server
     , servant-openapi3
     , servant-swagger-ui
     , servant-swagger-ui-core
diff --git a/src/API.hs b/src/API.hs
index becffc5..7bb6f10 100644
--- a/src/API.hs
+++ b/src/API.hs
@@ -13,8 +13,7 @@ import Servant.Server
 
 import Data.Proxy
 
-import Servant.RawM
-import Servant.RawM.Server ()
+import Servant.RawM.Server
 
 -- internal imports
 
@@ -124,7 +123,7 @@ journalShowLink :: Maybe Int -> Maybe Int -> Link
 journalPostCheck :: Link
 
 avatarGetLink :: Int -> Link
-avaterInsertLink :: Link
+avatarInsertLink :: Link
 avatarUpdateLink :: Int -> Link
 avatarListLink :: Link
 
@@ -137,7 +136,7 @@ roleAssociationSubmitLink :: Link
 roleAssociationDeleteLink :: Link
 
 settingsGetLink :: Link
-settingsUpdateLnk :: Link
+settingsUpdateLink :: Link
 
 metaGetLink :: Link
 
@@ -168,7 +167,7 @@ metaGetLink :: Link
   journalPostCheck :<|>
 
   avatarGetLink :<|>
-  avaterInsertLink :<|>
+  avatarInsertLink :<|>
   avatarUpdateLink :<|>
   avatarListLink :<|>
 
@@ -181,7 +180,7 @@ metaGetLink :: Link
   roleAssociationDeleteLink :<|>
 
   settingsGetLink :<|>
-  settingsUpdateLnk :<|>
+  settingsUpdateLink :<|>
 
   metaGetLink
   ) = allLinks (Proxy :: Proxy MateAPI)