diff --git a/package.json b/package.json index 1a0aabfed6..1d4e2bf105 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "alkemio-server", - "version": "0.83.0", + "version": "0.83.1", "description": "Alkemio server, responsible for managing the shared Alkemio platform", "author": "Alkemio Foundation", "private": false, diff --git a/src/domain/community/community/community.service.events.ts b/src/domain/community/community/community.service.events.ts index c1f1af21ca..e4b9a0e5c4 100644 --- a/src/domain/community/community/community.service.events.ts +++ b/src/domain/community/community/community.service.events.ts @@ -34,7 +34,7 @@ export class CommunityEventsService { public async processCommunityNewMemberEvents( community: ICommunity, - spaceID: string, + rootSpaceID: string, displayName: string, agentInfo: AgentInfo, newContributor: IContributor @@ -50,14 +50,16 @@ export class CommunityEventsService { // Record the contribution events const space = - await this.communityResolverService.getSpaceForCommunityOrFail(spaceID); + await this.communityResolverService.getSpaceForCommunityOrFail( + community.id + ); switch (space.type) { case SpaceType.SPACE: this.contributionReporter.spaceJoined( { id: community.parentID, name: displayName, - space: spaceID, + space: rootSpaceID, }, { id: agentInfo.userID, @@ -70,7 +72,7 @@ export class CommunityEventsService { { id: community.parentID, name: displayName, - space: spaceID, + space: rootSpaceID, }, { id: agentInfo.userID, diff --git a/src/domain/community/user/user.resolver.fields.ts b/src/domain/community/user/user.resolver.fields.ts index 2763723eed..37d7940a37 100644 --- a/src/domain/community/user/user.resolver.fields.ts +++ b/src/domain/community/user/user.resolver.fields.ts @@ -63,7 +63,7 @@ export class UserResolverFields { agentInfo, profile.authorization, AuthorizationPrivilege.READ, - `read profile on User: ${profile.displayName}` + `read profile on User: ${profile.displayName} with current user being: ${agentInfo.userID}` ); return profile; } diff --git a/src/services/adapters/communication-adapter/communication.adapter.ts b/src/services/adapters/communication-adapter/communication.adapter.ts index 5be1e20471..4d00f74a72 100644 --- a/src/services/adapters/communication-adapter/communication.adapter.ts +++ b/src/services/adapters/communication-adapter/communication.adapter.ts @@ -91,7 +91,7 @@ export class CommunicationAdapter { ): Promise { const eventType = MatrixAdapterEventType.ROOM_SEND_MESSAGE; const inputPayload: RoomSendMessagePayload = { - triggeredBy: '', + triggeredBy: sendMessageData.senderCommunicationsID, roomID: sendMessageData.roomID, message: sendMessageData.message, senderID: sendMessageData.senderCommunicationsID, @@ -228,7 +228,7 @@ export class CommunicationAdapter { ): Promise { const eventType = MatrixAdapterEventType.ROOM_REMOVE_REACTION_TO_MESSAGE; const inputPayload: RoomRemoveMessageReactionPayload = { - triggeredBy: '', + triggeredBy: removeReactionData.senderCommunicationsID, roomID: removeReactionData.roomID, reactionID: removeReactionData.reactionID, senderID: removeReactionData.senderCommunicationsID, @@ -319,7 +319,7 @@ export class CommunicationAdapter { ): Promise { const eventType = MatrixAdapterEventType.ROOM_DELETE_MESSAGE; const inputPayload: RoomDeleteMessagePayload = { - triggeredBy: '', + triggeredBy: deleteMessageData.senderCommunicationsID, roomID: deleteMessageData.roomID, messageID: deleteMessageData.messageId, senderID: deleteMessageData.senderCommunicationsID,