web: Big refactor part 2

11 files changed, 17 insertions, 17 deletions

diff --git a/fig-web/src/Fig/Web/Module/Bells.hs b/fig-web/src/Fig/Web/Module/Bells.hs
index 7451079..1ae6dce 100644
--- a/fig-web/src/Fig/Web/Module/Bells.hs
+++ b/fig-web/src/Fig/Web/Module/Bells.hs
@@ -9,7 +9,7 @@ import Fig.Web.Utils
 import Fig.Web.Types
 import qualified Fig.Web.DB as DB
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/songs" do
     DB.hvals a.db "songnames" >>= \case
diff --git a/fig-web/src/Fig/Web/Module/Circle.hs b/fig-web/src/Fig/Web/Module/Circle.hs
index 5c21477..5db59fb 100644
--- a/fig-web/src/Fig/Web/Module/Circle.hs
+++ b/fig-web/src/Fig/Web/Module/Circle.hs
@@ -18,13 +18,13 @@ import Fig.Utils.SExpr
 import Fig.Web.Utils
 import Fig.Web.Types
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/circle" do
     live <- liftIO $ MVar.readMVar a.globals.currentlyLive
     respondText $ pretty . SExprList @Void $ SExprString <$> Set.toList live
 
-publicWebsockets :: Websockets
+publicWebsockets :: PublicWebsockets
 publicWebsockets a =
   [ ( "/api/circle/events", \conn -> do
         c <- Chan.dupChan a.channels.live
@@ -44,11 +44,11 @@ publicWebsockets a =
     )
   ]
 
