solid-ui 2.4.27-2ebac088 → 2.4.27-3652e5cb

package/lib/chat/keys.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"keys.js","names":["debug","_interopRequireWildcard","require","_secp256k","_utils","_signature","_solidLogic","$rdf","_cryptoKeyHelpers","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","_typeof","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","generatePrivateKey","bytesToHex","schnorr","utils","randomPrivateKey","generatePublicKey","privateKey","getPublicKey","_x","_getPublicKey","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","webId","publicKeyDoc","wrap","_callee$","_context","prev","next","store","fetcher","load","pubKeyUrl","any","sym","CERT","abrupt","value","t0","undefined","stop","getPrivateKey","_x2","_getPrivateKey","_callee2","privateKeyDoc","publicKey","validPublicKey","del","add","newPublicKey","keyContainer","_callee2$","_context2","privKeyUrl","publicKeyExists","sent","privateKeyExists","confirm","st","literal","saveKey","lit","log","substring","lastIndexOf","setAcl","keyContainerAclBody","me","aclBody","concat","keyAclBody","keyDoc","keyAgent","length","split","pop","_x3","_x4","_setAcl","_callee3","keyAclDoc","response","aclResponse","_callee3$","_context3","statementsMatching","Error","webOperation","status","data","contentType","_x5","_x6","_x7","_saveKey","_callee4","_callee4$","_context4","updater","updateMany","t1"],"sources":["../../src/chat/keys.ts"],"sourcesContent":["import * as debug from '../debug'\r\nimport { schnorr } from '@noble/curves/secp256k1'\r\nimport { bytesToHex } from '@noble/hashes/utils'\r\nimport { CERT } from './signature'\r\nimport { store } from 'solid-logic'\r\nimport * as $rdf from 'rdflib'\r\nimport { publicKeyExists, pubKeyUrl, privKeyUrl, privateKeyExists } from '../utils/cryptoKeyHelpers'\r\n\r\nexport function generatePrivateKey (): string {\r\n  return bytesToHex(schnorr.utils.randomPrivateKey())\r\n}\r\n\r\nexport function generatePublicKey (privateKey: string): string {\r\n  return bytesToHex(schnorr.getPublicKey(privateKey))\r\n}\r\n\r\nexport async function getPublicKey (webId) {\r\n  await store.fetcher.load(webId)\r\n  const publicKeyDoc = pubKeyUrl(webId)\r\n  try {\r\n    await store.fetcher.load(publicKeyDoc) // url.href)\r\n    const key = store.any(store.sym(webId), store.sym(CERT + 'PublicKey'))\r\n    return key?.value // as NamedNode\r\n  } catch (err) {\r\n    return undefined\r\n  }\r\n  // this is called in display message and should not try to create a publicKeyDoc\r\n  // const publicKey = await publicKeyExists(webId)\r\n  // return publicKey\r\n}\r\n\r\nexport async function getPrivateKey (webId: string) {\r\n  await store.fetcher.load(webId)\r\n  // find keys url's\r\n  const publicKeyDoc = pubKeyUrl(webId)\r\n  const privateKeyDoc = privKeyUrl(webId)\r\n\r\n  // find key pair\r\n  const publicKey = await publicKeyExists(webId)\r\n  let privateKey = await privateKeyExists(webId)\r\n\r\n  // is publicKey valid ?\r\n  let validPublicKey = true\r\n  if (privateKey && (publicKey !== generatePublicKey(privateKey as string))) {\r\n    if (confirm('This is strange the publicKey is not valid for\\n' + webId +\r\n     '\\'shall we repair keeping the private key ?')) validPublicKey = false\r\n  }\r\n\r\n  // create key pair or repair publicKey\r\n  if (!privateKey || !publicKey || !validPublicKey) {\r\n    let del: any[] = []\r\n    let add: any[] = []\r\n    // if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyDoc)))\r\n\r\n    if (!privateKey) {\r\n      // add = []\r\n      privateKey = generatePrivateKey()\r\n      add = [$rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyDoc))]\r\n      await saveKey(privateKeyDoc, [], add, webId)\r\n    }\r\n    if (!publicKey || !validPublicKey) {\r\n      del = []\r\n      // delete invalid public key\r\n      if (publicKey) {\r\n        del = [$rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyDoc))]\r\n        debug.log(del)\r\n      }\r\n      // update new valid key\r\n      const newPublicKey = generatePublicKey(privateKey)\r\n      add = [$rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PublicKey'), $rdf.literal(newPublicKey), $rdf.sym(publicKeyDoc))]\r\n      await saveKey(publicKeyDoc, del, add)\r\n    }\r\n    const keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1)\r\n    await setAcl(keyContainer, keyContainerAclBody(webId)) // includes DELETE and PUT\r\n  }\r\n  return privateKey as string\r\n}\r\n\r\n/**\r\n * key container ACL\r\n * @param me\r\n * @returns aclBody\r\n */\r\nconst keyContainerAclBody = (me: string) => {\r\n  const aclBody = `\r\n@prefix : <#>.\r\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\r\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\r\n@prefix key: <./>.\r\n\r\n:ReadWrite\r\n    a acl:Authorization;\r\n    acl:accessTo key:;\r\n    acl:default key:;\r\n    acl:agent <${me}>;\r\n    acl:mode acl:Read, acl:Write.\r\n`\r\n  return aclBody\r\n}\r\n\r\n/**\r\n * Read only ACL\r\n * @param keyDoc\r\n * @param me\r\n * @returns aclBody\r\n */\r\nconst keyAclBody = (keyDoc, me) => {\r\n  let keyAgent = 'acl:agentClass foaf:Agent' // publicKey\r\n  if (me?.length) keyAgent = `acl:agent <${me}>` // privateKey\r\n  const aclBody = `\r\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\r\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\r\n<#Read>\r\n    a acl:Authorization;\r\n    ${keyAgent};\r\n    acl:accessTo <${keyDoc.split('/').pop()}>;\r\n    acl:mode acl:Read.\r\n`\r\n  return aclBody\r\n}\r\n\r\n/**\r\n * set ACL\r\n * @param keyDoc\r\n * @param aclBody\r\n */\r\nasync function setAcl (keyDoc, aclBody) {\r\n  // Some servers don't present a Link http response header\r\n  // if the container doesn't exist yet, so refetch the resource\r\n  await store.fetcher.load(keyDoc)\r\n\r\n  // FIXME: check the Why value on this quad:\r\n  debug.log(store.statementsMatching($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl')))\r\n  const keyAclDoc = store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n  if (!keyAclDoc) {\r\n    throw new Error('Key ACL doc not found!')\r\n  }\r\n\r\n  // delete READ only keyAclDoc. This is possible if the webId is an owner\r\n  try {\r\n    const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner\r\n    debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx\r\n  } catch (err) {\r\n    if (err.response.status !== 404) { throw new Error(err) }\r\n    debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\r\n  }\r\n\r\n  const aclResponse = await store.fetcher.webOperation('PUT', keyAclDoc.value, {\r\n    data: aclBody,\r\n    contentType: 'text/turtle'\r\n  })\r\n}\r\n\r\n/**\r\n * delete acl if keydoc exists\r\n * create/edit keyDoc\r\n * set keyDoc acl\r\n */\r\nasync function saveKey (keyDoc, del, add, me = '') {\r\n  await store.fetcher.load(keyDoc)\r\n  // delete keyAclDoc\r\n  try {\r\n    // get keyAcldoc\r\n    const keyAclDoc = store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'))\r\n    if (keyAclDoc) {\r\n      // delete READ only keyAclDoc. This is possible if the webId is an owner\r\n      try {\r\n        const response = await store.fetcher.webOperation('DELETE', keyAclDoc.value) // this may fail if webId is not an owner\r\n        debug.log('delete ' + keyAclDoc.value + ' ' + response.status) // should test 404 and 2xx\r\n      } catch (err) {\r\n        if (err.response.status !== 404) { throw new Error(err) }\r\n        debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\r\n      }\r\n    }\r\n\r\n    // save key\r\n    await store.updater.updateMany(del, add) // or a promise store.updater.update ?\r\n\r\n    // create READ only ACL\r\n    const aclBody = keyAclBody(keyDoc, me)\r\n    await setAcl(keyDoc, aclBody)\r\n  } catch (err) { throw new Error(err) }\r\n}\r\n"],"mappings":"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"}

