1.1.3

add dockerfile

.env.sample

@@ -3,5 +3,6 @@ BOT_DISPLAY_NAME=
 BOT_USERNAME=
 BOT_PASSWORD=
 BOT_USERID=
+FACILITATOR_GROUP_ID=
 FACILITATOR_ROOM_ID=
-CHAT_OFFLINE_MESSAGE=
+CAPTURE_TRANSCRIPTS

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "safesupport-bot",
-  "version": "1.0.0",
+  "name": "private-safesupport-bot",
+  "version": "1.1.3",
   "description": "Chatbot to manage interactions on Safe Support Chat",
   "main": "dist/index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "dotenv": "^8.2.0",
-    "matrix-js-sdk": "^5.0.1",
+    "matrix-js-sdk": "^6.2.1",
     "node-localstorage": "^2.1.5",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "uuidv4": "^6.0.2",

src/bot.js

@@ -106,29 +106,29 @@ class OcrccBot {
 
   async inviteFacilitators(roomId) {
     this.localStorage.setItem(`${roomId}-waiting`, 'true')
-    let chatOffline = true;
+    let invitations = []
 
     try {
-      const data = await this.client.getGroupUsers(this.config.FACILITATOR_GROUP_ID)
-      const members = data.chunk
+      const roomMembers = await this.client.getJoinedRoomMembers(this.config.FACILITATOR_ROOM_ID)
+      const members = Object.keys(roomMembers["joined"]);
 
-      members.forEach(member => {
-        const memberId = member.user_id;
+      members.forEach(memberId => {
         const user = this.client.getUser(memberId);
         if (
           user &&
-          user.presence === "online" &&
+          (user.presence !== "offline") &&
           memberId !== this.config.BOT_USERID
         ) {
-          chatOffline = false;
+          invitations.push(memberId)
           this.inviteUserToRoom(roomId, memberId);
         }
       });
 
-      if (chatOffline) {
+      if (invitations.length > 0) {
+        this.localStorage.setItem(`${roomId}-invitations`, invitations)
+      } else {
         logger.log('info', "NO FACILITATORS ONLINE")
-        this.sendTextMessage(roomId, this.config.CHAT_OFFLINE_MESSAGE);
-        this.sendNotice(roomId, "Chat is offline")
+        this.sendNotice(roomId, "CHAT_OFFLINE")
       }
 
     } catch(err) {
@@ -142,18 +142,17 @@ class OcrccBot {
     this.localStorage.removeItem(`${roomId}-waiting`)
 
     try {
-      const groupUsers = await this.client.getGroupUsers(this.config.FACILITATOR_GROUP_ID)
-      const roomMembers = await this.client.getJoinedRoomMembers(roomId)
+      const facilitatorsRoomMembers = await this.client.getJoinedRoomMembers(this.config.FACILITATOR_ROOM_ID)
+      const supportRoomMembers = await this.client.getJoinedRoomMembers(roomId)
 
-      const roomMemberIds = Object.keys(roomMembers["joined"]);
-      const groupMemberIds = groupUsers["chunk"]
+      const roomMembersIds = Object.keys(supportRoomMembers["joined"]);
+      const facilitatorsIds = Object.keys(facilitatorsRoomMembers["joined"]);
 
-      if (!roomMemberIds || !groupMemberIds) return;
+      if (!roomMembersIds || !facilitatorsIds) return;
 
-      const facilitatorsIds = groupMemberIds.map(f => f.user_id);
 
       facilitatorsIds.forEach(f => {
-        if (!roomMemberIds.includes(f)) {
+        if (!roomMembersIds.includes(f)) {
           this.kickUserFromRoom(roomId, f);
         }
       });
@@ -291,17 +290,20 @@ class OcrccBot {
       }
 
       const filename = path.basename(transcriptFile) || "Transcript";
-      const stream = fs.createReadStream(transcriptFile);
+      const file = fs.readFileSync(transcriptFile);
+      const stats = fs.statSync(transcriptFile);
 
-      const contentUrl = await this.client.uploadContent({
-        stream: stream,
-        name: filename
-      })
+      const url = await this.client.uploadContent(file, { rawResponse: false, type: 'text/plain' })
+      logger.log('info', url)
 
       const content = {
         msgtype: "m.file",
         body: filename,
-        url: JSON.parse(contentUrl).content_uri,
+        info: {
+          size: stats.size,
+          mimetype: 'text/plain'
+        },
+        url: url.content_uri,
         showToUser: senderId
       };
 
@@ -388,61 +390,78 @@ class OcrccBot {
         try {
           const room = await this.client.joinRoom(member.roomId)
           logger.log("info", "AUTO JOINED ROOM => " + room.roomId)
-          this.sendTextMessage(
-            this.config.FACILITATOR_ROOM_ID,
-            `A support seeker requested a chat (Room ID: ${room.roomId})`
-          );
+          const currentDate = new Date()
+          const chatDate = currentDate.toLocaleDateString()
+          const chatTime = currentDate.toLocaleTimeString()
+          const roomId = room.roomId.split(':')[0]
+          const notification = `Incoming support chat at ${chatTime} (room ID: ${roomId})`
+          this.sendTextMessage(this.config.FACILITATOR_ROOM_ID, notification);
           this.inviteFacilitators(room.roomId)
         } catch(err) {
           logger.log("error", "ERROR JOINING ROOM => " + err)
         }
       }
 
-      // When a facilitator joins a support session, make them a moderator
-      // revoke the other invitations
       if (
         member.membership === "join" &&
         member.userId !== this.config.BOT_USERID &&
         this.localStorage.getItem(`${member.roomId}-waiting`)
       ) {
-        this.localStorage.setItem(`${member.roomId}-facilitator`, member.userId)
-        const event = {
-          getType: () => {
-            return "m.room.power_levels";
-          },
-          getContent: () => {
-            return {
-              users: {
-                [this.config.BOT_USERID]: 100,
-                [member.userId]: 50
-              }
-            };
-          }
-        };
-        this.client.setPowerLevel(member.roomId, member.userId, 50, event);
-        this.sendTextMessage(
-          member.roomId,
-          `${member.name} has joined the chat.`
-        );
-        this.sendTextMessage(
-          this.config.FACILITATOR_ROOM_ID,
-          `${member.name} joined the chat (Room ID: ${member.roomId})`
-        );
-        this.uninviteFacilitators(member.roomId);
-        if (this.config.CAPTURE_TRANSCRIPTS) {
-          const currentDate = new Date();
-          const dateOpts = {
-            year: "numeric",
-            month: "short",
-            day: "numeric"
+        // make sure it's a facilitator joining
+        const roomMembers = await this.client.getJoinedRoomMembers(this.config.FACILITATOR_ROOM_ID)
+        const members = Object.keys(roomMembers["joined"]);
+        const isFacilitator = members.includes(member.userId)
+
+        if (isFacilitator) {
+          // made facilitator a moderator in the room
+          this.localStorage.setItem(`${member.roomId}-facilitator`, member.userId)
+          const event = {
+            getType: () => {
+              return "m.room.power_levels";
+            },
+            getContent: () => {
+              return {
+                users: {
+                  [this.config.BOT_USERID]: 100,
+                  [member.userId]: 50
+                }
+              };
+            }
           };
-          const chatDate = currentDate.toLocaleDateString("en-GB", dateOpts);
-          const chatTime = currentDate.toLocaleTimeString("en-GB", {
-            timeZone: "America/New_York"
-          });
-          const filename = `${chatDate} - ${chatTime} - ${member.roomId}.txt`;
-          const filepath = path.resolve(path.join("transcripts", filename));
-          this.localStorage.setItem(`${member.roomId}-transcript`, filepath)
+          this.client.setPowerLevel(member.roomId, member.userId, 50, event);
+
+          // send notification to Support Chat Notifications room
+          const currentDate = new Date()
+          const chatTime = currentDate.toLocaleTimeString()
+          const roomId = member.roomId.split(':')[0]
+          const notification = `${member.name} joined the chat at ${chatTime} (room ID: ${roomId})`
+          this.sendTextMessage(this.config.FACILITATOR_ROOM_ID, notification);
+
+          // send notification to chat room
+          this.sendTextMessage(
+            member.roomId,
+            `${member.name} has joined the chat.`
+          );
+
+          // revoke the other invitations
+          this.uninviteFacilitators(member.roomId);
+
+          // set transcript file
+          if (this.config.CAPTURE_TRANSCRIPTS) {
+            const currentDate = new Date();
+            const dateOpts = {
+              year: "numeric",
+              month: "short",
+              day: "numeric"
+            };
+            const chatDate = currentDate.toLocaleDateString("en-GB", dateOpts);
+            const chatTime = currentDate.toLocaleTimeString("en-GB", {
+              timeZone: "America/New_York"
+            });
+            const filename = `${chatDate} - ${chatTime} - ${member.roomId}.txt`;
+            const filepath = path.resolve(path.join("transcripts", filename));
+            this.localStorage.setItem(`${member.roomId}-transcript`, filepath)
+          }
         }
       }
 
@@ -472,7 +491,7 @@ class OcrccBot {
           this.client.leave(member.roomId)
         }
       }
-    });
+    })
   }
 
   async setMessageListeners() {

src/index.js

@@ -13,8 +13,7 @@ const {
   BOT_DISPLAY_NAME,
   FACILITATOR_GROUP_ID,
   FACILITATOR_ROOM_ID,
-  CHAT_OFFLINE_MESSAGE,
-  CAPTURE_TRANSCRIPTS
+  CAPTURE_TRANSCRIPTS,
 } = process.env;
 
 const botConfig = {
@@ -29,8 +28,7 @@ const botConfig = {
   BOT_DISPLAY_NAME,
   FACILITATOR_GROUP_ID,
   FACILITATOR_ROOM_ID,
-  CHAT_OFFLINE_MESSAGE,
-  CAPTURE_TRANSCRIPTS
+  CAPTURE_TRANSCRIPTS,
 }
 
 import OcrccBot from './bot'

yarn.lock

@@ -3762,10 +3762,10 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-matrix-js-sdk@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-5.1.0.tgz#9b3b02af227ecc2d0cc35fb7312c92b8a6754293"
-  integrity sha512-IGRq5iACiKp3iIxAghwtdBPrbdgORowc0i8YuIMkZZMpRJDXnNaudt2BFwyQdukV7gvzz7F0sfxBUerySfOnKA==
+matrix-js-sdk@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz#d5f76491a650c0a36fcdd078cff59f2da96edd7b"
+  integrity sha512-X12Y2SMg8MOJwE5P3VMsMV/mnQHOmyJkF+FZRida124w4B4tBJouaNxteYyYaH34w+wyaKGxuqEBXecfSpfvbw==
   dependencies:
     "@babel/runtime" "^7.8.3"
     another-json "^0.2.0"