htm from npm, msg fix

dist/push-manifest.json

@@ -1 +1 @@
-{"/":{"bundle.c0716.css":{"type":"style","weight":1},"bundle.e74be.esm.js":{"type":"script","weight":1}}}
+{"/":{"bundle.c0716.css":{"type":"style","weight":1},"bundle.b9b2f.esm.js":{"type":"script","weight":1}}}

package.json

@@ -19,7 +19,9 @@
     ],
     "overrides": [
       {
-        "files": ["*"],
+        "files": [
+          "*"
+        ],
         "rules": {
           "react/no-did-mount-set-state": "off",
           "react/no-did-update-set-state": "off",
@@ -42,6 +44,7 @@
     "@zxing/library": "^0.18.6",
     "autolinker": "^3.14.3",
     "gun": "^0.2020.1232",
+    "htm": "^3.1.0",
     "iris-lib": "0.0.156",
     "jquery": "^3.6.0",
     "lodash": "^4.17.21",

src/js/Helpers.js

@@ -1,6 +1,4 @@
 import {translate as t} from './Translation.js';
-import {createElement} from 'preact';
-import htm from './lib/htm.module.js';
 import $ from 'jquery';
 import _ from 'lodash';
 import iris from 'iris-lib';
@@ -1835,9 +1833,6 @@ const adjectives = [
   'zany',
 ];
 
-const html = htm.bind(createElement);
-export { html };
-
 export default {
   isUrl(s) {
     let matches = Autolinker.parse(s, {urls: true});

src/js/Icons.js

@@ -1,4 +1,4 @@
-import { html } from './Helpers.js';
+import { html } from 'htm/preact';
 
 export default {
   settings: html`<svg version="1.1" x="0px" y="0px" width="25px" height="25.001px" viewBox="0 0 25 25.001" style="enable-background:new 0 0 25 25.001;" xml:space="preserve">

src/js/Main.js

@@ -2,7 +2,8 @@ import { Component } from 'preact';
 import { Router } from 'preact-router';
 import { Link } from 'preact-router/match';
 
-import Helpers, { html } from './Helpers.js';
+import Helpers from './Helpers.js';
+import { html } from 'htm/preact';
 import QRScanner from './QRScanner.js';
 import PeerManager from './PeerManager.js';
 import Session from './Session.js';

src/js/components/ChatList.js

@@ -1,5 +1,6 @@
 import Component from '../BaseComponent';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import { translate as t } from '../Translation.js';
 import State from '../State.js';
 import ChatListItem from './ChatListItem.js';

src/js/components/ChatListItem.js

@@ -1,5 +1,6 @@
 import Component from '../BaseComponent';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import { route } from 'preact-router';
 import { translate as t } from '../Translation.js';
 import State from '../State.js';

src/js/components/ChatMessageForm.js

@@ -1,5 +1,6 @@
 import { Component } from 'preact';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import { translate as t } from '../Translation.js';
 import State from '../State.js';
 import Session from '../Session.js';

src/js/components/CopyButton.js

@@ -1,5 +1,6 @@
 import { Component } from 'preact';
-import Helpers, {html} from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import {translate as t} from '../Translation.js';
 import $ from 'jquery';
 import iris from 'iris-lib';

src/js/components/Filters.js

@@ -1,5 +1,5 @@
 import Component from '../BaseComponent';
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 
 export default class Filters extends Component {

src/js/components/FollowButton.js

@@ -1,5 +1,5 @@
 import Component from '../BaseComponent';
-import {html} from '../Helpers.js';
+import { html } from 'htm/preact';
 import {translate as t} from '../Translation.js';
 import Session from '../Session.js';
 import State from '../State.js';

src/js/components/Footer.js

@@ -1,5 +1,5 @@
 import Component from '../BaseComponent';
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Session from '../Session.js';
 import Identicon from './Identicon.js';

src/js/components/Header.js

@@ -1,5 +1,6 @@
 import Component from '../BaseComponent';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import { translate as t } from '../Translation.js';
 import State from '../State.js';
 import Session from '../Session.js';

src/js/components/Identicon.js

@@ -1,5 +1,5 @@
 import Component from '../BaseComponent';
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import SafeImg from './SafeImg.js';
 import iris from 'iris-lib';

src/js/components/LanguageSelector.js

@@ -1,4 +1,4 @@
-import {html} from '../Helpers.js';
+import { html } from 'htm/preact';
 import {AVAILABLE_LANGUAGES, language} from '../Translation.js';
 import Translations from '../Translations.js';
 import $ from 'jquery';

src/js/components/MediaPlayer.js

@@ -1,5 +1,6 @@
 import { Component } from 'preact';
-import Helpers, {html} from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Icons from '../Icons.js';
 import $ from 'jquery';

src/js/components/Message.js

@@ -1,5 +1,6 @@
 import Component from '../BaseComponent.js';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import Session from '../Session.js';
 import Torrent from './Torrent.js';
 import Autolinker from 'autolinker';
@@ -27,7 +28,7 @@ class Message extends Component {
       }
     });
 
-    const status = this.getSeenStatus().seen;
+    const status = this.getSeenStatus();
     if (!status.seen && !status.delivered) {
       State.local.get('channels').get(this.props.chatId).get('theirLastActiveTime').on(
         this.sub((v, k, a, e) => {

src/js/components/MessageFeed.js

@@ -1,5 +1,6 @@
 import Component from '../BaseComponent';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import PublicMessage from './PublicMessage.js';
 import {  List, WindowScroller,CellMeasurer,CellMeasurerCache,} from 'react-virtualized';
 import State from '../State.js';

src/js/components/NewChat.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import { translate as t } from '../Translation.js';
 import State from '../State.js';
 import QRScanner from '../QRScanner.js';

src/js/components/ProfilePhotoPicker.js

@@ -1,5 +1,6 @@
 import { Component } from 'preact';
-import Helpers, {html} from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import {translate as t} from '../Translation.js';
 import SafeImg from './SafeImg.js';
 import Identicon from './Identicon.js';

src/js/components/PublicMessage.js

@@ -1,4 +1,5 @@
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import Identicon from './Identicon.js';
 import PublicMessageForm from './PublicMessageForm.js';
 import State from '../State.js';

src/js/components/PublicMessageForm.js

@@ -1,5 +1,6 @@
 import { Component } from 'preact';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import { translate as t } from '../Translation.js';
 import State from '../State.js';
 import Session from '../Session.js';

src/js/components/SafeImg.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 
 const SafeImg = props => {
   if (props.src && props.src.indexOf('data:image') !== 0) {

src/js/components/SearchBox.js

@@ -1,6 +1,7 @@
 import Component from '../BaseComponent';
 import { route } from 'preact-router';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Identicon from './Identicon.js';
 import {translate as t} from '../Translation.js';

src/js/components/Torrent.js

@@ -1,6 +1,7 @@
 import Component from '../BaseComponent';
 import { createRef } from 'preact';
-import Helpers, {html} from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import Session from "../Session.js";
 import { translate as tr } from '../Translation.js';
 import $ from 'jquery';

src/js/components/VideoCall.js

@@ -1,5 +1,5 @@
 import { Component } from 'preact';
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import { route } from 'preact-router';
 import $ from 'jquery';
 import Gun from 'gun';

src/js/lib/htm.module.js

@@ -1 +0,0 @@
-var n = function (t, s, r, e) {var u;s[0] = 0;for (var h = 1; h < s.length; h++) {var p = s[h++],a = s[h] ? (s[0] |= p ? 1 : 2, r[s[h++]]) : s[++h];3 === p ? e[0] = a : 4 === p ? e[1] = Object.assign(e[1] || {}, a) : 5 === p ? (e[1] = e[1] || {})[s[++h]] = a : 6 === p ? e[1][s[++h]] += a + "" : p ? (u = t.apply(a, n(t, a, r, ["", null])), e.push(u), a[0] ? s[0] |= 2 : (s[h - 2] = 0, s[h] = u)) : e.push(a);}return e;},t = new Map();export default function (s) {var r = t.get(this);return r || (r = new Map(), t.set(this, r)), (r = n(this, r.get(s) || (r.set(s, r = function (n) {for (var t, s, r = 1, e = "", u = "", h = [0], p = function (n) {1 === r && (n || (e = e.replace(/^\s*\n\s*|\s*\n\s*$/g, ""))) ? h.push(0, n, e) : 3 === r && (n || e) ? (h.push(3, n, e), r = 2) : 2 === r && "..." === e && n ? h.push(4, n, 0) : 2 === r && e && !n ? h.push(5, 0, !0, e) : r >= 5 && ((e || !n && 5 === r) && (h.push(r, 0, e, s), r = 6), n && (h.push(r, n, 0, s), r = 6)), e = "";}, a = 0; a < n.length; a++) {a && (1 === r && p(), p(a));for (var l = 0; l < n[a].length; l++) t = n[a][l], 1 === r ? "<" === t ? (p(), h = [h], r = 3) : e += t : 4 === r ? "--" === e && ">" === t ? (r = 1, e = "") : e = t + e[0] : u ? t === u ? u = "" : e += t : '"' === t || "'" === t ? u = t : ">" === t ? (p(), r = 1) : r && ("=" === t ? (r = 5, s = e, e = "") : "/" === t && (r < 5 || ">" === n[a][l + 1]) ? (p(), 3 === r && (h = h[0]), r = h, (h = h[0]).push(2, 0, r), r = 0) : " " === t || "\t" === t || "\n" === t || "\r" === t ? (p(), r = 2) : e += t), 3 === r && "!--" === e && (r = 4, h = h[0]);}return p(), h;}(s)), r), arguments, [])).length > 1 ? r : r[0];}

src/js/views/About.js

@@ -1,5 +1,6 @@
 import {translate as t} from '../Translation.js';
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import View from './View.js';
 
 class About extends View {

src/js/views/Chat.js

@@ -1,4 +1,5 @@
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import { translate as t } from '../Translation.js';
 import View from './View.js';
 import State from '../State.js';

src/js/views/Checkout.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Session from '../Session.js';
 import { route } from 'preact-router';

src/js/views/Contacts.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Identicon from '../components/Identicon.js';
 import {translate as t} from '../Translation.js';

src/js/views/Explorer.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Session from '../Session.js';
 import { Component } from 'preact';

src/js/views/Feed.js

@@ -1,4 +1,5 @@
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import PublicMessageForm from '../components/PublicMessageForm.js';
 import Identicon from '../components/Identicon.js';

src/js/views/Follows.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Identicon from '../components/Identicon.js';
 import {translate as t} from '../Translation.js';

src/js/views/Group.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import {translate as tr} from '../Translation.js';
 import State from '../State.js';
 import Session from '../Session.js';

src/js/views/Login.js

@@ -1,4 +1,5 @@
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import { translate as t } from '../Translation.js';
 import LanguageSelector from '../components/LanguageSelector.js';

src/js/views/LogoutConfirmation.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import Session from '../Session.js';
 import {translate as t} from '../Translation.js';
 import { route } from 'preact-router';

src/js/views/Message.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import PublicMessage from '../components/PublicMessage.js';
 import PublicMessageForm from '../components/PublicMessageForm.js';
 import { route } from 'preact-router';

src/js/views/Product.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Session from '../Session.js';
 import {translate as t} from '../Translation.js';

src/js/views/Profile.js

@@ -1,4 +1,5 @@
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import {translate as t} from '../Translation.js';
 import State from '../State.js';
 import Session from '../Session.js';

src/js/views/Settings.js

@@ -1,4 +1,5 @@
-import Helpers, { html } from '../Helpers.js';
+import Helpers from '../Helpers.js';
+import { html } from 'htm/preact';
 import State from '../State.js';
 import Session from '../Session.js';
 import LanguageSelector from '../components/LanguageSelector.js';

src/js/views/Store.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import {translate as t} from '../Translation.js';
 import State from '../State.js';
 import Session from '../Session.js';

src/js/views/Torrent.js

@@ -1,4 +1,4 @@
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 import Torrent from '../components/Torrent.js';
 import View from './View.js';
 

src/js/views/View.js

@@ -1,7 +1,7 @@
 import Component from '../BaseComponent.js';
 import { createRef } from 'preact';
 import Header from '../components/Header.js';
-import { html } from '../Helpers.js';
+import { html } from 'htm/preact';
 
 class View extends Component {
   scrollElement = createRef();