package/lib/chat/message.js

@@ -12,7 +12,6 @@ exports.renderMessageEditor = renderMessageEditor;
 exports.renderMessageRow = renderMessageRow;
 exports.switchToEditor = switchToEditor;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _infinite = require("./infinite");
 var _messageTools = require("./messageTools");
@@ -28,11 +27,11 @@ var pad = _interopRequireWildcard(require("../pad"));
 var style = _interopRequireWildcard(require("../style"));
 var utils = _interopRequireWildcard(require("../utils"));
 var widgets = _interopRequireWildcard(require("../widgets"));
+var _signature = require("./signature");
+var _keys = require("./keys");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 var dom = window.document;
@@ -111,232 +110,154 @@ function creatorAndDateHorizontal(td1, creator, date, message) {
 /**
  * Renders a chat message, read-only mode
  */
-function renderMessageRow(_x, _x2, _x3, _x4, _x5) {
-  return _renderMessageRow.apply(this, arguments);
-}
-function _renderMessageRow() {
-  _renderMessageRow = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(channelObject, message, fresh, options, userContext) {
-    var colorizeByAuthor, creator, date, latestVersion, content, versions, replies, thread, straightReplies, _iterator2, _step2, reply, originalMessage, edited, sortDate, messageRow, td1, img, bothDates, td2, text, isURI, para, isImage, _img, anc, bgcolor, getBgColor, strip, td3, toolsButton;
-    return _regenerator["default"].wrap(function _callee9$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
-        case 0:
-          getBgColor = function _getBgColor(fresh) {
-            return fresh ? '#e8ffe8' : 'white';
-          };
-          colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true;
-          creator = _solidLogic.store.any(message, ns.foaf('maker'));
-          date = _solidLogic.store.any(message, ns.dct('created'));
-          _context10.next = 6;
-          return (0, _chatLogic.mostRecentVersion)(message);
-        case 6:
-          latestVersion = _context10.sent;
-          content = _solidLogic.store.any(latestVersion, ns.sioc('content')); // const id = store.any(latestVersion, ns.sioc('id'))
-          // const replies = store.each(latestVersion, ns.sioc('has_reply'))
-          _context10.next = 10;
-          return (0, _chatLogic.allVersions)(message);
-        case 10:
-          versions = _context10.sent;
-          if (versions.length > 1) {
-            debug.log('renderMessageRow versions: ', versions.join(',  '));
-          }
-          // be tolerant in accepting replies on any version of a message
-          replies = versions.map(function (version) {
-            return _solidLogic.store.each(version, ns.sioc('has_reply'));
-          }).flat();
-          thread = null;
-          straightReplies = [];
-          _iterator2 = _createForOfIteratorHelper(replies);
-          try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              reply = _step2.value;
-              if (_solidLogic.store.holds(reply, ns.rdf('type'), ns.sioc('Thread'))) {
-                thread = reply;
-                debug.log('renderMessageRow: found thread: ' + thread);
-              } else {
-                straightReplies.push(reply);
-              }
-            }
-          } catch (err) {
-            _iterator2.e(err);
-          } finally {
-            _iterator2.f();
-          }
-          if (straightReplies.length > 1) {
-            debug.log('renderMessageRow: found normal replies: ', straightReplies);
-          }
-          _context10.next = 20;
-          return (0, _chatLogic.originalVersion)(message);
-        case 20:
-          originalMessage = _context10.sent;
-          edited = !message.sameTerm(originalMessage); // @@ load it first  @@   Or display the new data at the old date.
-          // @@@ kludge!
-          sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()) || _solidLogic.store.the(message, ns.dct('created'), null, message.doc()); // In message
-          messageRow = dom.createElement('tr');
-          messageRow.AJAR_date = sortDate.value;
-          messageRow.AJAR_subject = message;
-          td1 = dom.createElement('td');
-          messageRow.appendChild(td1);
-          if (!options.authorDateOnLeft) {
-            img = dom.createElement('img');
-            img.setAttribute('style', 'max-height: 2.5em; max-width: 2.5em; border-radius: 0.5em; margin: auto;');
-            widgets.setImage(img, creator);
-            td1.appendChild(img);
-          } else {
-            creatorAndDate(td1, creator, widgets.shortDate(sortDate.value), message);
-          }
-          bothDates = widgets.shortDate(sortDate.value);
-          if (edited) {
-            bothDates += ' ... ' + widgets.shortDate(date.value);
-          }
+function renderMessageRow(channelObject, message, fresh, options, userContext) {
+  var colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true;
+  var creator = _solidLogic.store.any(message, ns.foaf('maker'));
+  var date = _solidLogic.store.any(message, ns.dct('created'));
+  var latestVersion = (0, _chatLogic.mostRecentVersion)(message);
+  var latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker'));
 
-          // Render the content ot the message itself
-          td2 = messageRow.appendChild(dom.createElement('td'));
-          if (!options.authorDateOnLeft) {
-            creatorAndDateHorizontal(td2, creator, bothDates,
-            // widgets.shortDate(dateString)
-            message);
-          }
-          text = content ? content.value.trim() : '??? no content?';
-          isURI = /^https?:\/[^ <>]*$/i.test(text);
-          para = null;
-          if (isURI) {
-            isImage = /\.(gif|jpg|jpeg|tiff|png|svg)$/i.test(text); // @@ Should use content-type not URI
-            if (isImage && options.expandImagesInline) {
-              _img = elementForImageURI(text, options);
-              td2.appendChild(_img);
-            } else {
-              // Link but not Image
-              anc = td2.appendChild(dom.createElement('a'));
-              para = anc.appendChild(dom.createElement('p'));
-              anc.href = text;
-              para.textContent = text;
-              td2.appendChild(anc);
-            }
-          } else {
-            // text
-            para = dom.createElement('p');
-            td2.appendChild(para);
-            para.textContent = text;
-          }
-          if (para) {
-            bgcolor = colorizeByAuthor ? pad.lightColorHash(creator) : getBgColor(fresh);
-            para.setAttribute('style', messageBodyStyle + 'background-color: ' + bgcolor + ';');
-          }
-          _context10.next = 40;
-          return (0, _messageTools.sentimentStripLinked)(message, message.doc());
-        case 40:
-          strip = _context10.sent;
-          if (strip.children.length) {
-            td2.appendChild(dom.createElement('br'));
-            td2.appendChild(strip);
-          }
+  // use latest content if same owner, else use original
+  var msgId = creator.uri === latestVersionCreator.uri ? latestVersion : message;
+  var content = _solidLogic.store.any(msgId, ns.sioc('content'));
+  var signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "Proof")));
 
