Merge branch 'develop' into feat/export-chats

CHANGELOG.md

@@ -1,3 +1,7 @@
+[unreleased]
+
+* Send an info message immediately after a user joins the community
+
 [2.0.3-alpha.6]
 
 * Fix: filter out invalid peer addresses in peer list. Update peer list in localdb.

packages/common/src/index.ts

@@ -9,3 +9,4 @@ export * from './naming'
 export * from './fileData'
 export * from './libp2p'
 export * from './tests'
+export * from './messages'

packages/common/src/messages.test.ts

@@ -0,0 +1,50 @@
+import { PublicChannelStorage } from '@quiet/types'
+import { generateChannelId } from './channelAddress'
+import { userCreatedChannelMessage, userJoinedMessage, verifyUserInfoMessage } from './messages'
+
+describe('messages helper', () => {
+  const username = 'johnny'
+
+  const generalChannel: PublicChannelStorage = {
+    name: 'general',
+    description: 'Welcome to #general',
+    timestamp: 1,
+    owner: username,
+    id: generateChannelId('general'),
+    messages: { ids: [], entities: {} },
+  }
+
+  const sportChannel: PublicChannelStorage = {
+    name: 'sport',
+    description: 'Welcome to #sport',
+    timestamp: 1,
+    owner: username,
+    id: generateChannelId('sport'),
+    messages: { ids: [], entities: {} },
+  }
+  it('userCreatedChannelMessage', () => {
+    const expectedMessage = '@johnny created #sport'
+    const message = userCreatedChannelMessage(username, sportChannel.name)
+    expect(message).toEqual(expectedMessage)
+  })
+
+  it('userJoinedMessage', () => {
+    const expectedMessage =
+      '**@johnny** has joined and will be registered soon. 🎉 [Learn more](https://github.com/TryQuiet/quiet/wiki/Quiet-FAQ#how-does-username-registration-work)'
+    const message = userJoinedMessage(username)
+    expect(message).toEqual(expectedMessage)
+  })
+
+  it('verifyUserInfoMessage - general channel', () => {
+    const expectedMessage =
+      '**@johnny** has joined and will be registered soon. 🎉 [Learn more](https://github.com/TryQuiet/quiet/wiki/Quiet-FAQ#how-does-username-registration-work)'
+    const message = verifyUserInfoMessage(username, generalChannel)
+    expect(message).toEqual(expectedMessage)
+  })
+
+  it('verifyUserInfoMessage - other channel', () => {
+    const expectedMessage = '@johnny created #sport'
+    const message = verifyUserInfoMessage(username, sportChannel)
+    expect(message).toEqual(expectedMessage)
+  })
+})

packages/common/src/messages.ts

@@ -0,0 +1,17 @@
+import { PublicChannelStorage } from '@quiet/types'
+
+export const userCreatedChannelMessage = (username: string, channelName: string) =>
+  `@${username} created #${channelName}`
+
+export const generalChannelDeletionMessage = (username: string) => `@${username} deleted all messages in #general`
+
+export const userJoinedMessage = (username: string) =>
+  `**@${username}** has joined and will be registered soon. 🎉 [Learn more](https://github.com/TryQuiet/quiet/wiki/Quiet-FAQ#how-does-username-registration-work)`
+
+export const verifyUserInfoMessage = (username: string, channel: PublicChannelStorage) => {
+  if (channel.name === 'general') {
+    return userJoinedMessage(username)
+  } else {
+    return userCreatedChannelMessage(username, channel.name)
+  }
+}

packages/e2e-tests/src/tests/invitationLink.test.ts

@@ -9,7 +9,7 @@ import {
   Sidebar,
   WarningModal,
 } from '../selectors'
-import { capitalizeFirstLetter, composeInvitationDeepUrl, parseInvitationCode } from '@quiet/common'
+import { capitalizeFirstLetter, composeInvitationDeepUrl, parseInvitationCode, userJoinedMessage } from '@quiet/common'
 import { execSync } from 'child_process'
 import { type SupportedPlatformDesktop } from '@quiet/types'
 
@@ -184,10 +184,13 @@ describe('New user joins using invitation link while having app opened', () => {
       console.log('Invitation Link', 21)
       const generalChannel = new Channel(ownerApp.driver, 'general')
       await generalChannel.element.isDisplayed()
-      const userJoinedMessage = await generalChannel.getMessage(
-        `@${joiningUserUsername} has joined ${capitalizeFirstLetter(communityName)}!`
+
+      const hasMessage = await generalChannel.waitForUserMessage(
+        joiningUserUsername,
+        userJoinedMessage(joiningUserUsername)
       )
-      expect(await userJoinedMessage.isDisplayed()).toBeTruthy()
+      const isMessageDisplayed = await hasMessage?.isDisplayed()
+      expect(isMessageDisplayed).toBeTruthy()
     })
   })
 })

packages/e2e-tests/src/tests/multipleClients.test.ts

