From e9ca12a945b1d1c068e9c31050e264cb20690db4 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 27 Jan 2019 03:23:17 +0100 Subject: Reaktor: add data Command --- src/Reaktor/Internal.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Reaktor/Internal.hs') diff --git a/src/Reaktor/Internal.hs b/src/Reaktor/Internal.hs index e52a347..09dd723 100644 --- a/src/Reaktor/Internal.hs +++ b/src/Reaktor/Internal.hs @@ -6,8 +6,10 @@ module Reaktor.Internal where import Prelude.Extended import Blessings import Data.Aeson +import Data.String.Conversions (convertString) import qualified Data.Text as T import Network.Socket as Exports (HostName,ServiceName) +import Reaktor.IRC import System.IO @@ -50,15 +52,14 @@ instance FromJSON Config where tlsPort :: ServiceName tlsPort = "6697" - -data Message = Message (Maybe Text) Text [Text] | Start +data Message = Message (Maybe Text) Command [Text] | Start deriving Show formatMessage :: Message -> Text formatMessage = \case Message mb_prefix cmd params -> maybe "" ((":"<>) . (<>" ")) mb_prefix - <> cmd + <> convertString cmd <> T.concat (map (" "<>) (init params)) <> if null params then "" else " :" <> last params <> "\r\n" -- cgit v1.2.3