Merge pull request #1 from nomadic-labs/feature/add-dockerfile

add dockerfile

Dockerfile

@@ -0,0 +1,20 @@
+FROM node:10-alpine
+
+RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
+
+WORKDIR /home/node/app
+
+COPY ./src/ ./src/
+COPY ./transcripts/ ./transcripts/
+COPY package*.json ./
+
+USER node
+
+RUN npm config set strict-ssl false
+RUN npm install
+RUN npm config set strict-ssl true
+RUN npm run build
+
+COPY --chown=node:node . .
+
+CMD ["npm", "start"]

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "safesupport-bot",
+  "name": "private-safesupport-bot",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Chatbot to manage interactions on Safe Support Chat",
   "main": "dist/index.js",
   "scripts": {

src/bot.js

@@ -109,11 +109,10 @@ class OcrccBot {
     let chatOffline = true;
 
     try {
-      const data = await this.client.getGroupUsers(this.config.FACILITATOR_GROUP_ID)
+      const roomMembers = await this.client.getJoinedRoomMembers(this.config.FACILITATOR_ROOM_ID)
-      const members = data.chunk
+      const members = Object.keys(roomMembers["joined"]);
 
-      members.forEach(member => {
+      members.forEach(memberId => {
-        const memberId = member.user_id;
         const user = this.client.getUser(memberId);
         if (
           user &&
@@ -142,18 +141,17 @@ class OcrccBot {
     this.localStorage.removeItem(`${roomId}-waiting`)
 
     try {
-      const groupUsers = await this.client.getGroupUsers(this.config.FACILITATOR_GROUP_ID)
+      const facilitatorsRoomMembers = await this.client.getJoinedRoomMembers(this.config.FACILITATOR_ROOM_ID)
-      const roomMembers = await this.client.getJoinedRoomMembers(roomId)
+      const supportRoomMembers = await this.client.getJoinedRoomMembers(roomId)
 
-      const roomMemberIds = Object.keys(roomMembers["joined"]);
+      const roomMembersIds = Object.keys(supportRoomMembers["joined"]);
-      const groupMemberIds = groupUsers["chunk"]
+      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);
         }
       });