5 Commits

Author SHA1 Message Date
Sharon Kennedy
f838637d7a 1.1.5 2020-07-01 00:51:46 -04:00
Sharon Kennedy
404f440f48 wait for initial sync before adding listeners 2020-07-01 00:51:29 -04:00
Sharon
14ed711b6a Update README.md 2020-06-19 13:55:36 -04:00
Sharon Kennedy
13dd515522 1.1.4 2020-06-19 12:57:47 -04:00
Sharon Kennedy
391bd22121 fix duplicate notifications on support chat request; fix transcript attachment filename 2020-06-19 12:57:23 -04:00
9 changed files with 238 additions and 117 deletions

View File

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

View File

@@ -11,7 +11,6 @@ BOT_USERNAME=
BOT_PASSWORD= BOT_PASSWORD=
BOT_USERID= BOT_USERID=
FACILITATOR_ROOM_ID= FACILITATOR_ROOM_ID=
FACILITATOR_GROUP_ID=
CHAT_OFFLINE_MESSAGE= CHAT_OFFLINE_MESSAGE=
CAPTURE_TRANSCRIPTS= CAPTURE_TRANSCRIPTS=
``` ```

213
dist/bot.js vendored
View File

@@ -28,7 +28,6 @@ global.Olm = require("olm");
class OcrccBot { class OcrccBot {
constructor(botConfig) { constructor(botConfig) {
this.config = botConfig; this.config = botConfig;
this.awaitingFacilitator = {};
this.client = matrix.createClient(this.config.MATRIX_SERVER_URL); this.client = matrix.createClient(this.config.MATRIX_SERVER_URL);
this.joinedRooms = []; this.joinedRooms = [];
} }
@@ -54,11 +53,38 @@ class OcrccBot {
this.sendMessage(roomId, content); this.sendMessage(roomId, content);
} }
async sendMessage(roomId, content) { async sendNotice(roomId, message) {
_logger.default.log("info", `SENDING MESSAGE: ${content.body}`); _logger.default.log("info", `SENDING *NOTICE*: ${message}`);
try {
await this.client.sendNotice(roomId, message);
} catch (err) {
switch (err["name"]) {
case "UnknownDeviceError":
Object.keys(err.devices).forEach(userId => {
Object.keys(err.devices[userId]).map(async deviceId => {
try {
await this.client.setDeviceVerified(userId, deviceId, true);
} catch (err) {
_logger.default.log("error", `ERROR VERIFYING DEVICE: ${err}`);
}
});
});
await this.sendNotice(roomId, message);
default:
_logger.default.log("error", `ERROR SENDING *NOTICE*: ${err}`);
break;
}
}
}
async sendMessage(roomId, content) {
try { try {
await this.client.sendMessage(roomId, content); await this.client.sendMessage(roomId, content);
_logger.default.log("info", `SENT MESSAGE: ${content.body}`);
} catch (err) { } catch (err) {
switch (err["name"]) { switch (err["name"]) {
case "UnknownDeviceError": case "UnknownDeviceError":
@@ -101,25 +127,26 @@ class OcrccBot {
async inviteFacilitators(roomId) { async inviteFacilitators(roomId) {
this.localStorage.setItem(`${roomId}-waiting`, 'true'); this.localStorage.setItem(`${roomId}-waiting`, 'true');
let chatOffline = true; let invitations = [];
try { 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); const user = this.client.getUser(memberId);
if (user && user.presence === "online" && memberId !== this.config.BOT_USERID) { if (user && user.presence !== "offline" && memberId !== this.config.BOT_USERID) {
chatOffline = false; invitations.push(memberId);
this.inviteUserToRoom(roomId, memberId); this.inviteUserToRoom(roomId, memberId);
} }
}); });
if (chatOffline) { if (invitations.length > 0) {
this.localStorage.setItem(`${roomId}-invitations`, invitations);
} else {
_logger.default.log('info', "NO FACILITATORS ONLINE"); _logger.default.log('info', "NO FACILITATORS ONLINE");
this.sendTextMessage(roomId, this.config.CHAT_OFFLINE_MESSAGE); this.sendNotice(roomId, "CHAT_OFFLINE");
} }
} catch (err) { } catch (err) {
this.handleBotCrash(roomId, err); this.handleBotCrash(roomId, err);
@@ -132,12 +159,13 @@ class OcrccBot {
this.localStorage.removeItem(`${roomId}-waiting`); this.localStorage.removeItem(`${roomId}-waiting`);
try { 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 membersIds = Object.keys(roomMembers["joined"]); const roomMembersIds = Object.keys(supportRoomMembers["joined"]);
const facilitatorsIds = groupUsers.chunk.map(f => f.user_id); const facilitatorsIds = Object.keys(facilitatorsRoomMembers["joined"]);
if (!roomMembersIds || !facilitatorsIds) return;
facilitatorsIds.forEach(f => { facilitatorsIds.forEach(f => {
if (!membersIds.includes(f)) { if (!roomMembersIds.includes(f)) {
this.kickUserFromRoom(roomId, f); this.kickUserFromRoom(roomId, f);
} }
}); });
@@ -212,6 +240,10 @@ class OcrccBot {
this.sendTranscript(senderId, roomId); this.sendTranscript(senderId, roomId);
break; break;
case "delete transcript":
this.deleteTranscript(senderId, roomId);
break;
case "hi": case "hi":
const responses = ["Hi!", "Hello", "Hey :)", "Hi there", "Bleep bloop"]; const responses = ["Hi!", "Hello", "Hey :)", "Hi there", "Bleep bloop"];
const message = responses[Math.floor(Math.random() * responses.length)]; const message = responses[Math.floor(Math.random() * responses.length)];
@@ -258,16 +290,25 @@ class OcrccBot {
} }
const filename = path.basename(transcriptFile) || "Transcript"; const filename = path.basename(transcriptFile) || "Transcript";
const stream = fs.createReadStream(transcriptFile); const file = fs.readFileSync(transcriptFile);
const contentUrl = await this.client.uploadContent({ const stats = fs.statSync(transcriptFile);
stream: stream, const url = await this.client.uploadContent(file, {
rawResponse: false,
name: filename name: filename
}); });
_logger.default.log('info', url);
const content = { const content = {
msgtype: "m.file", msgtype: "m.file",
body: filename, body: filename,
url: JSON.parse(contentUrl).content_uri, info: {
showToUser: senderId size: stats.size,
mimetype: 'text/plain'
},
url: url.content_uri,
showToUser: senderId,
mimetype: 'text/plain'
}; };
this.sendMessage(roomId, content); this.sendMessage(roomId, content);
} catch (err) { } catch (err) {
@@ -277,6 +318,30 @@ class OcrccBot {
} }
} }
deleteTranscript(senderId, roomId) {
const transcriptFile = this.localStorage.getItem(`${roomId}-transcript`);
if (!transcriptFile) {
return this.sendTextMessage(roomId, "There is no transcript for this chat.", senderId);
}
fs.unlink(transcriptFile, err => {
if (err) {
_logger.default.log('error', "UNABLE TO DELETE TRANSCRIPT FILE => " + transcriptFile);
_logger.default.log('error', err);
return this.sendTextMessage(roomId, `There was an error deleting the transcript: ${err}`, senderId);
}
this.localStorage.removeItem(`${roomId}-transcript`);
_logger.default.log('info', "DELETED TRANSCRIPT FILE => " + transcriptFile);
this.sendTextMessage(roomId, `The transcript file has been deleted.`, senderId);
});
}
async deleteOldDevices() { async deleteOldDevices() {
const currentDeviceId = this.client.getDeviceId(); const currentDeviceId = this.client.getDeviceId();
const deviceData = await this.client.getDevices(); const deviceData = await this.client.getDevices();
@@ -316,53 +381,76 @@ class OcrccBot {
this.client.on("RoomMember.membership", async (event, member) => { this.client.on("RoomMember.membership", async (event, member) => {
if (member.membership === "invite" && member.userId === this.config.BOT_USERID && !this.joinedRooms.includes(member.roomId)) { if (member.membership === "invite" && member.userId === this.config.BOT_USERID && !this.joinedRooms.includes(member.roomId)) {
try { try {
const room = await this.client.joinRoom(member.roomId); const roomData = await this.client.getJoinedRooms();
const joinedRooms = roomData["joined_rooms"];
_logger.default.log("info", "AUTO JOINED ROOM => " + room.roomId); if (!joinedRooms.includes(member.roomId)) {
const room = await this.client.joinRoom(member.roomId);
this.sendTextMessage(this.config.FACILITATOR_ROOM_ID, `A support seeker requested a chat (Room ID: ${room.roomId})`); _logger.default.log("info", "AUTO JOINED ROOM => " + room.roomId);
this.inviteFacilitators(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) { } catch (err) {
_logger.default.log("error", "ERROR JOINING ROOM => " + err); _logger.default.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`)) { if (member.membership === "join" && member.userId !== this.config.BOT_USERID && this.localStorage.getItem(`${member.roomId}-waiting`)) {
this.localStorage.setItem(`${member.roomId}-facilitator`, member.userId); // make sure it's a facilitator joining
const event = { const roomMembers = await this.client.getJoinedRoomMembers(this.config.FACILITATOR_ROOM_ID);
getType: () => { const members = Object.keys(roomMembers["joined"]);
return "m.room.power_levels"; const isFacilitator = members.includes(member.userId);
},
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) { if (isFacilitator) {
const currentDate = new Date(); // made facilitator a moderator in the room
const dateOpts = { this.localStorage.setItem(`${member.roomId}-facilitator`, member.userId);
year: "numeric", const event = {
month: "short", getType: () => {
day: "numeric" return "m.room.power_levels";
},
getContent: () => {
return {
users: {
[this.config.BOT_USERID]: 100,
[member.userId]: 50
}
};
}
}; };
const chatDate = currentDate.toLocaleDateString("en-GB", dateOpts); this.client.setPowerLevel(member.roomId, member.userId, 50, event); // send notification to Support Chat Notifications room
const chatTime = currentDate.toLocaleTimeString("en-GB", {
timeZone: "America/New_York" const currentDate = new Date();
}); const chatTime = currentDate.toLocaleTimeString();
const filename = `${chatDate} - ${chatTime} - ${member.roomId}.txt`; const roomId = member.roomId.split(':')[0];
const filepath = path.resolve(path.join("transcripts", filename)); const notification = `${member.name} joined the chat at ${chatTime} (room ID: ${roomId})`;
this.localStorage.setItem(`${member.roomId}-transcript`, filepath); 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);
}
} }
} }
@@ -379,12 +467,13 @@ class OcrccBot {
const memberCount = room.getJoinedMemberCount(); const memberCount = room.getJoinedMemberCount();
if (memberCount === 1) { if (memberCount === 1) {
// just the bot // just the bot left
_logger.default.log("info", `LEAVING EMPTY ROOM ==> ${member.roomId}`); _logger.default.log("info", `LEAVING EMPTY ROOM ==> ${member.roomId}`);
this.client.leave(member.roomId); this.deleteTranscript(member.userId, member.roomId);
this.localStorage.removeItem(`${member.roomId}-facilitator`); this.localStorage.removeItem(`${member.roomId}-facilitator`);
this.localStorage.removeItem(`${member.roomId}-transcript`); this.localStorage.removeItem(`${member.roomId}-transcript`);
this.client.leave(member.roomId);
} }
} }
}); });

58
dist/bot.test.js vendored
View File

@@ -18,6 +18,36 @@ var _bot = _interopRequireDefault(require("./bot"));
require('dotenv').config(); require('dotenv').config();
const ENCRYPTION_CONFIG = {
algorithm: "m.megolm.v1.aes-sha2"
};
const KICK_REASON = "A facilitator has already joined this chat.";
const BOT_ERROR_MESSAGE = "Something went wrong on our end, please restart the chat and try again.";
const MAX_RETRIES = 3;
const {
MATRIX_SERVER_URL,
BOT_USERNAME,
BOT_USERID,
BOT_PASSWORD,
BOT_DISPLAY_NAME,
FACILITATOR_ROOM_ID,
CHAT_OFFLINE_MESSAGE,
CAPTURE_TRANSCRIPTS
} = process.env;
const botConfig = {
ENCRYPTION_CONFIG,
KICK_REASON,
BOT_ERROR_MESSAGE,
MAX_RETRIES,
MATRIX_SERVER_URL,
BOT_USERNAME,
BOT_USERID,
BOT_PASSWORD,
BOT_DISPLAY_NAME,
FACILITATOR_ROOM_ID,
CHAT_OFFLINE_MESSAGE,
CAPTURE_TRANSCRIPTS
};
const mockAppendFileSync = jest.fn(); const mockAppendFileSync = jest.fn();
fs.appendFileSync = mockAppendFileSync; fs.appendFileSync = mockAppendFileSync;
describe('OcrccBot', () => { describe('OcrccBot', () => {
@@ -75,19 +105,17 @@ describe('OcrccBot', () => {
_matrixJsSdk.mockGetGroupUsers.mockClear(); _matrixJsSdk.mockGetGroupUsers.mockClear();
}); });
test('constructor should inititialize class variables', () => { test('constructor should inititialize class variables', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
expect(bot.joinedRooms).toEqual([]); expect(bot.joinedRooms).toEqual([]);
expect(bot.awaitingFacilitator).toEqual({});
expect(bot.activeChatrooms).toEqual({});
}); });
test('#createLocalStorage should have correct storage location', () => { test('#createLocalStorage should have correct storage location', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
const localStorage = bot.createLocalStorage(); const localStorage = bot.createLocalStorage();
const localStoragePath = path.resolve(path.join(os.homedir(), ".local-storage", `matrix-chatbot-${process.env.BOT_USERNAME}`)); const localStoragePath = path.resolve(path.join(os.homedir(), ".local-storage", `matrix-chatbot-${process.env.BOT_USERNAME}`));
expect(localStorage._location).toBe(localStoragePath); expect(localStorage._location).toBe(localStoragePath);
}); });
test('#sendMessage should send a text message', () => { test('#sendMessage should send a text message', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
@@ -103,7 +131,7 @@ describe('OcrccBot', () => {
}); });
}); });
test('#inviteUserToRoom should add member to room and retry on rate limit error', () => { test('#inviteUserToRoom should add member to room and retry on rate limit error', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
@@ -114,7 +142,7 @@ describe('OcrccBot', () => {
}); });
}); });
test('#kickUserFromRoom should remove member from room and retry on rate limit error', () => { test('#kickUserFromRoom should remove member from room and retry on rate limit error', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
@@ -125,7 +153,7 @@ describe('OcrccBot', () => {
}); });
}); });
test('#inviteFacilitators should invite all members from Facilitator room', () => { test('#inviteFacilitators should invite all members from Facilitator room', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
@@ -142,7 +170,7 @@ describe('OcrccBot', () => {
}); });
}); });
test('#uninviteFacilitators should remove all members that have not accepted the invite', () => { test('#uninviteFacilitators should remove all members that have not accepted the invite', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
@@ -159,7 +187,7 @@ describe('OcrccBot', () => {
}); });
}); });
test('#handleBotCrash should notify rooms', () => { test('#handleBotCrash should notify rooms', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
@@ -173,11 +201,9 @@ describe('OcrccBot', () => {
}); });
}); });
test('#writeToTranscript should parse event and write to transcript file', () => { test('#writeToTranscript should parse event and write to transcript file', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
bot.activeChatrooms['test_room_id'] = { bot.localStorage.setItem(`test_room_id-transcript`, '__mocks__/test_transcript.txt');
transcriptFile: '__mocks__/test_transcript.txt'
};
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
}); });
@@ -199,7 +225,7 @@ describe('OcrccBot', () => {
}); });
}); });
test('#deleteOldDevices should delete old sessions', () => { test('#deleteOldDevices should delete old sessions', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled(); expect(_matrixJsSdk.mockStartClient).toHaveBeenCalled();
@@ -217,7 +243,7 @@ describe('OcrccBot', () => {
}); // TODO test listeners for membership events and message events }); // TODO test listeners for membership events and message events
test('#start should start bot and set up listeners', () => { test('#start should start bot and set up listeners', () => {
const bot = new _bot.default(); const bot = new _bot.default(botConfig);
bot.start(); bot.start();
(0, _waitForExpect.default)(() => { (0, _waitForExpect.default)(() => {
expect(_matrixJsSdk.mockLogin).toHaveBeenCalled(); expect(_matrixJsSdk.mockLogin).toHaveBeenCalled();

4
dist/index.js vendored
View File

@@ -18,9 +18,7 @@ const {
BOT_USERID, BOT_USERID,
BOT_PASSWORD, BOT_PASSWORD,
BOT_DISPLAY_NAME, BOT_DISPLAY_NAME,
FACILITATOR_GROUP_ID,
FACILITATOR_ROOM_ID, FACILITATOR_ROOM_ID,
CHAT_OFFLINE_MESSAGE,
CAPTURE_TRANSCRIPTS CAPTURE_TRANSCRIPTS
} = process.env; } = process.env;
const botConfig = { const botConfig = {
@@ -33,9 +31,7 @@ const botConfig = {
BOT_USERID, BOT_USERID,
BOT_PASSWORD, BOT_PASSWORD,
BOT_DISPLAY_NAME, BOT_DISPLAY_NAME,
FACILITATOR_GROUP_ID,
FACILITATOR_ROOM_ID, FACILITATOR_ROOM_ID,
CHAT_OFFLINE_MESSAGE,
CAPTURE_TRANSCRIPTS CAPTURE_TRANSCRIPTS
}; };
const bot = new _bot.default(botConfig); const bot = new _bot.default(botConfig);

View File

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

View File

@@ -64,9 +64,9 @@ class OcrccBot {
} }
async sendMessage(roomId, content) { async sendMessage(roomId, content) {
logger.log("info", `SENDING MESSAGE: ${content.body}`)
try { try {
await this.client.sendMessage(roomId, content) await this.client.sendMessage(roomId, content)
logger.log("info", `SENT MESSAGE: ${content.body}`)
} catch(err) { } catch(err) {
switch (err["name"]) { switch (err["name"]) {
case "UnknownDeviceError": case "UnknownDeviceError":
@@ -81,7 +81,7 @@ class OcrccBot {
}); });
await this.sendMessage(roomId, content); await this.sendMessage(roomId, content);
default: default:
logger.log("error", `ERROR SENDING MESSAGE: ${err}`); logger.log("error", `ERROR SENDING MESSAGE ${content.body}: ${err}`);
break; break;
} }
} }
@@ -293,7 +293,7 @@ class OcrccBot {
const file = fs.readFileSync(transcriptFile); const file = fs.readFileSync(transcriptFile);
const stats = fs.statSync(transcriptFile); const stats = fs.statSync(transcriptFile);
const url = await this.client.uploadContent(file, { rawResponse: false, type: 'text/plain' }) const url = await this.client.uploadContent(file, { rawResponse: false, name: filename })
logger.log('info', url) logger.log('info', url)
const content = { const content = {
@@ -304,7 +304,8 @@ class OcrccBot {
mimetype: 'text/plain' mimetype: 'text/plain'
}, },
url: url.content_uri, url: url.content_uri,
showToUser: senderId showToUser: senderId,
mimetype: 'text/plain'
}; };
this.sendMessage(roomId, content); this.sendMessage(roomId, content);
@@ -388,15 +389,19 @@ class OcrccBot {
!this.joinedRooms.includes(member.roomId) !this.joinedRooms.includes(member.roomId)
) { ) {
try { try {
const room = await this.client.joinRoom(member.roomId) const roomData = await this.client.getJoinedRooms()
logger.log("info", "AUTO JOINED ROOM => " + room.roomId) const joinedRooms = roomData["joined_rooms"]
const currentDate = new Date() if (!joinedRooms.includes(member.roomId)) {
const chatDate = currentDate.toLocaleDateString() const room = await this.client.joinRoom(member.roomId)
const chatTime = currentDate.toLocaleTimeString() logger.log("info", "AUTO JOINED ROOM => " + room.roomId)
const roomId = room.roomId.split(':')[0] const currentDate = new Date()
const notification = `Incoming support chat at ${chatTime} (room ID: ${roomId})` const chatDate = currentDate.toLocaleDateString()
this.sendTextMessage(this.config.FACILITATOR_ROOM_ID, notification); const chatTime = currentDate.toLocaleTimeString()
this.inviteFacilitators(room.roomId) 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) { } catch(err) {
logger.log("error", "ERROR JOINING ROOM => " + err) logger.log("error", "ERROR JOINING ROOM => " + err)
} }
@@ -469,26 +474,31 @@ class OcrccBot {
member.membership === "leave" && member.membership === "leave" &&
member.userId !== this.config.BOT_USERID member.userId !== this.config.BOT_USERID
) { ) {
const facilitatorId = this.localStorage.getItem(`${member.roomId}-facilitator`) // ensure bot is still in the room
if (member.userId === facilitatorId) { const roomData = await this.client.getJoinedRooms()
this.sendTextMessage( const joinedRooms = roomData["joined_rooms"]
member.roomId, const isBotInRoom = joinedRooms.includes(member.roomId)
`${member.name} has left the chat.`
);
}
// leave if there is nobody in the room
const room = this.client.getRoom(member.roomId) const room = this.client.getRoom(member.roomId)
if (!room) return if (!room) return
// leave if there is nobody in the room
const memberCount = room.getJoinedMemberCount() const memberCount = room.getJoinedMemberCount()
if (memberCount === 1 && isBotInRoom) { // just the bot left
if (memberCount === 1) { // just the bot left
logger.log("info", `LEAVING EMPTY ROOM ==> ${member.roomId}`); logger.log("info", `LEAVING EMPTY ROOM ==> ${member.roomId}`);
this.deleteTranscript(member.userId, member.roomId); this.deleteTranscript(member.userId, member.roomId);
this.localStorage.removeItem(`${member.roomId}-facilitator`) this.localStorage.removeItem(`${member.roomId}-facilitator`)
this.localStorage.removeItem(`${member.roomId}-transcript`) this.localStorage.removeItem(`${member.roomId}-transcript`)
this.client.leave(member.roomId) return this.client.leave(member.roomId)
}
// notify room if the facilitator has left
const facilitatorId = this.localStorage.getItem(`${member.roomId}-facilitator`)
if (isBotInRoom && member.userId === facilitatorId) {
this.sendTextMessage(
member.roomId,
`${member.name} has left the chat.`
);
} }
} }
}) })
@@ -546,12 +556,18 @@ class OcrccBot {
}; };
this.client = matrix.createClient(opts); this.client = matrix.createClient(opts);
await this.deleteOldDevices()
await this.trackJoinedRooms()
await this.client.initCrypto() await this.client.initCrypto()
await this.setMembershipListeners();
await this.setMessageListeners();
this.client.startClient({ initialSyncLimit: 0 }) this.client.startClient({ initialSyncLimit: 0 })
this.client.once('sync', async (state, prevState, data) => {
logger.log("info", `SYNC STATUS: ${state}`)
if (state === 'PREPARED') {
await this.deleteOldDevices()
await this.trackJoinedRooms()
await this.setMembershipListeners();
await this.setMessageListeners();
}
});
} catch(err) { } catch(err) {
this.handleBotCrash(undefined, err); this.handleBotCrash(undefined, err);
logger.log("error", `ERROR INITIALIZING CLIENT: ${err}`); logger.log("error", `ERROR INITIALIZING CLIENT: ${err}`);

View File

@@ -48,7 +48,6 @@ const {
BOT_USERID, BOT_USERID,
BOT_PASSWORD, BOT_PASSWORD,
BOT_DISPLAY_NAME, BOT_DISPLAY_NAME,
FACILITATOR_GROUP_ID,
FACILITATOR_ROOM_ID, FACILITATOR_ROOM_ID,
CHAT_OFFLINE_MESSAGE, CHAT_OFFLINE_MESSAGE,
CAPTURE_TRANSCRIPTS CAPTURE_TRANSCRIPTS
@@ -64,7 +63,6 @@ const botConfig = {
BOT_USERID, BOT_USERID,
BOT_PASSWORD, BOT_PASSWORD,
BOT_DISPLAY_NAME, BOT_DISPLAY_NAME,
FACILITATOR_GROUP_ID,
FACILITATOR_ROOM_ID, FACILITATOR_ROOM_ID,
CHAT_OFFLINE_MESSAGE, CHAT_OFFLINE_MESSAGE,
CAPTURE_TRANSCRIPTS CAPTURE_TRANSCRIPTS

View File

@@ -11,7 +11,6 @@ const {
BOT_USERID, BOT_USERID,
BOT_PASSWORD, BOT_PASSWORD,
BOT_DISPLAY_NAME, BOT_DISPLAY_NAME,
FACILITATOR_GROUP_ID,
FACILITATOR_ROOM_ID, FACILITATOR_ROOM_ID,
CAPTURE_TRANSCRIPTS, CAPTURE_TRANSCRIPTS,
} = process.env; } = process.env;
@@ -26,7 +25,6 @@ const botConfig = {
BOT_USERID, BOT_USERID,
BOT_PASSWORD, BOT_PASSWORD,
BOT_DISPLAY_NAME, BOT_DISPLAY_NAME,
FACILITATOR_GROUP_ID,
FACILITATOR_ROOM_ID, FACILITATOR_ROOM_ID,
CAPTURE_TRANSCRIPTS, CAPTURE_TRANSCRIPTS,
} }