Adjust module structure

cofree-coffee · Dec 5, 2022 · 310a0dd · 310a0dd
1 parent 8240e18
commit 310a0dd
Show file tree

Hide file tree

Showing 23 changed files with 85 additions and 130 deletions.
diff --git a/chat-bots-contrib/chat-bots-contrib.cabal b/chat-bots-contrib/chat-bots-contrib.cabal
@@ -66,16 +66,16 @@ library
 
   hs-source-dirs:  src
   exposed-modules:
-    CofreeBot.Bot.Calculator
-    CofreeBot.Bot.Calculator.Language
-    CofreeBot.Bot.CoinFlip
-    CofreeBot.Bot.GHCI
-    CofreeBot.Bot.Hello
-    CofreeBot.Bot.Jitsi
-    CofreeBot.Bot.Jitsi.Dictionary
-    CofreeBot.Bot.Magic8Ball
-    CofreeBot.Bot.Updog
-    CofreeBot.Server.Matrix
+    Data.Chat.Bot.Calculator
+    Data.Chat.Bot.Calculator.Language
+    Data.Chat.Bot.CoinFlip
+    Data.Chat.Bot.GHCI
+    Data.Chat.Bot.Hello
+    Data.Chat.Bot.Jitsi
+    Data.Chat.Bot.Jitsi.Dictionary
+    Data.Chat.Bot.Magic8Ball
+    Data.Chat.Bot.Updog
+    Data.Chat.Server.Matrix
 
   build-depends:
     , aeson