@@ -186,7 +186,7 @@ describe('Multiple Clients', () => {
       const messages2 = await generalChannelUser1.getUserMessages(users.user1.username)
       const messages1 = await generalChannelUser1.getUserMessages(users.owner.username)
       console.log({ messages1, messages2 })
-      const text2 = await messages2[0].getText()
+      const text2 = await messages2[1].getText()
       expect(text2).toEqual(users.user1.messages[0])
     })
     it('First user opens the settings tab and copies updated invitation code', async () => {

packages/state-manager/src/sagas/communities/communities.selectors.test.ts

@@ -145,6 +145,11 @@ describe('communitiesSelectors', () => {
       'MIIDdDCCAxugAwIBAgIGAYeiqwwYMAoGCCqGSM49BAMCMA8xDTALBgNVBAMTBHRlc3QwHhcNMjMwNDIxMDcxNTMxWhcNMzAwMTMxMjMwMDAwWjBJMUcwRQYDVQQDEz5qYm1zbXR4Z2Rhd241ZTdyZ3Z5ZGZ3bGFuY3c1bnZkcmZjdXdvdmltNzJqeXY2ZTN5eDR0ZXhxZC5vbmlvbjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABBjP55M/p8QVQGdgjtAdGwLS8uyzyIaWzvnuCvOwLs/u+FHUdb0DU2+M4TYEZjVHmqn+hSERs4XHG0/tbaaGSyGjggInMIICIzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIAgDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwggFHBgkqhkiG9w0BCQwEggE4BIIBNCqfocsbSvEqAdeRObiywx0KV2r7xEnqFysFuc1InEpwF3707TZGrFxww74g/ccxHCZ9zda4EHawgLoU6oKdeyec8W7qAThnWCRzJcOPINdZaTR45g28jeWAXMAtVG6eYtEQS4t7g915QaB0uYUoM3Teqp/qaMhk/9Hs4jiKlN3wL9WFYRf14XQIIVu3Fb0f3sD2/ejNPRJztJeJCwYtcFNF3fhPpH5bSPlcy6IaxhQrMXboqAfSAUlnMD4PifHFxvQYbfvTEC65Gt+FzwJ956BA5PuKsGFf+NVznyp5/YtFrl0XRRdlBcTzp2jreqhxBCdsvCpPwvM2TRv4OPk+hjMPPzBdPgvs5tytiFFyK9hXemai2TTwP1qo+VuV5SYyAyZP4rPxc/XEDHk+W3QN0vF8Ff+iMBUGCisGAQQBg4wbAgEEBxMFYWxpY2UwPQYJKwYBAgEPAwEBBDATLlFtZVN0WFY5VERXVHhoYXZUd25DZWdaYnNvMndQZ3BYQ2lzdHlCTEo2b0MyZHcwSQYDVR0RBEIwQII+amJtc210eGdkYXduNWU3cmd2eWRmd2xhbmN3NW52ZHJmY3V3b3ZpbTcyanl2NmUzeXg0dGV4cWQub25pb24wCgYIKoZIzj0EAwIDRwAwRAIga3etWmNtiMT/SUZkG0Rf5kwl3HxsGDJXsU7X5aCQAvMCIFKVBnCbTPseU5gQwamWZDG9ZoMf0X1VGzYUixWvmzuc'
 
     const factory = await getFactory(store)
+    store.dispatch(
+      usersActions.storeUserCertificate({
+        certificate: ownerCertificate,
+      })
+    )
     await factory.create<ReturnType<typeof communitiesActions.addOwnerCertificate>['payload']>('Community', {
       ownerCertificate,
     })

packages/state-manager/src/sagas/communities/communities.selectors.ts

@@ -73,9 +73,10 @@ export const ownerNickname = createSelector(
   currentCommunity,
   getOldestParsedCerificate,
   (community, oldestParsedCerificate) => {
+    if (!oldestParsedCerificate) return undefined
     const ownerCertificate = community?.ownerCertificate || undefined
 
-    let nickname: string | null
+    let nickname: string | null = null
 
     if (ownerCertificate) {
       const certificate = ownerCertificate

packages/state-manager/src/sagas/communities/saveCommunityMetadata/saveCommunityMetadata.saga.ts

@@ -1,6 +1,7 @@
 import { type PayloadAction } from '@reduxjs/toolkit'
 import { put, select } from 'typed-redux-saga'
 import { type Socket } from '../../../types'
+import { publicChannelsActions } from '../../publicChannels/publicChannels.slice'
 import { communitiesSelectors } from '../communities.selectors'
 import { communitiesActions } from '../communities.slice'
 
@@ -22,4 +23,6 @@ export function* saveCommunityMetadataSaga(
       ownerCertificate: action.payload.ownerCertificate,
     })
   )
+
+  yield* put(publicChannelsActions.sendUnregisteredInfoMessage())
 }

packages/state-manager/src/sagas/messages/messages.selectors.test.ts

@@ -6,7 +6,7 @@ import { validCurrentPublicChannelMessagesEntries } from './messages.selectors'
 import { type communitiesActions } from '../communities/communities.slice'
 import { type identityActions } from '../identity/identity.slice'
 import { type FactoryGirl } from 'factory-girl'
-import { publicChannelsSelectors, selectGeneralChannel } from '../publicChannels/publicChannels.selectors'
+import { publicChannelsSelectors } from '../publicChannels/publicChannels.selectors'
 import { type Community, type Identity, type PublicChannel, type ChannelMessage } from '@quiet/types'
 
 describe('messagesSelectors', () => {
@@ -20,7 +20,7 @@ describe('messagesSelectors', () => {
   let alice: Identity
   let john: Identity
 
-  beforeAll(async () => {
+  beforeEach(async () => {
     setupCrypto()
 
     // Set date display format

packages/state-manager/src/sagas/messages/messages.selectors.ts

@@ -1,6 +1,6 @@
 import { createSelector } from 'reselect'
 import { channelMessagesAdapter } from '../publicChannels/publicChannels.adapter'
-import { currentChannelId } from '../publicChannels/publicChannels.selectors'
+import { currentChannelId, generalChannel } from '../publicChannels/publicChannels.selectors'
 import { StoreKeys } from '../store.keys'
 import { type CreatedSelectors, type StoreState } from '../store.types'
 import { allUsers } from '../users/users.selectors'