bidirectional images! dupes when sent from matrix

Author: kfatehi

config.sample.json

@@ -1,6 +1,7 @@
 {
   "registrationPath": "imessage-registration.yaml",
   "ichatArchives": "~/Library/Containers/com.apple.iChat/Data/Library/Messages/Archive/**/*.ichat",
+  "attachmentsDir": "~/Library/Messages/Attachments",
   "port": 8090,
   "bridge": {
     "homeserverUrl":"https://yourserver.com",

index.js

@@ -6,20 +6,20 @@ const {
     Cli, AppServiceRegistration
   },
   Puppet,
-  MatrixPuppetBridgeBase
+  MatrixPuppetBridgeBase,
+  utils: { download }
 } = require("matrix-puppet-bridge");
 const puppet = new Puppet('./config.json');
-
+const sizeOf = require('image-size');
+const mime = require('mime-types');
+const findAttachment = require('./src/find-attachment');
 
 class App extends MatrixPuppetBridgeBase {
   getServicePrefix() {
     return "imessage";
   }
-  defaultDeduplicationTag() {
-    return " \ufeff"; // Zero width non-breaking space
-  }
-  defaultDeduplicationTagPattern() {
-    return " \\ufeff$"; // Zero width non-breaking space
+  getServiceName() {
+    return "iMessage";
   }
   initThirdPartyClient() {
     this.roomData = {};
@@ -57,24 +57,37 @@ class App extends MatrixPuppetBridgeBase {
       topic: isMultiParty ? 'iMessage: group chat' : 'iMessage: 1-on-1 chat'
     };
 
-    if ( files.length > 0 ) {
-      message = `[This iMessage has ${files.length} attachments!]\n${message}`;
-    }
-
     // too hard to get one thru applescripting contacts, just allow null
     // so that we can use bang commands and have them persist forever.
     // by preventing base class from calling setDisplayName when senderName is null
     this.allowNullSenderName = true;
 
-    return Promise.all([
-      this.setRoomService(roomId, service),
-      this.handleThirdPartyRoomMessage({
+    return this.setRoomService(roomId, service).then(()=>{
+      let payload = {
         roomId,
         senderName: isMultiParty ? null : fileRecipient,
         senderId: senderIsMe ? undefined : sender,
         text: message
-      })
-    ]).then(() => {
+      };
+      if ( files.length > 0 ) {
+        return Promise.map(files, (file)=>{
+          return findAttachment(file.id, file.name).then(filepath=>{
+            payload.path = filepath;
+            payload.mimetype = mime.lookup(payload.path);
+            if ( payload.mimetype.match(/^image/) ) {
+              const dim = sizeOf(payload.path);
+              payload.h = dim.height;
+              payload.w = dim.width;
+              return this.handleThirdPartyRoomImageMessage(payload);
+            } else {
+              return this.sendStatusMsg({}, "dont know how to deal with filetype", payload);
+            }
+          });
+        });
+      } else {
+        return this.handleThirdPartyRoomMessage(payload);
+      }
+    }).then(() => {
       return this.getOrCreateMatrixRoomFromThirdPartyRoomId(roomId);
     }).then((matrixRoomId) => {
       // we need to pre-emptively put all the participants into the room
@@ -132,12 +145,17 @@ class App extends MatrixPuppetBridgeBase {
       return isGroup ? sendGroupMessage(handles, text) : sendMessage(id, service, text);
     });
   }
-  sendPictureMessageAsPuppetToThirdPartyRoomWithId(id, text, img, matrixEvent) {
+
+  sendImageMessageAsPuppetToThirdPartyRoomWithId(id, { url, text }, matrixEvent) {
     const { sendGroupMessage, sendMessage } = this.client;
-    return this.prepareToSend(id, matrixEvent).then(({isGroup, handles, service})=>{
-      return isGroup ? sendGroupMessage(handles, text, img) : sendMessage(id, service, text, img);
+    return download.getTempfile(url).then(({path}) => {
+      const img = path;
+      return this.prepareToSend(id, matrixEvent).then(({isGroup, handles, service})=>{
+        return isGroup ? sendGroupMessage(handles, text, img) : sendMessage(id, service, text, img);
+      });
     });
   }
+
   handleMatrixUserBangCommand(bangCmd, matrixMsgEvent) {
     const { bangcommand, command, body } = bangCmd;
     const { room_id } = matrixMsgEvent;

mr-goldenfold.png

@@ -20,7 +20,9 @@
     "JSONStream": "^1.3.0",
     "bluebird": "^3.4.7",
     "chokidar": "^1.6.1",
-    "matrix-puppet-bridge": "^1.9.0",
+    "image-size": "^0.5.1",
+    "matrix-puppet-bridge": "^1.12.0",
+    "mime-types": "^2.1.15",
     "moment": "^2.17.1",
     "node-persist": "^2.0.7",
     "queue": "^4.0.1"

package.json

@@ -0,0 +1,16 @@
+const Promise = require('bluebird');
+const exec = require('child_process').exec;
+const config = require('../config.json');
+
+module.exports = function(id, name) {
+  return new Promise(function(resolve, reject) {
+    exec(`find ${config.attachmentsDir}/*/*/${name}/${id}`, function(err, stdout, stderr) {
+      if (err) {
+        console.error(stderr);
+        return reject(err);
+      } else {
+        return resolve(stdout.trim());
+      }
+    });
+  });
+};

src/find-attachment.js

@@ -16,23 +16,22 @@ module.exports = function(handles, _message, file) {
     buddySetters.push(`set ${buddyVar} to first buddy whose handle is "${handle}"`);
   });
 
-  const attachment = () => {
+  const tellBody = () => {
     if ( file ){
       return `
       set theAttachment1 to POSIX file "${file}"
       send theAttachment1 to thisChat
       `;
     } else {
-      return '';
+      return `send "${message}" to thisChat`;
     }
   };
 
   args.push(`tell application "Messages"
     activate
     ${buddySetters.join('\n\t')}
     set thisChat to make new text chat with properties {participants:{${buddyVars.join(',')}}}
-    ${attachment()}
-    send "${message}" to thisChat
+    ${tellBody()}
   end tell`);
 
   console.log('full applescript', args[1]);

src/imessage-send-group.js

@@ -12,34 +12,22 @@ module.exports = function(to, _method, _message, file) {
   console.log('escaped to', message);
   let args = ['-e'];
 
-  const attachment = (method, buddy) => {
+  const tellBody = () => {
     if ( file ){
       return `
       set theAttachment1 to POSIX file "${file}"
-      send theAttachment1 to buddy ${buddy} of ${method}
+      send theAttachment1 to buddy "${to}" of ${method}
       `;
     } else {
-      return '';
+      return `send "${message}" to buddy "${to}" of ${method}`;
     }
   };
 
-
-  // If string contains letters, it must be a contact name so
-  // find the relevant phone number first
-  if (/[a-z]/i.test(to)) {
-    args.push(`tell application "Contacts"
-    set i to value of phone 1 of (person 1 whose name = "${to}")
-    end tell
-    tell application "Messages"
-    ${attachment(method, 'i')}
-    send "${message}" to buddy i of ${method}
-    end tell`);
-  } else {
-    args.push(`tell application "Messages"
-    ${attachment(method, '"'+to+'"')}
-    send "${message}" to buddy "${to}" of ${method}
+  args.push(`tell application "Messages"
+    activate
+    ${tellBody()}
     end tell`);
-  }
+
   console.log('full applescript', args[1]);
 
   return new Promise(function(resolve, reject) {