From 2d63fec04009d4e7c78b6d0eb82d709f70829b25 Mon Sep 17 00:00:00 2001
From: Wolfgang Ginolas <wolfgang.ginolas@gwif.eu>
Date: Tue, 17 Oct 2023 10:19:26 +0200
Subject: [PATCH] Fix image import from cryptpad

---
 www/common/image-dialog.js | 5 +++--
 www/diagram/inner.js       | 2 +-
 www/integration/main.js    | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/common/image-dialog.js b/www/common/image-dialog.js
index 998e2057f..246f7f387 100644
--- a/www/common/image-dialog.js
+++ b/www/common/image-dialog.js
@@ -36,7 +36,8 @@ define([
     return {
         openImageDialog: function(common, integrationChannel, data, cb) {
             if (integrationChannel) {
-                integrationChannel.query('Q_INTEGRATION_ON_INSERT_IMAGE', data, cb, {raw: true});
+                const ignoreFirstParam = (_, image) => cb(image);
+                integrationChannel.query('Q_INTEGRATION_ON_INSERT_IMAGE', data, ignoreFirstParam, {raw: true});
                 return;
             }
             common.openFilePicker({
@@ -46,7 +47,7 @@ define([
                     fileType: ['image/', 'application/x-drawio']
                 }
             }, (data) => {
-                getImage(data, function(blob) {
+                getImage(common, data, function(blob) {
                     common.setPadAttribute('atime', +new Date(), null, data.href);
                     cb({
                         name: data.name,
diff --git a/www/diagram/inner.js b/www/diagram/inner.js
index 112ebd11d..4359f45d3 100644
--- a/www/diagram/inner.js
+++ b/www/diagram/inner.js
@@ -125,7 +125,7 @@ define([
 
         APP.addImage = function() {
             return new Promise((resolve) => {
-                framework.insertImage({}, (_, image) => {
+                framework.insertImage({}, (image) => {
                     resolve(image);
                 });
             });
diff --git a/www/integration/main.js b/www/integration/main.js
index c4795bef1..fb3cfadce 100644
--- a/www/integration/main.js
+++ b/www/integration/main.js
@@ -34,6 +34,7 @@ define([
 
                 // On new command
                 var msg = data.msg;
+                if (!msg) { return; }
                 var txid = data.txid;
                 if (commands[msg.q]) {
                     commands[msg.q](msg.data, function (args) {