summaryrefslogtreecommitdiffhomepage
path: root/Server.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Server.hs')
-rw-r--r--Server.hs15
1 files changed, 9 insertions, 6 deletions
diff --git a/Server.hs b/Server.hs
index 62d0a3c..f8e8588 100644
--- a/Server.hs
+++ b/Server.hs
@@ -7,6 +7,7 @@ import CmdLine
import WebSockets
import SessionID
import Log
+import PrevActivity
import Network.Wai
import Network.Wai.Handler.Warp
@@ -144,7 +145,7 @@ user o ssv conn = withSessionID (serverDirectory o) $ \(loghv, sid) -> do
-- (The user is allowed to send Developer messages too.. perhaps
-- they got them from a developer connected to them some other
-- way.)
- relayfromuser session = relayFromSocket conn $ \msg -> do
+ relayfromuser session = relayFromSocket conn noRecentActivity (return ()) $ \msg -> do
l <- mkLog msg <$> getPOSIXTime
writeSession session l
@@ -183,11 +184,13 @@ developer o ssv sid conn = bracket setup cleanup go
-- Relay all Developer amessages from the developer's websocket
-- to the broadcast channel.
- relayfromdeveloper session = relayFromSocket conn $ \msg -> case msg of
- Developer _ -> do
- l <- mkLog msg <$> getPOSIXTime
- writeSession session l
- User _ -> return () -- developer cannot send User messages
+ relayfromdeveloper session = relayFromSocket conn noRecentActivity (return ())
+ $ \msg -> case msg of
+ Developer _ -> do
+ l <- mkLog msg <$> getPOSIXTime
+ writeSession session l
+ -- developer cannot send User messages
+ User _ -> return ()
-- Relay user messages from the developer's clone of the
-- broadcast channel to the developer's websocket.