fix: channels feature integration (#557)

Co-authored-by: Julieta11 <millochjuli@gmail.com>
Co-authored-by: Juli Milloch <42394626+Julieta11@users.noreply.github.com>

Author: guidota

package-lock.json

@@ -85,7 +85,7 @@
     "dcl-catalyst-client": "^13.0.7",
     "dcl-quests-client": "^2.10.0",
     "dcl-scene-writer": "^1.1.2",
-    "dcl-social-client": "^1.14.1",
+    "dcl-social-client": "^1.14.2",
     "decentraland-ecs": "^6.0.4",
     "decentraland-rpc": "^3.1.9",
     "devtools-protocol": "0.0.615714",

package.json

@@ -31,7 +31,7 @@ import { store } from 'shared/store/isolatedStore'
 import { waitForRendererInstance } from 'shared/renderer/sagas-helper'
 import { getUsedComponentVersions } from 'shared/rolloutVersions'
 import { SocialAPI } from 'dcl-social-client'
-import { joinOrCreateChannel, leaveChannel } from 'shared/friends/actions'
+import { joinOrCreateChannel, leaveChannel, sendChannelMessage } from 'shared/friends/actions'
 
 interface IChatCommand {
   name: string
@@ -92,10 +92,12 @@ function* handleReceivedMessage(action: MessageReceived) {
 }
 
 function* handleSendMessage(action: SendMessage) {
-  const { body: message } = action.payload
+  const { body: message, messageType, recipient } = action.payload
 
   let entry: ChatMessage | null = null
 
+  // When there is a recipient, it means is a message sent to a channel
+  const isChannel = messageType === ChatMessageType.PUBLIC && recipient
   // Check if message is a command
   if (message[0] === '/') {
     entry = handleChatCommand(message)
@@ -118,17 +120,35 @@ function* handleSendMessage(action: SendMessage) {
   } else {
     // If the message was not a command ("/cmdname"), then send message through wire
     const currentUserId = yield select(getCurrentUserId)
-    if (!currentUserId) throw new Error('cannotGetCurrentUser')
-
-    entry = {
-      messageType: ChatMessageType.PUBLIC,
-      messageId: uuid(),
-      timestamp: Date.now(),
-      sender: currentUserId,
-      body: message
+    if (!currentUserId) {
+      defaultLogger.error('Could not get the current user id.')
+      trackEvent('error', {
+        message: 'error trying to get the current user id.',
+        context: 'kernel#chatSaga',
+        stack: 'handleSendMessage'
+      })
+      return
+    }
+    if (isChannel) {
+      entry = {
+        messageType: ChatMessageType.PUBLIC,
+        messageId: uuid(),
+        sender: currentUserId,
+        recipient,
+        body: message,
+        timestamp: Date.now()
+      }
+      yield put(sendChannelMessage(recipient, message))
+    } else {
+      entry = {
+        messageType: ChatMessageType.PUBLIC,
+        messageId: uuid(),
+        timestamp: Date.now(),
+        sender: currentUserId,
+        body: message
+      }
+      sendPublicChatMessage(entry.messageId, entry.body)
     }
-
-    sendPublicChatMessage(entry.messageId, entry.body)
   }
 
   yield call(waitForRendererInstance)
@@ -473,10 +493,8 @@ function initChatCommands() {
       }
     }
 
-    const ownId = client.getUserId()
-
     // Join or create channel
-    store.dispatch(joinOrCreateChannel(channelId, [ownId]))
+    store.dispatch(joinOrCreateChannel(channelId, []))
 
     return {
       messageId: uuid(),

packages/shared/chat/sagas.ts

@@ -31,3 +31,8 @@ export type JoinOrCreateChannel = ReturnType<typeof joinOrCreateChannel>
 export const LEAVE_CHANNEL = 'Leave channel'
 export const leaveChannel = (channelId: string) => action(LEAVE_CHANNEL, { channelId })
 export type LeaveChannel = ReturnType<typeof leaveChannel>
+
+export const SEND_CHANNEL_MESSAGE = '[Request] Send channel message'
+export const sendChannelMessage = (channelId: string, message: string) =>
+  action(SEND_CHANNEL_MESSAGE, { channelId, message })
+export type SendChannelMessage = ReturnType<typeof sendChannelMessage>