-          // Message tool bar button
-          td3 = dom.createElement('td');
-          messageRow.appendChild(td3);
-          toolsButton = widgets.button(dom, _iconBase.icons.iconBase + 'noun_243787.svg', '...');
-          td3.appendChild(toolsButton);
-          toolsButton.addEventListener('click', /*#__PURE__*/function () {
-            var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(_event) {
-              var toolsTR, tools, toolsTD;
-              return _regenerator["default"].wrap(function _callee8$(_context9) {
-                while (1) switch (_context9.prev = _context9.next) {
-                  case 0:
-                    if (!messageRow.toolTR) {
-                      _context9.next = 4;
-                      break;
-                    }
-                    // already got a toolbar? Toogle
-                    messageRow.parentNode.removeChild(messageRow.toolTR);
-                    delete messageRow.toolTR;
-                    return _context9.abrupt("return");
-                  case 4:
-                    toolsTR = dom.createElement('tr');
-                    _context9.next = 7;
-                    return (0, _messageTools.messageToolbar)(message, messageRow, _objectSpread(_objectSpread({}, userContext), {}, {
-                      chatOptions: options
-                    }), channelObject);
-                  case 7:
-                    tools = _context9.sent;
-                    tools.style = 'border: 0.05em solid #888; border-radius: 0 0 0.7em 0.7em;  border-top: 0; height:3.5em; background-color: #fff;'; // @@ fix
-                    if (messageRow.nextSibling) {
-                      messageRow.parentElement.insertBefore(toolsTR, messageRow.nextSibling);
-                    } else {
-                      messageRow.parentElement.appendChild(toolsTR);
-                    }
-                    messageRow.toolTR = toolsTR;
-                    toolsTR.appendChild(dom.createElement('td')); // left
-                    toolsTD = toolsTR.appendChild(dom.createElement('td'));
-                    toolsTR.appendChild(dom.createElement('td')); // right
-                    toolsTD.appendChild(tools);
-                  case 15:
-                  case "end":
-                    return _context9.stop();
-                }
-              }, _callee8);
-            }));
-            return function (_x20) {
-              return _ref4.apply(this, arguments);
-            };
-          }());
-          if (thread && options.showThread) {
-            debug.log('  message has thread ' + thread);
-            td3.appendChild(widgets.button(dom, _iconBase.icons.iconBase + 'noun_1180164.svg',
-            // right arrow .. @@ think of stg better
-            'see thread', function (_e) {
-              debug.log('@@@@ Calling showThread thread ' + thread);
-              options.showThread(thread, options);
-            }));
-          }
-          return _context10.abrupt("return", messageRow);
-        case 49:
-        case "end":
-          return _context10.stop();
+  // set message object
+  var msg = (0, _signature.getBlankMsg)();
+  msg.id = msgId.uri;
+  msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
+  msg.content = content.value;
+  msg.maker = creator.uri;
+
+  // unsigned message
+  if (!(signature !== null && signature !== void 0 && signature.value)) debug.warn(msgId.uri + ' is unsigned'); // TODO replace with UI (colored message ?)
+
+  // signed message, get public key and check signature
+  else {
+    (0, _keys.getPublicKey)(creator.uri).then(function (publicKey) {
+      debug.log(creator.uri + '\n' + msg.created + '\n' + msg.id + '\n' + publicKey);
+      if (!publicKey) {
+        // TODO try to recreate the publicKey
+        // if(me.uri === creator.uri) await getPrivateKey(creator.uri)
+        debug.warn('message is signed but ' + creator.uri + ' is missing publicKey');
       }
-    }, _callee9);
-  }));
-  return _renderMessageRow.apply(this, arguments);
+      // check that publicKey is a valid hex string
+      var regex = /[0-9A-Fa-f]{6}/g;
+      if (!(publicKey !== null && publicKey !== void 0 && publicKey.match(regex))) debug.warn('invalid publicKey hex string\n' + creator.uri + '\n' + publicKey);
+      // verify signature
+      else if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature === null || signature === void 0 ? void 0 : signature.value, msg, publicKey)) debug.warn('invalid signature\n' + msg.id);
+    });
+  }
+  var originalMessage = (0, _chatLogic.originalVersion)(message);
+  var edited = !message.sameTerm(originalMessage);
+  var sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()); // In message
+
+  var messageRow = dom.createElement('tr');
+  messageRow.AJAR_date = sortDate.value;
+  messageRow.AJAR_subject = message;
+  var td1 = dom.createElement('td');
+  messageRow.appendChild(td1);
+  if (!options.authorDateOnLeft) {
+    var img = dom.createElement('img');
+    img.setAttribute('style', 'max-height: 2.5em; max-width: 2.5em; border-radius: 0.5em; margin: auto;');
+    widgets.setImage(img, creator);
+    td1.appendChild(img);
+  } else {
+    creatorAndDate(td1, creator, widgets.shortDate(sortDate.value), message);
+  }
+  var bothDates = widgets.shortDate(sortDate.value);
+  if (edited) {
+    bothDates += ' ... ' + widgets.shortDate(date.value);
+  }
+
+  // Render the content ot the message itself
+  var td2 = messageRow.appendChild(dom.createElement('td'));
+  if (!options.authorDateOnLeft) {
+    creatorAndDateHorizontal(td2, creator, bothDates,
+    // widgets.shortDate(dateString)
+    message);
+  }
+  var text = content.value.trim();
+  var isURI = /^https?:\/[^ <>]*$/i.test(text);
+  var para = null;
+  if (isURI) {
+    var isImage = /\.(gif|jpg|jpeg|tiff|png|svg)$/i.test(text); // @@ Should use content-type not URI
+    if (isImage && options.expandImagesInline) {
+      var _img = elementForImageURI(text, options);
+      td2.appendChild(_img);
+    } else {
+      // Link but not Image
+      var anc = td2.appendChild(dom.createElement('a'));
+      para = anc.appendChild(dom.createElement('p'));
+      anc.href = text;
+      para.textContent = text;
+      td2.appendChild(anc);
+    }
+  } else {
+    // text
+    para = dom.createElement('p');
+    td2.appendChild(para);
+    para.textContent = text;
+  }
+  if (para) {
+    var bgcolor = colorizeByAuthor ? pad.lightColorHash(creator) : getBgColor(fresh);
+    para.setAttribute('style', messageBodyStyle + 'background-color: ' + bgcolor + ';');
+  }
+  function getBgColor(fresh) {
+    return fresh ? '#e8ffe8' : 'white';
+  }
+
+  // Sentiment strip
+  var strip = (0, _messageTools.sentimentStripLinked)(message, message.doc());
+  if (strip.children.length) {
+    td2.appendChild(dom.createElement('br'));
+    td2.appendChild(strip);
+  }
+
+  // Message tool bar button
+  var td3 = dom.createElement('td');
+  messageRow.appendChild(td3);
+  var toolsButton = widgets.button(dom, _iconBase.icons.iconBase + 'noun_243787.svg', '...');
+  td3.appendChild(toolsButton);
+  toolsButton.addEventListener('click', function (_event) {
+    if (messageRow.toolTR) {
+      // already got a toolbar? Toogle
+      messageRow.parentNode.removeChild(messageRow.toolTR);
+      delete messageRow.toolTR;
+      return;
+    }
+    var toolsTR = dom.createElement('tr');
+    var tools = (0, _messageTools.messageToolbar)(message, messageRow, userContext, channelObject);
+    tools.style = 'border: 0.05em solid #888; border-radius: 0 0 0.7em 0.7em;  border-top: 0; height:3.5em; background-color: #fff;'; // @@ fix
+    if (messageRow.nextSibling) {
+      messageRow.parentElement.insertBefore(toolsTR, messageRow.nextSibling);
+    } else {
+      messageRow.parentElement.appendChild(toolsTR);
+    }
+    messageRow.toolTR = toolsTR;
+    toolsTR.appendChild(dom.createElement('td')); // left
+    var toolsTD = toolsTR.appendChild(dom.createElement('td'));
+    toolsTR.appendChild(dom.createElement('td')); // right
+    toolsTD.appendChild(tools);
+  });
+  return messageRow;
 }
