Fix warnings

app/Main.hs

-module Main where
+module Main (main) where
 
 import Prelude
-import qualified Q.Cli
+import Q.Cli qualified
 
 main :: IO ()
 main = Q.Cli.main

q.cabal

@@ -103,6 +103,7 @@ library
     Q.Home
     Q.Interface
     Q.Mqtt
+    Q.Mqtt.Zigbee2Mqtt
     Q.Pinephone
     Q.Pomodoro
     Q.System

src/Q/Home.hs

@@ -2,20 +2,11 @@ module Q.Home (
   homeDaemon,
 ) where
 
-import Control.Concurrent.STM
-import Data.Aeson
-import Data.ByteString (ByteString)
-import Data.ByteString qualified as BS
-import Data.ByteString.Lazy qualified as BSL
-import Data.HashMap.Strict qualified as HM
-import Data.Text
 import Q.Mqtt
 import Q.Mqtt.Zigbee2Mqtt
 import Quasar
 import Quasar.Prelude
-import Network.MQTT.Client
 import Network.MQTT.Topic
-import Network.URI
 
 
 homeDaemon :: String -> IO ()

src/Q/Mqtt.hs

@@ -3,15 +3,15 @@ module Q.Mqtt (
   connectMqtt,
   subscribeCallback,
   subscribeJson,
+
+  -- * Reexports from Network.MQTT
+  Topic,
+  Filter,
 ) where
 
 import Control.Concurrent.STM
 import Data.Aeson
-import Data.ByteString (ByteString)
-import Data.ByteString qualified as BS
 import Data.ByteString.Lazy qualified as BSL
-import Data.HashMap.Strict qualified as HM
-import Data.Text
 import Quasar
 import Quasar.Async.Unmanaged
 import Quasar.Prelude
@@ -33,8 +33,6 @@ data Callback = Callback {
   callbackFn :: CallbackFn
 }
 
-type JsonCallback = forall a. FromJSON a => Mqtt -> Topic -> a -> [Property] -> IO ()
-
 
 connectMqtt :: String -> Topic -> IO Mqtt
 connectMqtt mqttUri statusTopic = mfix \handle -> do
@@ -63,7 +61,7 @@ config handle statusTopic =
   }
 
 dispatchCallback :: Mqtt -> MQTTClient -> Topic -> BSL.ByteString -> [Property] -> IO ()
-dispatchCallback handle@Mqtt{callbacks} client topic content properties = do
+dispatchCallback handle@Mqtt{callbacks} _ topic content properties = do
   traceIO $ "Received: " <> show topic <> " " <> show content
   cbs <- atomically $ readTVar callbacks
   mapM_ callMatch cbs
@@ -101,4 +99,4 @@ subscribeJson handle topicFilter fn = do
     decodeCb handle' topic msg props =
       case eitherDecode msg of
         Left err -> traceIO $ mconcat ["Failed to decode json message on topic ", show topic, ": ", err]
-        Right json -> fn handle' topic json props
+        Right jsonMsg -> fn handle' topic jsonMsg props

src/Q/Mqtt/Zigbee2Mqtt.hs

@@ -6,20 +6,13 @@ module Q.Mqtt.Zigbee2Mqtt (
   setHueState,
 ) where
 
-import Control.Concurrent.STM
 import Data.Aeson
-import Data.ByteString (ByteString)
-import Data.ByteString qualified as BS
 import Data.ByteString.Lazy qualified as BSL
 import Data.HashMap.Strict qualified as HM
 import Data.Text
 import Q.Mqtt
-import Quasar
-import Quasar.Async.Unmanaged
 import Quasar.Prelude
 import Network.MQTT.Client as MQTT
-import Network.MQTT.Topic
-import Network.URI
 
 zigbee2mqtt :: Text -> Topic
 zigbee2mqtt name = "zigbee2mqtt/" <> name