Merge pull request #25 from alkem-io/develop

Release: Updated Message Interface
alkem-io · Jun 14, 2023 · b609f34 · b609f34
2 parents 43e2629 + f721f1f
commit b609f34
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/lib/package-lock.json b/lib/package-lock.json
diff --git a/lib/package.json b/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alkemio/matrix-adapter-lib",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Library for interacting with Alkemio Matrix Adapter service",
   "author": "Alkemio Foundation",
   "private": false,

diff --git a/lib/src/types/message.ts b/lib/src/types/message.ts
@@ -11,5 +11,5 @@ export class IMessage {
 
   timestamp!: number;
 
-  reactions?: IReaction[];
+  reactions!: IReaction[];
 }
diff --git a/lib/src/types/room.ts b/lib/src/types/room.ts
@@ -1,4 +1,4 @@
-import { IMessage } from "./message";
+import { IMessage } from './message';
 
 export class RoomResult {
   id!: string;

diff --git a/service/package-lock.json b/service/package-lock.json
diff --git a/service/package.json b/service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "alkemio-matrix-adapter",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Alkemio Matrix Adapter service",
   "author": "Alkemio Foundation",
   "private": false,
@@ -34,7 +34,7 @@
     "typeorm": "ts-node -r tsconfig-paths/register ./node_modules/typeorm/cli.js --config src/config/typeorm.cli.config.ts"
   },
   "dependencies": {
-    "@alkemio/matrix-adapter-lib": "^0.3.5",
+    "@alkemio/matrix-adapter-lib": "^0.3.6",
     "@nestjs/axios": "^2.0.0",
     "@nestjs/common": "^9.4.0",
     "@nestjs/config": "^2.3.1",

diff --git a/service/src/services/communication-adapter/communication.adapter.ts b/service/src/services/communication-adapter/communication.adapter.ts
@@ -117,6 +117,7 @@ export class CommunicationAdapter {
       message: message,
       sender: sendMessageData.senderID,
       timestamp: timestamp,
+      reactions: [],
     };
   }
 
@@ -167,6 +168,8 @@ export class CommunicationAdapter {
       message: message,
       sender: sendMessageData.senderID,
       timestamp: timestamp,
+      reactions: [],
+      threadID: sendMessageData.threadID,
     };
   }
 

diff --git a/service/src/services/matrix/adapter-room/matrix.room.adapter.ts b/service/src/services/matrix/adapter-room/matrix.room.adapter.ts
@@ -369,7 +369,7 @@ export class MatrixRoomAdapter {
       }
     }
     for (const message of messages) {
-      message.reactions = reactionsMap.get(message.id);
+      message.reactions = reactionsMap.get(message.id) ?? [];
     }
 
     this.logger.verbose?.(