-function switchToEditor(_x6, _x7, _x8, _x9) {
-  return _switchToEditor.apply(this, arguments);
+function switchToEditor(messageRow, message, channelObject, userContext) {
+  var messageTable = messageRow.parentNode;
+  var editRow = renderMessageEditor(channelObject, messageTable, userContext, channelObject.options, (0, _chatLogic.mostRecentVersion)(message));
+  messageTable.insertBefore(editRow, messageRow);
+  editRow.originalRow = messageRow;
+  messageRow.style.visibility = 'hidden'; // Hide the original message. unhide if user cancels edit
 }
 /*       Control for a new message -- or editing an old message ***************
  *
  */
-function _switchToEditor() {
-  _switchToEditor = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(messageRow, message, channelObject, userContext) {
-    var messageTable, editRow;
-    return _regenerator["default"].wrap(function _callee10$(_context11) {
-      while (1) switch (_context11.prev = _context11.next) {
-        case 0:
-          messageTable = messageRow.parentNode;
-          _context11.t0 = renderMessageEditor;
-          _context11.t1 = channelObject;
-          _context11.t2 = messageTable;
-          _context11.t3 = userContext;
-          _context11.t4 = channelObject.options;
-          _context11.next = 8;
-          return (0, _chatLogic.mostRecentVersion)(message);
-        case 8:
-          _context11.t5 = _context11.sent;
-          editRow = (0, _context11.t0)(_context11.t1, _context11.t2, _context11.t3, _context11.t4, _context11.t5);
-          messageTable.insertBefore(editRow, messageRow);
-          editRow.originalRow = messageRow;
-          messageRow.style.visibility = 'hidden'; // Hide the original message. unhide if user cancels edit
-        case 13:
-        case "end":
-          return _context11.stop();
-      }
-    }, _callee10);
-  }));
-  return _switchToEditor.apply(this, arguments);
-}
 function renderMessageEditor(channelObject, messageTable, userContext, options, originalMessage) {
   function revertEditing(messageEditor) {
     messageEditor.originalRow.style.visibility = 'visible'; // restore read-only version
     messageEditor.parentNode.removeChild(messageEditor);
   }
-  function handleFieldInput(_x10) {
+  function handleFieldInput(_x) {
     return _handleFieldInput.apply(this, arguments);
   }
   function _handleFieldInput() {
@@ -354,87 +275,72 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
     }));
     return _handleFieldInput.apply(this, arguments);
   }
