getDirectChat (#227)

Co-authored-by: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
This commit is contained in:
Efim Poberezkin
2022-01-28 11:52:10 +04:00
committed by GitHub
parent 37cfb93217
commit edc9560d36
4 changed files with 180 additions and 106 deletions
+67 -15
View File
@@ -105,6 +105,7 @@ module Simplex.Chat.Store
deletePendingGroupMessage,
createNewChatItem,
getChatPreviews,
getDirectChat,
)
where
@@ -124,7 +125,7 @@ import Data.Function (on)
import Data.Functor (($>))
import Data.Int (Int64)
import Data.List (find, sortBy)
import Data.Maybe (fromJust, isJust, listToMaybe)
import Data.Maybe (listToMaybe)
import Data.Text (Text)
import qualified Data.Text as T
import Data.Time.Clock (UTCTime, getCurrentTime)
@@ -1809,8 +1810,8 @@ deletePendingGroupMessage st groupMemberId messageId =
liftIO . withTransaction st $ \db ->
DB.execute db "DELETE FROM pending_group_messages WHERE group_member_id = ? AND message_id = ?" (groupMemberId, messageId)
createNewChatItem :: MonadUnliftIO m => SQLiteStore -> UserId -> ChatDirection c d -> NewChatItem d -> m ChatItemId
createNewChatItem st userId chatDirection NewChatItem {createdByMsgId_, itemSent, itemTs, itemContent, itemText, createdAt} =
createNewChatItem :: (MsgDirectionI d, MonadUnliftIO m) => SQLiteStore -> UserId -> ChatDirection c d -> NewChatItem d -> m ChatItemId
createNewChatItem st userId chatDirection NewChatItem {createdByMsgId, itemSent, itemTs, itemContent, itemText, createdAt} =
liftIO . withTransaction st $ \db -> do
let (contactId_, groupId_, groupMemberId_) = ids
DB.execute
@@ -1822,11 +1823,13 @@ createNewChatItem st userId chatDirection NewChatItem {createdByMsgId_, itemSent
) VALUES (?,?,?,?,?,?,?,?,?,?,?)
|]
( (userId, contactId_, groupId_, groupMemberId_)
:. (createdByMsgId_, itemSent, itemTs, itemContent, itemText, createdAt, createdAt)
:. (createdByMsgId, itemSent, itemTs, itemContent, itemText, createdAt, createdAt)
)
ciId <- insertedRowId db
when (isJust createdByMsgId_) $
DB.execute db "INSERT INTO chat_item_messages (chat_item_id, message_id) VALUES (?,?)" (ciId, fromJust createdByMsgId_)
case createdByMsgId of
Nothing -> pure ()
Just msgId ->
DB.execute db "INSERT INTO chat_item_messages (chat_item_id, message_id) VALUES (?,?)" (ciId, msgId)
pure ciId
where
ids :: (Maybe Int64, Maybe Int64, Maybe Int64)
@@ -1898,15 +1901,63 @@ getGroupChatPreviews_ db User {userId, userContactId} =
groupInfo = GroupInfo {groupId, localDisplayName, groupProfile = GroupProfile {displayName, fullName}, membership}
in AChatPreview SCTGroup (GroupChat groupInfo) Nothing
-- getDirectChatItemList :: MonadUnliftIO m => SQLiteStore -> UserId -> Int64 -> m ChatItemList
-- getDirectChatItemList st userId contactId =
-- liftIO . withTransaction st $ \db ->
-- DB.query
-- db
-- [sql|
-- ...
-- |]
-- (userId, contactId)
getDirectChat :: StoreMonad m => SQLiteStore -> User -> Int64 -> m (Chat 'CTDirect)
getDirectChat st user contactId =
liftIOEither . withTransaction st $ \db -> runExceptT $ do
contact <- getContact_' db user contactId
chatItems <- liftIO $ getDirectChatItems_ db user contactId
pure $ Chat (DirectChat contact) chatItems
getContact_' :: DB.Connection -> User -> Int64 -> ExceptT StoreError IO Contact
getContact_' db User {userId} contactId =
ExceptT $
toContact
<$> DB.query
db
[sql|
SELECT
-- Contact
ct.contact_id, ct.local_display_name, ct.via_group,
-- Contact {profile}
cp.display_name, cp.full_name,
-- Contact {activeConn}
c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.conn_status, c.conn_type,
c.contact_id, c.group_member_id, c.snd_file_id, c.rcv_file_id, c.user_contact_link_id, c.created_at
FROM contacts ct
JOIN contact_profiles cp ON ct.contact_profile_id = cp.contact_profile_id
JOIN connections c ON c.contact_id = ct.contact_id
WHERE ct.user_id = ? AND ct.contact_id = ?
|]
(userId, contactId)
where
toContact :: [ContactRow] -> Either StoreError Contact
toContact (contactRow : _) = Right $ toContact' contactRow
toContact _ = Left $ SEContactNotFoundById contactId
getDirectChatItems_ :: DB.Connection -> User -> Int64 -> IO [CChatItem 'CTDirect]
getDirectChatItems_ db User {userId} contactId = do
chatItems_ <-
liftIO $
DB.query
db
[sql|
SELECT
-- CChatItem
ci.chat_item_id, ci.item_ts, ci.item_content, ci.item_text, ci.created_at
FROM chat_items ci
LEFT JOIN messages m ON m.message_id == ci.created_by_msg_id
LEFT JOIN msg_deliveries md ON md.message_id = m.message_id
WHERE ci.user_id = ? AND ci.contact_id = ?
|]
(userId, contactId)
liftIO $ mapM toDirectChatItem chatItems_
where
toDirectChatItem :: (Int64, ChatItemTs, ACIContent, Text, UTCTime) -> IO (CChatItem 'CTDirect)
toDirectChatItem (itemId, itemTs, itemContent, itemText, createdAt) = do
ciMeta <- liftIO $ mkCIMetaProps itemId itemTs itemText createdAt
pure $ case itemContent of
ACIContent SMDRcv ciContent -> CChatItem SMDRcv (DirectChatItem (CIRcvMeta ciMeta) ciContent)
ACIContent SMDSnd ciContent -> CChatItem SMDSnd (DirectChatItem (CISndMeta ciMeta) ciContent)
-- getGroupChatItemList :: MonadUnliftIO m => SQLiteStore -> UserId -> Int64 -> m ChatItemList
-- getGroupChatItemList st userId groupId =
@@ -1985,6 +2036,7 @@ randomBytes gVar n = B64.encode <$> (atomically . stateTVar gVar $ randomBytesGe
data StoreError
= SEDuplicateName
| SEContactNotFoundById Int64
| SEContactNotFound {contactName :: ContactName}
| SEContactNotReady {contactName :: ContactName}
| SEDuplicateContactLink