lib: formatter run

3 files changed, 38 insertions, 45 deletions

diff --git a/lib/OwnTracks.hs b/lib/OwnTracks.hs
index 25b0ae9..c39a3bc 100644
--- a/lib/OwnTracks.hs
+++ b/lib/OwnTracks.hs
@@ -1,9 +1,9 @@
+{-# LANGUAGE ApplicativeDo      #-}
 {-# LANGUAGE BlockArguments     #-}
 {-# LANGUAGE DeriveAnyClass     #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE DerivingVia        #-}
 {-# LANGUAGE LambdaCase         #-}
-{-# LANGUAGE ApplicativeDo         #-}
 
 
 module OwnTracks
@@ -16,24 +16,22 @@ module OwnTracks
   ) where
 
 import           Data.Aeson
-import           Data.Aeson.Types       (Parser)
-import           Data.ByteString        (ByteString)
+import           Data.Aeson.Types        (Parser)
+import           Data.ByteString         (ByteString)
 import           Data.ByteString.Base64
-import           Data.Functor           ((<&>))
-import           Data.Text              (Text)
-import qualified Data.Text              as T
-import           Data.Text.Encoding     (encodeUtf8)
-import           Data.Time              (
-                                         UTCTime,
-                                         defaultTimeLocale,
-                                         parseTimeM)
+import           Data.Functor            ((<&>))
+import           Data.Text               (Text)
+import qualified Data.Text               as T
+import           Data.Text.Encoding      (encodeUtf8)
+import           Data.Time               (UTCTime, defaultTimeLocale,
+                                          parseTimeM)
 import           Database.Persist
-import           GHC.Generics           (Generic)
+import           GHC.Generics            (Generic)
 
+import           OwnTracks.Command
+import           OwnTracks.Configuration
 import           OwnTracks.Location
 import           OwnTracks.Status
-import           OwnTracks.Configuration
-import           OwnTracks.Command
 import           OwnTracks.Waypoint
 
 data Message =
@@ -47,8 +45,8 @@ instance FromJSON Message where
   parseJSON v@(Object o) = do
     ty :: Text <- o .: "_type"
     case ty of
-      "location" -> MsgLocation <$> parseJSON v
-      "status" -> MsgStatus <$> parseJSON v
+      "location"      -> MsgLocation <$> parseJSON v
+      "status"        -> MsgStatus <$> parseJSON v
       "configuration" -> MsgConfig <$> parseJSON v
-      "waypoints" -> MsgWaypoints <$> o .: "waypoints"
-      _ -> fail "unknown _type of owntracks message."
+      "waypoints"     -> MsgWaypoints <$> o .: "waypoints"
+      _               -> fail "unknown _type of owntracks message."
diff --git a/lib/OwnTracks/Command.hs b/lib/OwnTracks/Command.hs
index 5468379..257d3e3 100644
--- a/lib/OwnTracks/Command.hs
+++ b/lib/OwnTracks/Command.hs
@@ -10,22 +10,20 @@ module OwnTracks.Command
   (Command(..)) where
 
 import           Data.Aeson
-import           Data.Aeson.Types       (Parser)
-import           Data.ByteString        (ByteString)
+import           Data.Aeson.Types        (Parser)
+import           Data.ByteString         (ByteString)
 import           Data.ByteString.Base64
-import           Data.Functor           ((<&>))
-import           Data.Text              (Text)
-import qualified Data.Text              as T
-import           Data.Text.Encoding     (encodeUtf8)
-import           Data.Time              (
-                                         UTCTime,
-                                         defaultTimeLocale,
-                                         parseTimeM)
+import           Data.Functor            ((<&>))
+import           Data.Text               (Text)
+import qualified Data.Text               as T
+import           Data.Text.Encoding      (encodeUtf8)
+import           Data.Time               (UTCTime, defaultTimeLocale,
+                                          parseTimeM)
 import           Database.Persist
-import           GHC.Generics           (Generic)
+import           GHC.Generics            (Generic)
 
-import OwnTracks.Configuration
-import OwnTracks.Waypoint
+import           OwnTracks.Configuration
+import           OwnTracks.Waypoint
 
 data Command =
     Dump
@@ -50,16 +48,16 @@ instance ToJSON Command where
                     : "action" .= String action
                     : others )
     where action = case c of
-            Dump -> "dump"
-            GetStatus -> "status"
-            ReportSteps _ _ -> "reportSteps"
-            ReportLocation -> "reportLocation"
-            ClearWaypoints -> "clearWaypoints"
-            SetWaypoints _ -> "setWaypoints"
+            Dump               -> "dump"
+            GetStatus          -> "status"
+            ReportSteps _ _    -> "reportSteps"
+            ReportLocation     -> "reportLocation"
+            ClearWaypoints     -> "clearWaypoints"
+            SetWaypoints _     -> "setWaypoints"
             SetConfiguration _ -> "setConfiguration"
-            GetWaypoints -> "waypoints"
+            GetWaypoints       -> "waypoints"
           others = case c of
-            ReportSteps f t -> [ "from" .= f, "to" .= t ]
-            SetWaypoints ws -> [ "waypoints" .= ws ]
+            ReportSteps f t    -> [ "from" .= f, "to" .= t ]
+            SetWaypoints ws    -> [ "waypoints" .= ws ]
             SetConfiguration c -> [ "configuration" .= c ]
-            _ -> []
+            _                  -> []
diff --git a/lib/OwnTracks/Location.hs b/lib/OwnTracks/Location.hs
index 987de73..6a0fbde 100644
--- a/lib/OwnTracks/Location.hs
+++ b/lib/OwnTracks/Location.hs
@@ -17,10 +17,7 @@ import           Data.Functor           ((<&>))
 import           Data.Text              (Text)
 import qualified Data.Text              as T
 import           Data.Text.Encoding     (encodeUtf8)
-import           Data.Time              (
-                                         UTCTime,
-                                         defaultTimeLocale,
-                                         parseTimeM)
+import           Data.Time              (UTCTime, defaultTimeLocale, parseTimeM)
 import           Database.Persist
 import           GHC.Generics           (Generic)