mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2025-03-14 09:45:42 +00:00
core: split Chat.hs module (#5397)
This commit is contained in:
parent
9adff0bfd1
commit
00973d6e13
16 changed files with 8827 additions and 8598 deletions
|
@ -19,9 +19,9 @@ import GHC.Generics (Generic)
|
|||
import Network.Socket
|
||||
import qualified Network.WebSockets as WS
|
||||
import Numeric.Natural (Natural)
|
||||
import Simplex.Chat
|
||||
import Simplex.Chat.Controller
|
||||
import Simplex.Chat.Core
|
||||
import Simplex.Chat.Library.Commands
|
||||
import Simplex.Chat.Options
|
||||
import Simplex.Messaging.Transport.Server (runLocalTCPServer)
|
||||
import Simplex.Messaging.Util (raceAny_)
|
||||
|
|
|
@ -35,6 +35,9 @@ library
|
|||
Simplex.Chat.Core
|
||||
Simplex.Chat.Files
|
||||
Simplex.Chat.Help
|
||||
Simplex.Chat.Library.Commands
|
||||
Simplex.Chat.Library.Internal
|
||||
Simplex.Chat.Library.Subscriber
|
||||
Simplex.Chat.Markdown
|
||||
Simplex.Chat.Messages
|
||||
Simplex.Chat.Messages.Batch
|
||||
|
|
8597
src/Simplex/Chat.hs
8597
src/Simplex/Chat.hs
File diff suppressed because one or more lines are too long
|
@ -21,11 +21,12 @@ import Data.Time.Clock (getCurrentTime)
|
|||
import Data.Time.LocalTime (getCurrentTimeZone)
|
||||
import Simplex.Chat
|
||||
import Simplex.Chat.Controller
|
||||
import Simplex.Chat.Library.Commands
|
||||
import Simplex.Chat.Options (ChatOpts (..), CoreChatOpts (..))
|
||||
import Simplex.Chat.Store.Profiles
|
||||
import Simplex.Chat.Types
|
||||
import Simplex.Chat.View (serializeChatResponse)
|
||||
import Simplex.Messaging.Agent.Store.SQLite (SQLiteStore, withTransaction, MigrationConfirmation (..))
|
||||
import Simplex.Messaging.Agent.Store.SQLite (MigrationConfirmation (..), SQLiteStore, withTransaction)
|
||||
import System.Exit (exitFailure)
|
||||
import System.IO (hFlush, stdout)
|
||||
import Text.Read (readMaybe)
|
||||
|
|
3992
src/Simplex/Chat/Library/Commands.hs
Normal file
3992
src/Simplex/Chat/Library/Commands.hs
Normal file
File diff suppressed because it is too large
Load diff
1919
src/Simplex/Chat/Library/Internal.hs
Normal file
1919
src/Simplex/Chat/Library/Internal.hs
Normal file
File diff suppressed because one or more lines are too long
2887
src/Simplex/Chat/Library/Subscriber.hs
Normal file
2887
src/Simplex/Chat/Library/Subscriber.hs
Normal file
File diff suppressed because it is too large
Load diff
|
@ -36,6 +36,7 @@ import Foreign.Storable (poke)
|
|||
import GHC.IO.Encoding (setFileSystemEncoding, setForeignEncoding, setLocaleEncoding)
|
||||
import Simplex.Chat
|
||||
import Simplex.Chat.Controller
|
||||
import Simplex.Chat.Library.Commands
|
||||
import Simplex.Chat.Markdown (ParsedMarkdown (..), parseMaybeMarkdownList)
|
||||
import Simplex.Chat.Mobile.File
|
||||
import Simplex.Chat.Mobile.Shared
|
||||
|
|
|
@ -14,10 +14,11 @@ import qualified Data.Text as T
|
|||
import Data.Text.Encoding (encodeUtf8)
|
||||
import Database.SQLite.Simple (SQLError (..))
|
||||
import qualified Database.SQLite.Simple as DB
|
||||
import Simplex.Chat (_defaultNtfServers, defaultChatConfig, operatorSimpleXChat)
|
||||
import Simplex.Chat (defaultChatConfig, operatorSimpleXChat)
|
||||
import Simplex.Chat.Controller
|
||||
import Simplex.Chat.Core
|
||||
import Simplex.Chat.Help (chatWelcome)
|
||||
import Simplex.Chat.Library.Commands (_defaultNtfServers)
|
||||
import Simplex.Chat.Operators
|
||||
import Simplex.Chat.Options
|
||||
import Simplex.Chat.Terminal.Input
|
||||
|
|
|
@ -29,8 +29,8 @@ import Database.SQLite.Simple (Only (..))
|
|||
import qualified Database.SQLite.Simple as SQL
|
||||
import Database.SQLite.Simple.QQ (sql)
|
||||
import GHC.Weak (deRefWeak)
|
||||
import Simplex.Chat
|
||||
import Simplex.Chat.Controller
|
||||
import Simplex.Chat.Library.Commands
|
||||
import Simplex.Chat.Messages
|
||||
import Simplex.Chat.Messages.CIContent
|
||||
import Simplex.Chat.Styled
|
||||
|
|
|
@ -21,8 +21,8 @@ import Data.Text (Text)
|
|||
import qualified Data.Text as T
|
||||
import Data.Time.Clock (getCurrentTime)
|
||||
import Data.Time.LocalTime (getCurrentTimeZone)
|
||||
import Simplex.Chat (execChatCommand, processChatCommand)
|
||||
import Simplex.Chat.Controller
|
||||
import Simplex.Chat.Library.Commands (execChatCommand, processChatCommand)
|
||||
import Simplex.Chat.Markdown
|
||||
import Simplex.Chat.Messages
|
||||
import Simplex.Chat.Messages.CIContent (CIContent (..), SMsgDirection (..))
|
||||
|
|
|
@ -36,10 +36,11 @@ import Data.Time.Format (defaultTimeLocale, formatTime)
|
|||
import qualified Data.Version as V
|
||||
import qualified Network.HTTP.Types as Q
|
||||
import Numeric (showFFloat)
|
||||
import Simplex.Chat (defaultChatConfig, maxImageSize)
|
||||
import Simplex.Chat (defaultChatConfig)
|
||||
import Simplex.Chat.Call
|
||||
import Simplex.Chat.Controller
|
||||
import Simplex.Chat.Help
|
||||
import Simplex.Chat.Library.Commands (maxImageSize)
|
||||
import Simplex.Chat.Markdown
|
||||
import Simplex.Chat.Messages hiding (NewChatItem (..))
|
||||
import Simplex.Chat.Messages.CIContent
|
||||
|
|
|
@ -27,6 +27,7 @@ import Network.Socket
|
|||
import Simplex.Chat
|
||||
import Simplex.Chat.Controller (ChatCommand (..), ChatConfig (..), ChatController (..), ChatDatabase (..), ChatLogLevel (..), defaultSimpleNetCfg)
|
||||
import Simplex.Chat.Core
|
||||
import Simplex.Chat.Library.Commands
|
||||
import Simplex.Chat.Options
|
||||
import Simplex.Chat.Protocol (currentChatVersion, pqEncryptionCompressionVersion)
|
||||
import Simplex.Chat.Store
|
||||
|
|
|
@ -14,8 +14,8 @@ import qualified Data.Aeson as J
|
|||
import qualified Data.ByteString.Char8 as B
|
||||
import qualified Data.ByteString.Lazy.Char8 as LB
|
||||
import Network.HTTP.Types.URI (urlEncode)
|
||||
import Simplex.Chat (roundedFDCount)
|
||||
import Simplex.Chat.Controller (ChatConfig (..))
|
||||
import Simplex.Chat.Library.Internal (roundedFDCount)
|
||||
import Simplex.Chat.Mobile.File
|
||||
import Simplex.Chat.Options (ChatOpts (..))
|
||||
import Simplex.FileTransfer.Server.Env (XFTPServerConfig (..))
|
||||
|
|
|
@ -9,9 +9,9 @@ import Control.Concurrent (threadDelay)
|
|||
import qualified Data.ByteString.Char8 as B
|
||||
import Data.List (intercalate)
|
||||
import qualified Data.Text as T
|
||||
import System.Directory (copyFile, doesFileExist, removeFile)
|
||||
import Simplex.Chat (fixedImagePreview)
|
||||
import Simplex.Chat.Library.Commands (fixedImagePreview)
|
||||
import Simplex.Chat.Types (ImageData (..))
|
||||
import System.Directory (copyFile, doesFileExist, removeFile)
|
||||
import Test.Hspec hiding (it)
|
||||
|
||||
chatForwardTests :: SpecWith FilePath
|
||||
|
@ -740,7 +740,7 @@ testMultiForwardFiles =
|
|||
|
||||
-- IDs to forward
|
||||
let msgId1 = (read msgIdZero :: Int) + 1
|
||||
msgIds = intercalate "," $ map (show . (msgId1 +)) [0..5]
|
||||
msgIds = intercalate "," $ map (show . (msgId1 +)) [0 .. 5]
|
||||
bob ##> ("/_forward plan @2 " <> msgIds)
|
||||
bob <## "Files can be received: 1, 2, 3, 4"
|
||||
bob <## "5 message(s) out of 6 can be forwarded"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
module ValidNames where
|
||||
|
||||
import Simplex.Chat
|
||||
import Simplex.Chat.Library.Commands
|
||||
import Test.Hspec
|
||||
|
||||
validNameTests :: Spec
|
||||
|
|
Loading…
Add table
Reference in a new issue