core: channel messages (#6604)

* core: channel messages (WIP)

* do not include member ID when quoting channel messages

* query plans

* reduce duplication

* refactor

* refactor plan

* refactor 2

* all tests

* remove plan

* refactor 3

* refactor 4

* refactor 5

* refactor 6

* plans

* plans to imrove test coverage and fix bugs

* update plan

* update plan

* bug fixes (wip)

* new plan

* fixes wip

* more tests

* comment, fix lint

* restore comment

* restore comments

* rename param

* move type

* simplify

* comment

* fix stale state

* refactor

* less diff

* simplify

* less diff

* refactor

---------

Co-authored-by: Evgeny @ SimpleX Chat <259188159+evgeny-simplex@users.noreply.github.com>
Co-authored-by: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com>

src/Simplex/Chat/Messages/Batch.hs

@@ -71,12 +71,14 @@ batchDeliveryTasks1 vr maxLen = toResult . foldl' addToBatch ([], [], [], 0, 0)
       -- doesn’t fit: stop adding further messages
       | otherwise = (msgBodies, taskIds, largeTaskIds, len, n)
       where
-        MessageDeliveryTask {taskId, senderMemberId, senderMemberName, brokerTs, chatMessage, messageFromChannel = _messageFromChannel} = task
-        -- TODO [channels fwd] handle messageFromChannel (null memberId in XGrpMsgForward)
+        MessageDeliveryTask {taskId, fwdSender, brokerTs, chatMessage} = task
         msgBody =
-          let fwdEvt = XGrpMsgForward senderMemberId (Just senderMemberName) chatMessage brokerTs
+          let (memberId_, memberName_) = case fwdSender of
+                FwdMember mid mname -> (Just mid, Just mname)
+                FwdChannel -> (Nothing, Nothing)
+              fwdEvt = XGrpMsgForward memberId_ memberName_ chatMessage brokerTs
               cm = ChatMessage {chatVRange = vr, msgId = Nothing, chatMsgEvent = fwdEvt}
-            in chatMsgToBody cm
+           in chatMsgToBody cm
         msgLen = B.length msgBody
         len'
           | n == 0 = msgLen