From 3d48c1fe98cca650e3362fde6ed84f8ad37c664a Mon Sep 17 00:00:00 2001 From: Szymon Szlachtowicz <38212223+Szymx95@users.noreply.github.com> Date: Fri, 3 Dec 2021 14:36:06 +0100 Subject: [PATCH] Refactor groupChats and add images to group chats msgs (#145) --- .../src/hooks/messenger/useGroupChats.ts | 15 +- .../src/hooks/messenger/useMessenger.ts | 34 ++-- packages/status-communities/src/groupChats.ts | 178 ++++++++++-------- 3 files changed, 135 insertions(+), 92 deletions(-) diff --git a/packages/react-chat/src/hooks/messenger/useGroupChats.ts b/packages/react-chat/src/hooks/messenger/useGroupChats.ts index 736c8043..69b36e3d 100644 --- a/packages/react-chat/src/hooks/messenger/useGroupChats.ts +++ b/packages/react-chat/src/hooks/messenger/useGroupChats.ts @@ -10,6 +10,7 @@ import { import { ChannelData, ChannelsData } from "../../models/ChannelData"; import { ChatMessage } from "../../models/ChatMessage"; import { Contact } from "../../models/Contact"; +import { uintToImgUrl } from "../../utils"; export function useGroupChats( messenger: Messenger | undefined, @@ -54,11 +55,21 @@ export function useGroupChats( type: "channel", } as ChannelData); }; - const handleMessage = (msg: StatusChatMessage, sender: string) => + const handleMessage = (msg: StatusChatMessage, sender: string) => { + let image: string | undefined = undefined; + if (msg.image) { + image = uintToImgUrl(msg.image.payload); + } addChatMessage( - new ChatMessage(msg.text ?? "", new Date(msg.clock ?? 0), sender), + new ChatMessage( + msg.text ?? "", + new Date(msg.clock ?? 0), + sender, + image + ), msg.chatId ); + }; return new GroupChats( identity, messenger.waku, diff --git a/packages/react-chat/src/hooks/messenger/useMessenger.ts b/packages/react-chat/src/hooks/messenger/useMessenger.ts index 62fb68d5..3e6fc9b7 100644 --- a/packages/react-chat/src/hooks/messenger/useMessenger.ts +++ b/packages/react-chat/src/hooks/messenger/useMessenger.ts @@ -200,21 +200,25 @@ export function useMessenger( const sendMessage = useCallback( async (messageText?: string, image?: Uint8Array) => { - if (activeChannel.type === "group") { - groupChat?.sendMessage(activeChannel.id, messageText ?? ""); - } else { - if (messageText) { - await messenger?.sendMessage(activeChannel.id, { - text: messageText, - contentType: 0, - }); - } - if (image) { - await messenger?.sendMessage(activeChannel.id, { - image, - imageType: 1, - contentType: 2, - }); + let content; + if (messageText) { + content = { + text: messageText, + contentType: 0, + }; + } + if (image) { + content = { + image, + imageType: 1, + contentType: 2, + }; + } + if (content) { + if (activeChannel.type === "group") { + await groupChat?.sendMessage(activeChannel.id, content); + } else { + await messenger?.sendMessage(activeChannel.id, content); } } }, diff --git a/packages/status-communities/src/groupChats.ts b/packages/status-communities/src/groupChats.ts index d3ceb692..38a81b9c 100644 --- a/packages/status-communities/src/groupChats.ts +++ b/packages/status-communities/src/groupChats.ts @@ -4,9 +4,12 @@ import { Identity } from "./identity"; import { MembershipUpdateEvent_EventType } from "./proto/communities/v1/membership_update_message"; import { getNegotiatedTopic, getPartitionedTopic } from "./topics"; import { bufToHex } from "./utils"; -import { MembershipUpdateMessage } from "./wire/membership_update_message"; +import { + MembershipSignedEvent, + MembershipUpdateMessage, +} from "./wire/membership_update_message"; -import { ChatMessage, ContentType } from "."; +import { ChatMessage, Content } from "."; export type GroupChat = { chatId: string; @@ -65,16 +68,18 @@ export class GroupChats { * * @param text text message to send */ - public async sendMessage(chatId: string, text: string): Promise { + public async sendMessage(chatId: string, content: Content): Promise { const now = Date.now(); const chat = this.chats[chatId]; if (chat) { await Promise.all( chat.members.map(async (member) => { - const chatMessage = ChatMessage.createMessage(now, now, chatId, { - text, - contentType: ContentType.Text, - }); + const chatMessage = ChatMessage.createMessage( + now, + now, + chatId, + content + ); const wakuMessage = await WakuMessage.fromBytes( chatMessage.encode(), await getNegotiatedTopic(this.identity, member) @@ -85,82 +90,90 @@ export class GroupChats { } } + private async handleUpdateEvent( + chatId: string, + event: MembershipSignedEvent, + useCallback: boolean + ): Promise { + const signer = event.signer ? bufToHex(event.signer) : ""; + const thisUser = bufToHex(this.identity.publicKey); + const chat: GroupChat | undefined = this.chats[chatId]; + if (signer) { + switch (event.event.type) { + case MembershipUpdateEvent_EventType.CHAT_CREATED: { + await this.addChat( + { + chatId: chatId, + members: event.event.members, + admins: [signer], + removed: false, + }, + useCallback + ); + break; + } + case MembershipUpdateEvent_EventType.MEMBER_REMOVED: { + if (chat) { + chat.members = chat.members.filter( + (member) => !event.event.members.includes(member) + ); + if (event.event.members.includes(thisUser)) { + await this.removeChat( + { + ...chat, + removed: true, + }, + useCallback + ); + } else { + if (!chat.removed && useCallback) { + this.callback(this.chats[chatId]); + } + } + } + break; + } + case MembershipUpdateEvent_EventType.MEMBERS_ADDED: { + if (chat && chat.admins?.includes(signer)) { + chat.members.push(...event.event.members); + if (chat.members.includes(thisUser)) { + chat.removed = false; + await this.addChat(chat, useCallback); + } + } + break; + } + case MembershipUpdateEvent_EventType.NAME_CHANGED: { + if (chat) { + if (chat.admins?.includes(signer)) { + chat.name = event.event.name; + this.callback(chat); + } + } + break; + } + } + } + } + private async decodeUpdateMessage( message: WakuMessage, useCallback: boolean ): Promise { try { - if (message.payload) { + if (message?.payload) { const membershipUpdate = MembershipUpdateMessage.decode( - message?.payload + message.payload ); await Promise.all( - membershipUpdate.events.map(async (event) => { - const signer = event.signer ? bufToHex(event.signer) : ""; - const thisUser = bufToHex(this.identity.publicKey); - const chatId = membershipUpdate.chatId; - const chat: GroupChat | undefined = this.chats[chatId]; - - if (signer) { - switch (event.event.type) { - case MembershipUpdateEvent_EventType.CHAT_CREATED: { - await this.addChat( - { - chatId: chatId, - members: event.event.members, - admins: [signer], - removed: false, - }, - useCallback - ); - break; - } - case MembershipUpdateEvent_EventType.MEMBER_REMOVED: { - if (chat) { - chat.members = chat.members.filter( - (member) => !event.event.members.includes(member) - ); - if (event.event.members.includes(thisUser)) { - await this.removeChat( - { - ...chat, - removed: true, - }, - useCallback - ); - } else { - if (!chat.removed && useCallback) { - this.callback(this.chats[chatId]); - } - } - } - break; - } - case MembershipUpdateEvent_EventType.MEMBERS_ADDED: { - if (chat) { - chat.members.push(...event.event.members); - if ( - chat.members.includes(thisUser) && - chat.admins?.includes(signer) - ) { - chat.removed = false; - await this.addChat(chat, useCallback); - } - } - break; - } - case MembershipUpdateEvent_EventType.NAME_CHANGED: { - if (chat) { - if (chat.admins?.includes(signer)) { - chat.name = event.event.name; - this.callback(chat); - } - } - break; - } - } - } - }) + membershipUpdate.events.map( + async (event) => + await this.handleUpdateEvent( + membershipUpdate.chatId, + event, + useCallback + ) + ) ); } } catch { @@ -224,6 +237,7 @@ export class GroupChats { ): Promise { this.chats[chat.chatId] = chat; if (useCallback) { + await this.handleChatObserver(chat, true); this.removeCallback(chat); } } @@ -268,6 +282,13 @@ export class GroupChats { wakuMessages.forEach((msg) => this.waku.relay.send(msg)); } + /** + * Sends a change chat name chat membership update message + * + * @param chatId a chat id to which message is to be sent + * + * @param name a name which chat should be changed to + */ public async changeChatName(chatId: string, name: string): Promise { const payload = MembershipUpdateMessage.create(chatId, this.identity); const chat = this.chats[chatId]; @@ -277,6 +298,13 @@ export class GroupChats { } } + /** + * Sends a add members group chat membership update message with given members + * + * @param chatId a chat id to which message is to be sent + * + * @param members a list of members to be added + */ public async addMembers(chatId: string, members: string[]): Promise { const payload = MembershipUpdateMessage.create(chatId, this.identity); const chat = this.chats[chatId];