Chatrooms in conversation interface

2 files changed, 42 insertions, 6 deletions

diff --git a/src/Erebos/Chatroom.hs b/src/Erebos/Chatroom.hs
index dcd7b42..be1a0e4 100644
--- a/src/Erebos/Chatroom.hs
+++ b/src/Erebos/Chatroom.hs
@@ -20,7 +20,8 @@ module Erebos.Chatroom (
     cmsgFrom, cmsgReplyTo, cmsgTime, cmsgText, cmsgLeave,
     cmsgRoom, cmsgRoomData,
     ChatMessageData(..),
-    chatroomMessageByStateData,
+    sendChatroomMessage,
+    sendChatroomMessageByStateData,
 
     ChatroomService(..),
 ) where
@@ -171,10 +172,15 @@ threadToList thread = helper S.empty $ thread
         | otherwise = []
     cmpView msg = (zonedTimeToUTC $ mdTime $ fromSigned msg, msg)
 
-chatroomMessageByStateData
+sendChatroomMessage
+    :: (MonadStorage m, MonadHead LocalState m, MonadError String m)
+    => ChatroomState -> Text -> m ()
+sendChatroomMessage rstate msg = sendChatroomMessageByStateData (head $ roomStateData rstate) msg
+
+sendChatroomMessageByStateData
     :: (MonadStorage m, MonadHead LocalState m, MonadError String m)
     => Stored ChatroomStateData -> Text -> m ()
-chatroomMessageByStateData lookupData msg = void $ findAndUpdateChatroomState $ \cstate -> do
+sendChatroomMessageByStateData lookupData msg = void $ findAndUpdateChatroomState $ \cstate -> do
     guard $ any (lookupData `precedesOrEquals`) $ roomStateData cstate
     Just $ do
         self <- finalOwner . localIdentity . fromStored <$> getLocalHead
diff --git a/src/Erebos/Conversation.hs b/src/Erebos/Conversation.hs
index 94d2399..63475bd 100644
--- a/src/Erebos/Conversation.hs
+++ b/src/Erebos/Conversation.hs
@@ -1,12 +1,15 @@
 module Erebos.Conversation (
     Message,
     messageFrom,
+    messageTime,
     messageText,
     messageUnread,
     formatMessage,
 
     Conversation,
     directMessageConversation,
+    chatroomConversation,
+    chatroomConversationByStateData,
     reloadConversation,
     lookupConversations,
 
@@ -23,30 +26,45 @@ import Data.List
 import Data.Maybe
 import Data.Text (Text)
 import Data.Text qualified as T
+import Data.Time.Format
 import Data.Time.LocalTime
 
 import Erebos.Identity
+import Erebos.Chatroom
 import Erebos.Message hiding (formatMessage)
 import Erebos.State
 import Erebos.Storage
 
 
 data Message = DirectMessageMessage DirectMessage Bool
+             | ChatroomMessage ChatMessage Bool
 
 messageFrom :: Message -> ComposedIdentity
 messageFrom (DirectMessageMessage msg _) = msgFrom msg
+messageFrom (ChatroomMessage msg _) = cmsgFrom msg
+
+messageTime :: Message -> ZonedTime
+messageTime (DirectMessageMessage msg _) = msgTime msg
+messageTime (ChatroomMessage msg _) = cmsgTime msg
 
 messageText :: Message -> Maybe Text
 messageText (DirectMessageMessage msg _) = Just $ msgText msg
+messageText (ChatroomMessage msg _) = cmsgText msg
 
 messageUnread :: Message -> Bool
 messageUnread (DirectMessageMessage _ unread) = unread
+messageUnread (ChatroomMessage _ unread) = unread
 
 formatMessage :: TimeZone -> Message -> String
-formatMessage tzone (DirectMessageMessage msg _) = formatDirectMessage tzone msg
+formatMessage tzone msg = concat
+    [ formatTime defaultTimeLocale "[%H:%M] " $ utcToLocalTime tzone $ zonedTimeToUTC $ messageTime msg
+    , maybe "<unnamed>" T.unpack $ idName $ messageFrom msg
+    , maybe "" ((": "<>) . T.unpack) $ messageText msg
+    ]
 
 
 data Conversation = DirectMessageConversation DirectMessageThread
+                  | ChatroomConversation ChatroomState
 
 directMessageConversation :: MonadHead LocalState m => ComposedIdentity -> m Conversation
 directMessageConversation peer = do
@@ -54,8 +72,16 @@ directMessageConversation peer = do
         Just thread -> return $ DirectMessageConversation thread
         Nothing -> return $ DirectMessageConversation $ DirectMessageThread peer [] [] []
 
+chatroomConversation :: MonadHead LocalState m => ChatroomState -> m (Maybe Conversation)
+chatroomConversation rstate = chatroomConversationByStateData (head $ roomStateData rstate)
+
+chatroomConversationByStateData :: MonadHead LocalState m => Stored ChatroomStateData -> m (Maybe Conversation)
+chatroomConversationByStateData sdata = fmap ChatroomConversation <$> findChatroomByStateData sdata
+
 reloadConversation :: MonadHead LocalState m => Conversation -> m Conversation
 reloadConversation (DirectMessageConversation thread) = directMessageConversation (msgPeer thread)
+reloadConversation cur@(ChatroomConversation rstate) =
+    fromMaybe cur <$> chatroomConversation rstate
 
 lookupConversations :: MonadHead LocalState m => m [Conversation]
 lookupConversations = map DirectMessageConversation . toThreadList . lookupSharedValue . lsShared . fromStored <$> getLocalHead
@@ -63,13 +89,17 @@ lookupConversations = map DirectMessageConversation . toThreadList . lookupShare
 
 conversationName :: Conversation -> Text
 conversationName (DirectMessageConversation thread) = fromMaybe (T.pack "<unnamed>") $ idName $ msgPeer thread
+conversationName (ChatroomConversation rstate) = fromMaybe (T.pack "<unnamed>") $ roomName =<< roomStateRoom rstate
 
 conversationPeer :: Conversation -> Maybe ComposedIdentity
 conversationPeer (DirectMessageConversation thread) = Just $ msgPeer thread
+conversationPeer (ChatroomConversation _) = Nothing
 
 conversationHistory :: Conversation -> [Message]
 conversationHistory (DirectMessageConversation thread) = map (\msg -> DirectMessageMessage msg False) $ threadToList thread
+conversationHistory (ChatroomConversation rstate) = map (\msg -> ChatroomMessage msg False) $ roomStateMessages rstate
 
 
-sendMessage :: (MonadHead LocalState m, MonadError String m) => Conversation -> Text -> m Message
-sendMessage (DirectMessageConversation thread) text = DirectMessageMessage <$> (fromStored <$> sendDirectMessage (msgPeer thread) text) <*> pure False
+sendMessage :: (MonadHead LocalState m, MonadError String m) => Conversation -> Text -> m (Maybe Message)
+sendMessage (DirectMessageConversation thread) text = fmap Just $ DirectMessageMessage <$> (fromStored <$> sendDirectMessage (msgPeer thread) text) <*> pure False
+sendMessage (ChatroomConversation rstate) text = sendChatroomMessage rstate text >> return Nothing