status-im
/
status-web
mirror of https://github.com/status-im/status-web.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #55 from status-im/integrate-community

This commit is contained in:
Franck Royer 2021-10-08 15:03:30 +11:00 committed by GitHub
parent d645eadba4 964f322ee2
commit 02647e967d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/react-chat/src/hooks/useMessenger.ts
View File

@ -149,7 +149,7 @@ export function useMessenger(chatId: string, chatIdList: string[]) {
await Promise.all( await Promise.all(
chatIdList.map(async (id) => { chatIdList.map(async (id) => {
await messenger.joinChat(id); await messenger.joinChatById(id);
setLastLoadTime((prev) => { setLastLoadTime((prev) => {
return { return {
...prev, ...prev,

8
packages/status-communities/src/messenger.spec.ts
View File

@ -62,8 +62,8 @@ describe("Messenger", () => {
it("Sends & Receive public chat messages", async function () { it("Sends & Receive public chat messages", async function () {
this.timeout(10_000); this.timeout(10_000);
await messengerAlice.joinChat(testChatId); await messengerAlice.joinChatById(testChatId);
await messengerBob.joinChat(testChatId); await messengerBob.joinChatById(testChatId);
const text = "This is a message."; const text = "This is a message.";
@ -87,8 +87,8 @@ describe("Messenger", () => {
it("public chat messages have signers", async function () { it("public chat messages have signers", async function () {
this.timeout(10_000); this.timeout(10_000);
await messengerAlice.joinChat(testChatId); await messengerAlice.joinChatById(testChatId);
await messengerBob.joinChat(testChatId); await messengerBob.joinChatById(testChatId);
const text = "This is a message."; const text = "This is a message.";

23
packages/status-communities/src/messenger.ts
View File

@ -36,16 +36,27 @@ export class Messenger {
return new Messenger(identity, waku); return new Messenger(identity, waku);
} }
/**
* Joins a public chat using its id.
*
* For community chats, prefer [[joinChat]].
*
* Use `addListener` to get messages received on this chat.
*/
public async joinChatById(chatId: string): Promise<void> {
const chat = await Chat.create(chatId);
await this.joinChat(chat);
}
/** /**
* Joins a public chat. * Joins a public chat.
* *
* Use `addListener` to get messages received on this chat. * Use `addListener` to get messages received on this chat.
*/ */
public async joinChat(chatId: string): Promise<void> { public async joinChat(chat: Chat): Promise<void> {
if (this.chatsById.has(chatId)) if (this.chatsById.has(chat.id))
throw `Failed to join chat, it is already joined: ${chatId}`; throw `Failed to join chat, it is already joined: ${chat.id}`;
const chat = await Chat.create(chatId);
this.waku.addDecryptionKey(chat.symKey); this.waku.addDecryptionKey(chat.symKey);
@ -66,7 +77,7 @@ export class Messenger {
[chat.contentTopic] [chat.contentTopic]
); );
this.chatsById.set(chatId, chat); this.chatsById.set(chat.id, chat);
} }
/** /**