-  function sendMessage(_x11, _x12) {
+  function sendMessage(_x2, _x3) {
     return _sendMessage.apply(this, arguments);
   } // sendMessage
   //    DRAG AND DROP
   function _sendMessage() {
-    _sendMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(text, fromMainField) {
-      var sendComplete, _sendComplete, message, statusArea;
-      return _regenerator["default"].wrap(function _callee7$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+    _sendMessage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(text, fromMainField) {
+      var sendComplete, message, statusArea;
+      return _regenerator["default"].wrap(function _callee6$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _sendComplete = function _sendComplete3() {
-              _sendComplete = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(message, _text2) {
-                var oldRow;
-                return _regenerator["default"].wrap(function _callee6$(_context7) {
-                  while (1) switch (_context7.prev = _context7.next) {
-                    case 0:
-                      _context7.next = 2;
-                      return (0, _infinite.insertMessageIntoTable)(channelObject, messageTable, message, false, options, userContext);
-                    case 2:
-                      // not green
+            sendComplete = function _sendComplete(message, _text2) {
+              // const dateStamp = store.any(message, ns.dct('created'), null, message.doc())
+              // const content = $rdf.literal(text2)
+              (0, _infinite.insertMessageIntoTable)(channelObject, messageTable, message, false, options, userContext); // not green
 
-                      if (originalMessage) {
-                        // editing another message
-                        oldRow = messageEditor.originalRow; // oldRow.style.display = '' // restore read-only version, re-attack
-                        if (oldRow.parentNode) {
-                          oldRow.parentNode.removeChild(oldRow); // No longer needed old version
-                        } else {
-                          debug.warn('No parentNode on old message ' + oldRow.textContent);
-                          oldRow.style.backgroundColor = '#fee';
-                          oldRow.style.visibility = 'hidden'; // @@ FIX THIS AND REMOVE FROM DOM INSTEAD
-                        }
+              if (originalMessage) {
+                // editing another message
+                var oldRow = messageEditor.originalRow;
+                // oldRow.style.display = '' // restore read-only version, re-attack
+                if (oldRow.parentNode) {
+                  oldRow.parentNode.removeChild(oldRow); // No longer needed old version
+                } else {
+                  debug.warn('No parentNode on old message ' + oldRow.textContent);
+                  oldRow.style.backgroundColor = '#fee';
+                  oldRow.style.visibility = 'hidden'; // @@ FIX THIS AND REMOVE FROM DOM INSTEAD
+                }
 
-                        messageEditor.parentNode.removeChild(messageEditor); // no longer need editor
-                      } else {
-                        if (fromMainField) {
-                          field.value = ''; // clear from out for reuse
-                          field.setAttribute('style', messageBodyStyle);
-                          field.disabled = false;
-                          field.scrollIntoView(options.newestFirst); // allign bottom (top)
-                          field.focus(); // Start typing next line immediately
-                          field.select();
-                        }
-                      }
-                      // await channelObject.div.refresh() // Add new day if nec  @@ add back
-                    case 3:
-                    case "end":
-                      return _context7.stop();
-                  }
-                }, _callee6);
-              }));
-              return _sendComplete.apply(this, arguments);
-            };
-            sendComplete = function _sendComplete2(_x18, _x19) {
-              return _sendComplete.apply(this, arguments);
+                messageEditor.parentNode.removeChild(messageEditor); // no longer need editor
+              } else {
+                if (fromMainField) {
+                  field.value = ''; // clear from out for reuse
+                  field.setAttribute('style', messageBodyStyle);
+                  field.disabled = false;
+                  field.scrollIntoView(options.newestFirst); // allign bottom (top)
+                  field.focus(); // Start typing next line immediately
+                  field.select();
+                }
+              }
+              // await channelObject.div.refresh() // Add new day if nec  @@ add back
             };
+
             // const me = authn.currentUser() // Must be logged on or wuld have got login button
             if (fromMainField) {
               field.setAttribute('style', messageBodyStyle + 'color: #bbb;'); // pendingedit
               field.disabled = true;
             }
-            _context8.prev = 3;
-            _context8.next = 6;
-            return channelObject.updateMessage(text, originalMessage, null, options.thread);
-          case 6:
-            message = _context8.sent;
-            _context8.next = 14;
+            _context7.prev = 2;
+            _context7.next = 5;
+            return channelObject.updateMessage(text, originalMessage);
+          case 5:
+            message = _context7.sent;
+            _context7.next = 13;
             break;
-          case 9:
-            _context8.prev = 9;
-            _context8.t0 = _context8["catch"](3);
+          case 8:
+            _context7.prev = 8;
+            _context7.t0 = _context7["catch"](2);
             statusArea = userContext.statusArea || messageEditor;
-            statusArea.appendChild(widgets.errorMessageBlock(dom, 'Error writing message: ' + _context8.t0));
-            return _context8.abrupt("return");
+            statusArea.appendChild(widgets.errorMessageBlock(dom, 'Error writing message: ' + _context7.t0));
+            return _context7.abrupt("return");
+          case 13:
+            sendComplete(message, text);
           case 14:
-            _context8.next = 16;
-            return sendComplete(message, text);
-          case 16:
           case "end":
-            return _context8.stop();
+            return _context7.stop();
         }
-      }, _callee7, null, [[3, 9]]);
+      }, _callee6, null, [[2, 8]]);
     }));
     return _sendMessage.apply(this, arguments);
   }
