refactor code for generating uuid

Signed-off-by: nurjinn jafar <[email protected]>
nordeck · Sep 22, 2023 · b18619b · b18619b
1 parent a3257ab
commit b18619b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/matrix-meetings-bot/src/IEventContentParams.ts b/matrix-meetings-bot/src/IEventContentParams.ts
@@ -15,7 +15,6 @@
  */
 
 import { base32 } from 'rfc4648';
-import { v4 as uuiv4 } from 'uuid';
 
 export interface IEventContentParams {
   room_id?: string;
@@ -32,13 +31,16 @@ class EventContentParamsHelper {
     const base32RoomId = roomId
       ? base32.stringify(Buffer.from(roomId), { pad: false })
       : undefined;
+    const base32AsUuid = roomId
+      ? base32.stringify(Buffer.from(roomId), { pad: true }).slice(0, 25)
+      : undefined;
     const nonNullTitle = title || '';
 
     return {
       room_id: roomId,
       base32_room_id: base32RoomId,
       title: nonNullTitle,
-      uuid: uuiv4(),
+      uuid: base32AsUuid,
     };
   }
 }

diff --git a/matrix-meetings-bot/src/client/WidgetClient.ts b/matrix-meetings-bot/src/client/WidgetClient.ts
@@ -134,7 +134,6 @@ export class WidgetClient {
     roomTitle: string | undefined,
     widgetId: string,
     eventContent: IWidgetContent | undefined,
-    widgetStateKey?: string,
   ): Promise<void> {
     if (!this.isCustomConfiguredWidget(widgetId)) return;
 
@@ -167,14 +166,12 @@ export class WidgetClient {
     );
 
     if (!_.isEqual(eventContent, newEventContent)) {
-      if (widgetStateKey !== 'etherpad') {
-        await this.client.sendStateEvent(
-          roomId,
-          StateEventName.IM_VECTOR_MODULAR_WIDGETS_EVENT,
-          widgetId,
-          newEventContent,
-        );
-      }
+      await this.client.sendStateEvent(
+        roomId,
+        StateEventName.IM_VECTOR_MODULAR_WIDGETS_EVENT,
+        widgetId,
+        newEventContent,
+      );
     }
   }
 

diff --git a/matrix-meetings-bot/src/service/MeetingService.ts b/matrix-meetings-bot/src/service/MeetingService.ts
@@ -450,7 +450,6 @@ export class MeetingService {
           newMeeting.title,
           widgetId,
           widgetEventContent,
-          room.widgetEventById(widgetId)?.state_key,
         ),
       );
     }
@@ -601,7 +600,6 @@ export class MeetingService {
             room.meeting.title,
             widgetId,
             widgetEventContent,
-            room.widgetEventById(widgetId)?.state_key,
           ),
         );
       }

diff --git a/matrix-meetings-bot/test/MeetingService.test.ts b/matrix-meetings-bot/test/MeetingService.test.ts
@@ -1771,20 +1771,23 @@ describe('test relevant functionality of MeetingService', () => {
       const e = StateEventName.IM_VECTOR_MODULAR_WIDGETS_EVENT;
       verify(
         clientMock.sendStateEvent(parentId, e, anything(), anything()),
-      ).times(3);
+      ).times(4);
 
       expect(callInfo(0, SendStateEventParameter.Content, e).type).toBe(
         WidgetType.COCKPIT,
       ); // added cockpit
       expect(callInfo(1, SendStateEventParameter.Content, e).type).toBe(
         'net.nordeck.poll',
       ); // updated poll
+      expect(callInfo(2, SendStateEventParameter.Content, e).type).toBe(
+        'm.etherpad',
+      ); // updated etherpad
 
       // verify removed whiteboard
-      expect(callInfo(2, SendStateEventParameter.StateKey, e)).toBe(
+      expect(callInfo(3, SendStateEventParameter.StateKey, e)).toBe(
         'whiteboard',
       );
-      expect(callInfo(2, SendStateEventParameter.Content, e)).toStrictEqual({});
+      expect(callInfo(3, SendStateEventParameter.Content, e)).toStrictEqual({});
     });
 
     test('no layout config', async () => {