builds

src/Handler/Types/Status.hs

@@ -8,31 +8,20 @@ import           Startlude               hiding ( toLower )
 import           Data.Aeson
 import           Yesod.Core.Content
 
+import           Data.Text
 import           Lib.Types.Emver
 import           Orphans.Emver                  ( )
-import           Data.Text
 
 data AppVersionRes = AppVersionRes
-    { appVersionVersion      :: Version
-    , appVersionMinCompanion :: Maybe Version
-    , appVersionReleaseNotes :: Maybe Text
+    { appVersionVersion :: Version
     }
     deriving (Eq, Show)
 instance ToJSON AppVersionRes where
-    toJSON AppVersionRes { appVersionVersion, appVersionMinCompanion, appVersionReleaseNotes } =
-        let rn = case appVersionReleaseNotes of
-                Nothing -> []
-                Just x  -> ["release-notes" .= x]
-            mc = case appVersionMinCompanion of
-                Nothing -> []
-                Just x  -> ["minCompanion" .= x]
-        in  object $ ["version" .= appVersionVersion] <> mc <> rn
+    toJSON AppVersionRes { appVersionVersion } = object $ ["version" .= appVersionVersion]
 instance ToContent AppVersionRes where
     toContent = toContent . toJSON
 instance ToTypedContent AppVersionRes where
     toTypedContent = toTypedContent . toJSON
-
--- Ugh
 instance ToContent (Maybe AppVersionRes) where
     toContent = toContent . toJSON
 instance ToTypedContent (Maybe AppVersionRes) where
@@ -47,9 +36,10 @@ instance ToJSON SystemStatus where
     toJSON = String . toLower . show
 
 data OSVersionRes = OSVersionRes
-    { osVersionStatus :: SystemStatus
+    { osVersionStatus  :: SystemStatus
     , osVersionVersion :: Version
-    } deriving (Eq, Show)
+    }
+    deriving (Eq, Show)
 instance ToJSON OSVersionRes where
     toJSON OSVersionRes {..} = object ["status" .= osVersionStatus, "version" .= osVersionVersion]
 instance ToContent OSVersionRes where