-publicBusEvents :: BusEvents
+publicBusEvents :: PublicBusEvents
 publicBusEvents a =
   [ ("monitor twitch stream online", \d -> do
         let dstr = decodeUtf8 d
-        let live = Text.splitOn " " dstr
+        let live = Text.words dstr
         let new = Set.fromList live 
         old <- MVar.swapMVar a.globals.currentlyLive new
         let online = Set.difference new old
diff --git a/fig-web/src/Fig/Web/Module/Exchange.hs b/fig-web/src/Fig/Web/Module/Exchange.hs
index 32851fa..3672265 100644
--- a/fig-web/src/Fig/Web/Module/Exchange.hs
+++ b/fig-web/src/Fig/Web/Module/Exchange.hs
@@ -19,13 +19,13 @@ import qualified Data.UUID.V4 as UUID
 import Fig.Web.Utils
 import Fig.Web.Types
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/exchange" do
     listings <- getOrders a.db.conn
     respondJSON listings
 
-secure :: Module
+secure :: SecureModule
 secure a = do
   onPost "/api/exchange" $ authed \creds -> do
     haveCur <- formParam "haveCur"
diff --git a/fig-web/src/Fig/Web/Module/Gizmo.hs b/fig-web/src/Fig/Web/Module/Gizmo.hs
index 8112670..0267ab6 100644
--- a/fig-web/src/Fig/Web/Module/Gizmo.hs
+++ b/fig-web/src/Fig/Web/Module/Gizmo.hs
@@ -16,7 +16,7 @@ import Fig.Web.Utils
 import Fig.Web.Types
 import qualified Fig.Web.DB as DB
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/gizmo" do
     buf <- queryParam "buf"
@@ -29,7 +29,7 @@ public a = do
     gizmos <- maybe [] (fmap decodeUtf8) <$> DB.hkeys a.db "gizmos"
     respondText $ Text.unlines gizmos
 
-publicWebsockets :: Websockets
+publicWebsockets :: PublicWebsockets
 publicWebsockets a =
   [ ( "/api/gizmo/events", \conn -> do
         c <- Chan.dupChan a.channels.gizmo
@@ -39,7 +39,7 @@ publicWebsockets a =
     )
   ]
 
-publicBusEvents :: BusEvents
+publicBusEvents :: PublicBusEvents
 publicBusEvents a =
   [ ("gizmo buffer update", \d -> do
         let dstr = decodeUtf8 d
diff --git a/fig-web/src/Fig/Web/Module/Misc.hs b/fig-web/src/Fig/Web/Module/Misc.hs
index d16df6c..1bbb2ba 100644
--- a/fig-web/src/Fig/Web/Module/Misc.hs
+++ b/fig-web/src/Fig/Web/Module/Misc.hs
@@ -12,7 +12,7 @@ import Fig.Web.Utils
 import Fig.Web.Types
 import qualified Fig.Web.DB as DB
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/motd" do
     log "getting motd"
diff --git a/fig-web/src/Fig/Web/Module/Model.hs b/fig-web/src/Fig/Web/Module/Model.hs
index 86f0128..527a334 100644
--- a/fig-web/src/Fig/Web/Module/Model.hs
+++ b/fig-web/src/Fig/Web/Module/Model.hs
@@ -10,7 +10,7 @@ import qualified Network.WebSockets as WS
 
 import Fig.Web.Types
 
-publicWebsockets :: Websockets
+publicWebsockets :: PublicWebsockets
 publicWebsockets a =
   [ ( "/api/model/broadcast", \conn -> do
         forever do
diff --git a/fig-web/src/Fig/Web/Module/Redeem.hs b/fig-web/src/Fig/Web/Module/Redeem.hs
index 2d72f66..fd174f6 100644
--- a/fig-web/src/Fig/Web/Module/Redeem.hs
+++ b/fig-web/src/Fig/Web/Module/Redeem.hs
@@ -10,7 +10,7 @@ import qualified Data.Text as Text
 import Fig.Web.Utils
 import Fig.Web.Types
 
-secure :: Module
+secure :: SecureModule
 secure a = do
   onGet "/api/redeeminfo" do
     respondText "hiiiiiii"
diff --git a/fig-web/src/Fig/Web/Module/Sentiment.hs b/fig-web/src/Fig/Web/Module/Sentiment.hs
index 38a9250..6b99873 100644
--- a/fig-web/src/Fig/Web/Module/Sentiment.hs
+++ b/fig-web/src/Fig/Web/Module/Sentiment.hs
@@ -8,7 +8,7 @@ import Fig.Web.Utils
 import Fig.Web.Types
 import qualified Fig.Web.DB as DB
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/sentiment" do
     s <- DB.get a.db "sentiment" >>= \case
diff --git a/fig-web/src/Fig/Web/Module/Shader.hs b/fig-web/src/Fig/Web/Module/Shader.hs
index d4b43cc..cb21d30 100644
--- a/fig-web/src/Fig/Web/Module/Shader.hs
+++ b/fig-web/src/Fig/Web/Module/Shader.hs
@@ -8,7 +8,7 @@ import Fig.Web.Utils
 import Fig.Web.Types
 import qualified Fig.Web.DB as DB
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/shader" do
     DB.get a.db "shader" >>= \case
diff --git a/fig-web/src/Fig/Web/Module/TwitchAuth.hs b/fig-web/src/Fig/Web/Module/TwitchAuth.hs
index 4847da6..80d2380 100644
--- a/fig-web/src/Fig/Web/Module/TwitchAuth.hs
+++ b/fig-web/src/Fig/Web/Module/TwitchAuth.hs
@@ -21,7 +21,7 @@ import qualified Jose.Jwt as Jwt
 import Fig.Web.Utils
 import Fig.Web.Types
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/register" $ twitchAuthed a.cfg \auth -> do
     log "Authenticated with Twitch, trying to register..."
diff --git a/fig-web/src/Fig/Web/Module/User.hs b/fig-web/src/Fig/Web/Module/User.hs
index 5b27b2d..6983906 100644
--- a/fig-web/src/Fig/Web/Module/User.hs
+++ b/fig-web/src/Fig/Web/Module/User.hs
@@ -10,7 +10,7 @@ import Fig.Web.Utils
 import Fig.Web.Types
 import qualified Fig.Web.DB as DB
 
-public :: Module
+public :: PublicModule
 public a = do
   onGet "/api/user/:name" do
     name <- Text.toLower <$> pathParam "name"