antagonist 0.1.0.7 → 0.1.0.9

raw patch · 4 files changed

+8/−6 lines, 4 filesdep ~antisplice

Dependency ranges changed: antisplice

Files

• antagonist.cabal +3/−3
• play.cass +2/−0
• server/Web/Antagonist/Server.hs +2/−2
• server/Web/Antagonist/Server/Data.hs +1/−1

@@ -10,7 +10,7 @@ -- PVP summary:      +-+------- breaking API changes --                   | | +----- non-breaking API additions --                   | | | +--- code changes with no API change-version:             0.1.0.7+version:             0.1.0.9  -- A short (one-line) description of the package. synopsis:            A web interface to Antisplice dungeons.@@ -48,7 +48,7 @@  library   exposed-modules: Web.Antagonist.Server, Web.Antagonist.Server.Data-  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.12.1 && <0.13, text >=0.11 && <0.12, chatty >=0.5.3 && <0.6, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, time >=1.4 && <1.5, old-locale >=1.0 && <1.1+  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.13 && <0.14, text >=0.11 && <0.12, chatty >=0.5.3 && <0.6, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, time >=1.4 && <1.5, old-locale >=1.0 && <1.1   default-language: Haskell2010   hs-source-dirs:   shared, server, . @@ -63,7 +63,7 @@   -- other-extensions:          -- Other library packages from which modules are imported.-  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.12.1 && <0.13, text >=0.11 && <0.12, chatty >=0.5.3 && <0.6, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, ironforge >=0.1 && <0.2, time >=1.4 && <1.5, old-locale >=1.0 && <1.1+  build-depends:       base >=4.6 && <4.7, yesod >=1.2 && <1.3, antisplice >=0.13 && <0.14, text >=0.11 && <0.12, chatty >=0.5.3 && <0.6, shakespeare-text >=1.0 && <1.1, hamlet >=1.1 && <1.2, mtl >=2.1 && <2.2, shakespeare-css >=1.0 && <1.1, shakespeare-js >=1.2 && <1.3, ironforge >=0.1 && <0.2, time >=1.4 && <1.5, old-locale >=1.0 && <1.1      -- Directories containing source files.   hs-source-dirs:      shared, server, .

@@ -14,6 +14,8 @@   bottom: 2em   top: 0px   font-family: monospace+  white-space: pre-line;+  word-break: keep-all; #pw   width: 100%   position: fixed;

@@ -123,7 +123,7 @@   putDungeonState ds{timeTriggersOf=foldr avlRemove (timeTriggersOf ds) $ map fst ts}   forM_ ts (runHandler . snd) -runSession :: (MonadIO m,MonadClock m,MonadRandom m,MonadPrinter m) => Constructor -> SessionState -> ChattyDungeonM a -> m (a,SessionState)+runSession :: (MonadIO m,MonadClock m,MonadRandom m,MonadPrinter m) => Constructor () -> SessionState -> ChattyDungeonM a -> m (a,SessionState) runSession ctor ss m = do   x <- withSession ss m   case x of@@ -160,7 +160,7 @@   flip runDungeonT s m   where unjust (Just j) = j -startSession :: (MonadIO m,MonadClock m,MonadRandom m,MonadPrinter m) => Constructor -> m SessionState+startSession :: (MonadIO m,MonadClock m,MonadRandom m,MonadPrinter m) => Constructor () -> m SessionState startSession init = do   Right (_,x) <- withSession ((((none,defVocab),none),0),none) $ do     init

@@ -19,7 +19,7 @@ type SessionState = ((((DungeonState,TST Token),AVL (Int,Dynamic)),Int),[(String,EnvVar)])  -- | Subsite foundation type, containing the dungeon constructor and the session states.-data SingleUserSub = SingleUserSub { currentCounter :: IORef Int, dungeonStates :: IORef (AVL (Int,SessionState,String,NominalDiffTime)), constructor :: Constructor }+data SingleUserSub = SingleUserSub { currentCounter :: IORef Int, dungeonStates :: IORef (AVL (Int,SessionState,String,NominalDiffTime)), constructor :: Constructor () }  mkYesodSubData "SingleUserSub" [parseRoutes| / PlayR GET