@@ -453,7 +359,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
           }
         }, _callee);
       }));
-      return function (_x13, _x14) {
+      return function (_x4, _x5) {
         return _ref.apply(this, arguments);
       };
     }());
@@ -497,7 +403,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
         }
       }, _callee2, null, [[1, 11, 14, 17]]);
     }));
-    return function droppedURIHandler(_x15) {
+    return function droppedURIHandler(_x6) {
       return _ref2.apply(this, arguments);
     };
   }();
@@ -508,7 +414,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
       imageDoc = $rdf.sym(chatDocument.dir().uri + 'Image_' + Date.now() + '.png');
       return imageDoc;
     }
-    function tookPicture(_x16) {
+    function tookPicture(_x7) {
       return _tookPicture.apply(this, arguments);
     } // Body of turnOnInput
     function _tookPicture() {
@@ -585,7 +491,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
           }
         }, _callee3);
       }));
-      return function (_x17) {
+      return function (_x8) {
         return _ref3.apply(this, arguments);
       };
     }(), false);
@@ -647,7 +553,7 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
     turnOnInput();
     Object.assign(context, userContext);
     (0, _bookmarks.findBookmarkDocument)(context).then(function (_context) {
-      // debug.log('Bookmark file: ' + context.bookmarkDocument)
+      // console.log('Bookmark file: ' + context.bookmarkDocument)
     });
   });
   return messageEditor;