diff --git a/chat-bots-contrib/src/CofreeBot.hs b/chat-bots-contrib/src/CofreeBot.hs
diff --git a/...s-contrib/src/CofreeBot/Bot/Calculator.hs → ...s-contrib/src/Data/Chat/Bot/Calculator.hs b/...s-contrib/src/CofreeBot/Bot/Calculator.hs → ...s-contrib/src/Data/Chat/Bot/Calculator.hs
@@ -1,4 +1,4 @@
-module CofreeBot.Bot.Calculator
+module Data.Chat.Bot.Calculator
   ( calculatorBot,
     simplifyCalculatorBot,
     printCalcOutput,
@@ -8,12 +8,12 @@ where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
-import CofreeBot.Bot.Calculator.Language as Language
-import CofreeBot.Bot.Monoidal
-import CofreeBot.Utils
 import Control.Monad.Reader
 import Control.Monad.State
+import Data.Chat.Bot
+import Data.Chat.Bot.Calculator.Language as Language
+import Data.Chat.Bot.Monoidal
+import Data.Chat.Utils
 import Data.Profunctor
 import Data.Text (Text)
 import Data.Text qualified as Text

diff --git a/.../src/CofreeBot/Bot/Calculator/Language.hs → .../src/Data/Chat/Bot/Calculator/Language.hs b/.../src/CofreeBot/Bot/Calculator/Language.hs → .../src/Data/Chat/Bot/Calculator/Language.hs
@@ -2,9 +2,8 @@
 {-# OPTIONS -fdefer-typed-holes -Wno-orphans #-}
 {-# LANGUAGE RankNTypes #-}
 
-module CofreeBot.Bot.Calculator.Language where
+module Data.Chat.Bot.Calculator.Language where
 
-import CofreeBot.Utils
 import Control.Applicative
 import Control.Monad.Error.Class
 import Control.Monad.Except
@@ -16,6 +15,7 @@ import Data.Char
   ( isAlpha,
     isDigit,
   )
+import Data.Chat.Utils
 #if MIN_VERSION_GLASGOW_HASKELL(9,0,2,0)
 #else
 import Data.Foldable (asum)

diff --git a/...ots-contrib/src/CofreeBot/Bot/CoinFlip.hs → ...ots-contrib/src/Data/Chat/Bot/CoinFlip.hs b/...ots-contrib/src/CofreeBot/Bot/CoinFlip.hs → ...ots-contrib/src/Data/Chat/Bot/CoinFlip.hs
@@ -1,12 +1,12 @@
-module CofreeBot.Bot.CoinFlip where
+module Data.Chat.Bot.CoinFlip where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
 import Control.Monad.ListT (emptyListT)
 import Control.Monad.Reader
 import Data.Attoparsec.Text
 import Data.Bifunctor (bimap)
+import Data.Chat.Bot
 import Data.Profunctor
 import Data.Text (Text)
 import Data.Text qualified as Text

diff --git a/chat-bots-contrib/src/CofreeBot/Bot/GHCI.hs → chat-bots-contrib/src/Data/Chat/Bot/GHCI.hs b/chat-bots-contrib/src/CofreeBot/Bot/GHCI.hs → chat-bots-contrib/src/Data/Chat/Bot/GHCI.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE NumDecimals #-}
 
-module CofreeBot.Bot.GHCI
+module Data.Chat.Bot.GHCI
   ( ghciBot,
     ghciConfig,
     hGetOutput,
@@ -9,13 +9,13 @@ where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
-import CofreeBot.Bot.Monoidal
-import CofreeBot.Utils
 import Control.Monad
 import Control.Monad.IO.Class
 import Control.Monad.Loops (whileM)
 import Data.Attoparsec.Text as A
+import Data.Chat.Bot
+import Data.Chat.Bot.Monoidal
+import Data.Chat.Utils
 import Data.Profunctor
 import Data.Text (Text)
 import Data.Text qualified as Text

diff --git a/chat-bots-contrib/src/CofreeBot/Bot/Hello.hs → chat-bots-contrib/src/Data/Chat/Bot/Hello.hs b/chat-bots-contrib/src/CofreeBot/Bot/Hello.hs → chat-bots-contrib/src/Data/Chat/Bot/Hello.hs
@@ -1,16 +1,16 @@
 -- | The Simplest Bot. This module serves as an introductory example
 -- for bot construction.
-module CofreeBot.Bot.Hello
+module Data.Chat.Bot.Hello
   ( helloSimpleBot,
     helloMatrixBot,
   )
 where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
-import CofreeBot.Server.Matrix
 import Control.Monad.ListT (emptyListT)
+import Data.Chat.Bot
+import Data.Chat.Server.Matrix
 import Data.Text (Text)
 import Data.Text qualified as Text
 

diff --git a/chat-bots-contrib/src/CofreeBot/Bot/Jitsi.hs → chat-bots-contrib/src/Data/Chat/Bot/Jitsi.hs b/chat-bots-contrib/src/CofreeBot/Bot/Jitsi.hs → chat-bots-contrib/src/Data/Chat/Bot/Jitsi.hs
@@ -1,14 +1,14 @@
-module CofreeBot.Bot.Jitsi
+module Data.Chat.Bot.Jitsi
   ( jitsiBot,
   )
 where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
-import CofreeBot.Bot.Jitsi.Dictionary
-import CofreeBot.Bot.Monoidal
-import CofreeBot.Utils (indistinct)
+import Data.Chat.Bot
+import Data.Chat.Bot.Jitsi.Dictionary
+import Data.Chat.Bot.Monoidal
+import Data.Chat.Utils (indistinct)
 import Data.Profunctor
 import Data.Text (Text)
 import Data.Vector qualified as V

diff --git a/...rib/src/CofreeBot/Bot/Jitsi/Dictionary.hs → ...rib/src/Data/Chat/Bot/Jitsi/Dictionary.hs b/...rib/src/CofreeBot/Bot/Jitsi/Dictionary.hs → ...rib/src/Data/Chat/Bot/Jitsi/Dictionary.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedLists #-}
 
-module CofreeBot.Bot.Jitsi.Dictionary where
+module Data.Chat.Bot.Jitsi.Dictionary where
 
 import Data.Text (Text)
 import Data.Vector (Vector)

diff --git a/...s-contrib/src/CofreeBot/Bot/Magic8Ball.hs → ...s-contrib/src/Data/Chat/Bot/Magic8Ball.hs b/...s-contrib/src/CofreeBot/Bot/Magic8Ball.hs → ...s-contrib/src/Data/Chat/Bot/Magic8Ball.hs
@@ -1,16 +1,16 @@
-module CofreeBot.Bot.Magic8Ball
+module Data.Chat.Bot.Magic8Ball
   ( magic8BallBot,
     simplifyMagic8BallBot,
   )
 where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
 import Control.Monad.ListT (emptyListT)
 import Control.Monad.Reader
 import Data.Attoparsec.Text
 import Data.Bifunctor (bimap)
+import Data.Chat.Bot
 import Data.Profunctor
 import Data.Text (Text)
 import Data.Text qualified as Text

diff --git a/chat-bots-contrib/src/CofreeBot/Bot/Updog.hs → chat-bots-contrib/src/Data/Chat/Bot/Updog.hs b/chat-bots-contrib/src/CofreeBot/Bot/Updog.hs → chat-bots-contrib/src/Data/Chat/Bot/Updog.hs
@@ -1,18 +1,18 @@
-module CofreeBot.Bot.Updog
+module Data.Chat.Bot.Updog
   ( updogSimpleBot,
     updogMatrixBot,
   )
 where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
-import CofreeBot.Server.Matrix
 import Control.Applicative
   ( empty,
     liftA2,
   )
 import Control.Monad.ListT (toListT)
+import Data.Chat.Bot
+import Data.Chat.Server.Matrix
 import Data.String
 import Data.Text (Text)
 import Data.Text qualified as T

diff --git a/...ts-contrib/src/CofreeBot/Server/Matrix.hs → ...ts-contrib/src/Data/Chat/Server/Matrix.hs b/...ts-contrib/src/CofreeBot/Server/Matrix.hs → ...ts-contrib/src/Data/Chat/Server/Matrix.hs
@@ -1,4 +1,4 @@
-module CofreeBot.Server.Matrix
+module Data.Chat.Server.Matrix
   ( -- * Matrix Bot
     MatrixBot,
     matrix,
@@ -11,11 +11,11 @@ where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
-import CofreeBot.Server
-import CofreeBot.Utils (readFileMaybe)
 import Control.Lens
 import Control.Monad.Except
+import Data.Chat.Bot
+import Data.Chat.Server
+import Data.Chat.Utils (readFileMaybe)
 import Data.Map.Strict qualified as Map
 import Data.Text (Text)
 import Data.Text qualified as Text

diff --git a/chat-bots-contrib/test/Spec.hs b/chat-bots-contrib/test/Spec.hs
@@ -4,18 +4,18 @@ module Main where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot
-  ( fixBot,
-    sessionize,
-    simplifySessionBot,
-  )
-import CofreeBot.Bot.Calculator
+import Data.Chat.Bot (fixBot)
+import Data.Chat.Bot.Calculator
   ( calculatorBot,
     printCalcOutput,
     simplifyCalculatorBot,
     statementP,
   )
-import CofreeBot.Bot.Hello (helloSimpleBot)
+import Data.Chat.Bot.Context
+  ( sessionize,
+    simplifySessionBot,
+  )
+import Data.Chat.Bot.Hello (helloSimpleBot)
 import Scripts (mkScript)
 import Test.Hspec (Spec, describe, hspec, it, shouldBe)
 import TestServer (runTestScript)

diff --git a/chat-bots-contrib/test/TestServer.hs b/chat-bots-contrib/test/TestServer.hs
@@ -5,11 +5,6 @@ where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
-  ( Behavior (Behavior),
-    liftBehavior,
-  )
-import CofreeBot.Server (Server (..), loop)
 import Control.Monad.Except
   ( ExceptT,
     MonadError (..),
@@ -23,6 +18,11 @@ import Control.Monad.State
     gets,
     modify,
   )
+import Data.Chat.Bot
+  ( Behavior (Behavior),
+    liftBehavior,
+  )
+import Data.Chat.Server (Server (..), loop)
 import Data.Fix (Fix (..))
 import Data.Text (Text)
 import Scripts

diff --git a/chat-bots/chat-bots.cabal b/chat-bots/chat-bots.cabal
@@ -65,13 +65,12 @@ library
 
   hs-source-dirs:  src
   exposed-modules:
-    CofreeBot
-    CofreeBot.Bot
-    CofreeBot.Bot.Monoidal
-    CofreeBot.Bot.Context
-    CofreeBot.Server
-    CofreeBot.Server.Repl
-    CofreeBot.Utils
+    Data.Chat.Bot
+    Data.Chat.Bot.Monoidal
+    Data.Chat.Bot.Context
+    Data.Chat.Server
+    Data.Chat.Server.Repl
+    Data.Chat.Utils
     Control.Monad.ListT
     Parsing
 

diff --git a/chat-bots/src/CofreeBot.hs b/chat-bots/src/CofreeBot.hs
diff --git a/chat-bots/src/CofreeBot/Bot.hs → chat-bots/src/Data/Chat/Bot.hs b/chat-bots/src/CofreeBot/Bot.hs → chat-bots/src/Data/Chat/Bot.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ViewPatterns #-}
 
-module CofreeBot.Bot
+module Data.Chat.Bot
   ( -- * Bot
     Bot (..),
     KBot,
@@ -27,13 +27,13 @@ where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Utils (readFileMaybe)
 import Control.Arrow qualified as Arrow
 import Control.Monad.Except
 import Control.Monad.ListT
 import Control.Monad.Reader
 import Control.Monad.State
 import Data.Bifunctor (Bifunctor (..))
+import Data.Chat.Utils (readFileMaybe)
 import Data.Foldable (asum)
 import Data.Functor ((<&>))
 import Data.Kind

diff --git a/chat-bots/src/CofreeBot/Bot/Context.hs → chat-bots/src/Data/Chat/Bot/Context.hs b/chat-bots/src/CofreeBot/Bot/Context.hs → chat-bots/src/Data/Chat/Bot/Context.hs
@@ -4,7 +4,7 @@
 {-# HLINT ignore "Use <$>" #-}
 
 -- | Context Transformations for bots
-module CofreeBot.Bot.Context
+module Data.Chat.Bot.Context
   ( -- * Room Awareness
     RoomAware,
     mkRoomAware,
@@ -24,12 +24,12 @@ where
 
 --------------------------------------------------------------------------------
 
-import CofreeBot.Bot
 import Control.Applicative
 import Control.Arrow qualified as Arrow
 import Control.Monad.ListT (emptyListT)
 import Data.Attoparsec.Text
 import Data.Bifunctor (Bifunctor (first))
+import Data.Chat.Bot
 import Data.IntMap.Strict (IntMap)
 import Data.IntMap.Strict qualified as IntMap
 import Data.Profunctor (second')