Improve Matrix support, standardize some service methods

lib/doorman.js

@@ -59,7 +59,7 @@ Doorman.prototype.start = function configure () {
 
   self.register({
     name: 'help',
-    value: `Available ${self.config.trigger}triggers: ${Object.keys(self.triggers).map(x => '`' + x + '`').join(', ')}`
+    value: `Available triggers: ${Object.keys(self.triggers).map(x => '`' + self.config.trigger + x + '`').join(', ')}`
   });
 
   if (self.config.debug) {
@@ -91,6 +91,8 @@ Doorman.prototype.enable = function enable (name) {
     self.emit('user', {
       id: [name, 'users', user.id].join('/'),
       name: user.name,
+      online: user.online || false,
+      subscriptions: [],
       '@data': user
     });
   });
@@ -99,6 +101,7 @@ Doorman.prototype.enable = function enable (name) {
     self.emit('channel', {
       id: [name, 'channels', channel.id].join('/'),
       name: channel.name,
+      members: [],
       '@data': channel
     });
   });

lib/service.js

@@ -70,4 +70,37 @@ Service.prototype.send = function send (channel, message, extra) {
   return this;
 };
 
+Service.prototype._registerUser = function registerUser (user) {
+  if (!user.id) return console.error('User must have an id.');
+  let id = `/users/${user.id}`;
+  this.map[id] = Object.assign({
+    subscriptions: []
+  }, this.map[id], user);
+  this.emit('user', this.map[id]);
+};
+
+Service.prototype._registerChannel = function registerChannel (channel) {
+  if (!channel.id) return console.error('Channel must have an id.');
+  let id = `/channels/${channel.id}`;
+  this.map[id] = Object.assign({
+    members: []
+  }, this.map[id], channel);
+  this.emit('channel', this.map[id]);
+};
+
+Service.prototype._getSubscriptions = async function getSubscriptions (id) {
+  let member = this.map[`/users/${id}`] || {};
+  return member.subscriptions || null;
+};
+
+Service.prototype._getMembers = async function getMembers (id) {
+  let channel = this.map[`/channels/${id}`] || {};
+  return channel.members || null;
+};
+
+Service.prototype._getPresence = async function getPresence (id) {
+  let member = this.map[`/users/${id}`] || {};
+  return member.presence || null;
+};
+
 module.exports = Service;

package.json

@@ -33,8 +33,8 @@
   "homepage": "https://github.com/FabricLabs/doorman#readme",
   "dependencies": {
     "@slack/client": "^4.1.0",
-    "discord.js": "^11.1.0",
-    "erm": "0.0.1",
+    "erm": "^0.0.1",
+    "marked": "^0.3.19",
     "matrix-js-sdk": "^0.10.1"
   },
   "devDependencies": {

services/matrix.js

@@ -2,6 +2,7 @@
 
 const util = require('util');
 const matrix = require('matrix-js-sdk');
+const markdown = require('marked');
 const Service = require('../lib/service');
 
 function Matrix (config) {
@@ -38,7 +39,7 @@ Matrix.prototype.ready = async function () {
 
   this.connection.on('event', this.handler.bind(this));
   this.connection.on('Room.timeline', function (event, room) {
-    console.log('shenanigans!', event, room);
+    //- console.log('shenanigans!', event, room);
   });
   this.connection.on('RoomMember.membership', function (event, member) {
     if (member.membership === 'invite' && member.userId === self.config.user) {
@@ -99,10 +100,9 @@ Matrix.prototype.handler = function route (message) {
 };
 
 Matrix.prototype.send = function send (channel, message) {
-  this.connection.sendMessage(channel, {
-    msgtype: 'text',
-    body: message
-  });
+  let html = markdown(message);
+  // TODO: complain to `matrix-js-sdk` about duplicate params
+  this.connection.sendHtmlMessage(channel, html, html);
 };
 
 Matrix.prototype._getChannels = async function getChannels () {
@@ -127,13 +127,28 @@ Matrix.prototype._getPresences = async function getPresences () {
   return result;
 };
 
+Matrix.prototype._getMembers = async function getMembers(id) {
+  let room = this.connection.getRoom(id);
+  return Object.keys(room.currentState.members);
+};
+
 Matrix.prototype._registerChannel = function registerChannel (channel) {
   if (!channel.id) return console.error('Channel must have an id.');
   let id = `/channels/${channel.id}`;
   this.map[id] = Object.assign({}, this.map[id], channel);
   this.emit('channel', this.map[id]);
 };
 
+Matrix.prototype._registerUser = function registerUser (user) {
+  if (!user.id) return console.error('User must have an id.');
+  let id = `/users/${user.id}`;
+  this.map[id] = Object.assign({
+    online: user.currentlyActive || false,
+    name: user.displayName || user.id
+  }, this.map[id], user);
+  this.emit('user', this.map[id]);
+};
+
 Matrix.prototype._presence_change = function handlePresence (message) {
   console.log('presence change:', message);