New release 4.2.0

acab0339 · JC Brand · 77241bf5 · acab0339 · acab0339 · acab0339
Commit acab0339 authored Apr 04, 2019 by JC Brand
70 changed files
--- a/CHANGES.md
+++ b/CHANGES.md
 # Changelog
-## 4.2.0 (Unreleased)
+## 4.2.0 (2019-04-04)
 - Updated translation: lt
 - Upgrade to Backbone 1.4.0, Strophe 1.3.2 and Jasmine 2.99.2

--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,7 +2,7 @@
 *
 *  An XMPP chat client that runs in the browser.
 *
- *  Version: 4.1.2
+ *  Version: 4.2.0
 *
 *  Copyright: JC Brand 2013-2018
 *  Except for 3rd party dependencies.

--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ serve_bg: dev
 ########################################################################
 ## Translation machinery
-GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.1.2 -c
+GETTEXT = xgettext --language="JavaScript" --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot dist/converse-no-dependencies.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=4.2.0 -c
 .PHONY: pot
 pot: dist/converse-no-dependencies-es2015.js
@@ -104,8 +104,8 @@ release:
 	$(INSTALL) -D dist/converse.min.js 'converse-assets-$(VERSION)/converse.min.js'
 	$(INSTALL) -D dist/converse.min.js.map 'converse-assets-$(VERSION)/converse.min.js.map'
 	$(INSTALL) -D dist/converse-headless.js 'converse-assets-$(VERSION)/converse-headless.js'
-	$(INSTALL) -D dist/converse-headless.min.js 'converse-assets-$(VERSION)/converse-headless.min.js'
+	$(INSTALL) -D src/headless/dist/converse-headless.min.js 'converse-assets-$(VERSION)/converse-headless.min.js'
-	$(INSTALL) -D dist/converse-headless.min.js.map 'converse-assets-$(VERSION)/converse-headless.min.js.map'
+	$(INSTALL) -D src/headless/dist/converse-headless.min.js.map 'converse-assets-$(VERSION)/converse-headless.min.js.map'
 	$(INSTALL) -D css/converse.css 'converse-assets-$(VERSION)/css/converse.css'
 	$(INSTALL) -D css/converse.min.css 'converse-assets-$(VERSION)/css/converse.min.css'
 	cp -r css/webfonts 'converse-assets-$(VERSION)/css/'

--- a/dist/converse.js
+++ b/dist/converse.js
@@ -63143,7 +63143,7 @@ const _converse = {
  'templates': {},
  'promises': {}
 };
-_converse.VERSION_NAME = "v4.1.2";
+_converse.VERSION_NAME = "v4.2.0";
 _lodash_noconflict__WEBPACK_IMPORTED_MODULE_4___default.a.extend(_converse, Backbone.Events); // Make converse pluggable
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2018, JC Brand'
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.2'
+version = '4.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.2'
+release = '4.2.0'
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

--- a/docs/source/quickstart.rst
+++ b/docs/source/quickstart.rst
@@ -26,16 +26,16 @@ might break when a new backwards-incompatible version of Converse is released.
 To load a specific version of Converse you can put the version in the URL:
-* https://cdn.conversejs.org/4.1.2/dist/converse.min.js
+* https://cdn.conversejs.org/4.2.0/dist/converse.min.js
-* https://cdn.conversejs.org/4.1.2/css/converse.min.css
+* https://cdn.conversejs.org/4.2.0/css/converse.min.css
 You can include these two URLs inside the *<head>* element of your website
 via the *script* and *link* tags:
 .. code-block:: html
-    <link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/4.1.2/css/converse.min.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="https://cdn.conversejs.org/4.2.0/css/converse.min.css">
-    <script src="https://cdn.conversejs.org/4.1.2/dist/converse.min.js" charset="utf-8"></script>
+    <script src="https://cdn.conversejs.org/4.2.0/dist/converse.min.js" charset="utf-8"></script>
 Option 2: Building the files yourself

--- a/locale/af/LC_MESSAGES/converse.json
+++ b/locale/af/LC_MESSAGES/converse.json
--- a/locale/af/LC_MESSAGES/converse.po
+++ b/locale/af/LC_MESSAGES/converse.po
--- a/locale/ar/LC_MESSAGES/converse.json
+++ b/locale/ar/LC_MESSAGES/converse.json
--- a/locale/ar/LC_MESSAGES/converse.po
+++ b/locale/ar/LC_MESSAGES/converse.po
--- a/locale/bg/LC_MESSAGES/converse.json
+++ b/locale/bg/LC_MESSAGES/converse.json
--- a/locale/bg/LC_MESSAGES/converse.po
+++ b/locale/bg/LC_MESSAGES/converse.po
--- a/locale/ca/LC_MESSAGES/converse.json
+++ b/locale/ca/LC_MESSAGES/converse.json
--- a/locale/ca/LC_MESSAGES/converse.po
+++ b/locale/ca/LC_MESSAGES/converse.po
--- a/locale/converse.pot
+++ b/locale/converse.pot
--- a/locale/cs/LC_MESSAGES/converse.json
+++ b/locale/cs/LC_MESSAGES/converse.json
--- a/locale/cs/LC_MESSAGES/converse.po
+++ b/locale/cs/LC_MESSAGES/converse.po
--- a/locale/de/LC_MESSAGES/converse.json
+++ b/locale/de/LC_MESSAGES/converse.json
--- a/locale/de/LC_MESSAGES/converse.po
+++ b/locale/de/LC_MESSAGES/converse.po
--- a/locale/eo/LC_MESSAGES/converse.json
+++ b/locale/eo/LC_MESSAGES/converse.json
--- a/locale/eo/LC_MESSAGES/converse.po
+++ b/locale/eo/LC_MESSAGES/converse.po
--- a/locale/es/LC_MESSAGES/converse.json
+++ b/locale/es/LC_MESSAGES/converse.json
--- a/locale/es/LC_MESSAGES/converse.po
+++ b/locale/es/LC_MESSAGES/converse.po
--- a/locale/eu/LC_MESSAGES/converse.json
+++ b/locale/eu/LC_MESSAGES/converse.json
--- a/locale/eu/LC_MESSAGES/converse.po
+++ b/locale/eu/LC_MESSAGES/converse.po
--- a/locale/fr/LC_MESSAGES/converse.json
+++ b/locale/fr/LC_MESSAGES/converse.json
--- a/locale/fr/LC_MESSAGES/converse.po
+++ b/locale/fr/LC_MESSAGES/converse.po
--- a/locale/gl/LC_MESSAGES/converse.json
+++ b/locale/gl/LC_MESSAGES/converse.json
--- a/locale/gl/LC_MESSAGES/converse.po
+++ b/locale/gl/LC_MESSAGES/converse.po
--- a/locale/he/LC_MESSAGES/converse.json
+++ b/locale/he/LC_MESSAGES/converse.json
--- a/locale/he/LC_MESSAGES/converse.po
+++ b/locale/he/LC_MESSAGES/converse.po
--- a/locale/hi/LC_MESSAGES/converse.json
+++ b/locale/hi/LC_MESSAGES/converse.json
--- a/locale/hi/LC_MESSAGES/converse.po
+++ b/locale/hi/LC_MESSAGES/converse.po
--- a/locale/hu/LC_MESSAGES/converse.json
+++ b/locale/hu/LC_MESSAGES/converse.json
--- a/locale/hu/LC_MESSAGES/converse.po
+++ b/locale/hu/LC_MESSAGES/converse.po
--- a/locale/id/LC_MESSAGES/converse.json
+++ b/locale/id/LC_MESSAGES/converse.json
--- a/locale/id/LC_MESSAGES/converse.po
+++ b/locale/id/LC_MESSAGES/converse.po
--- a/locale/it/LC_MESSAGES/converse.json
+++ b/locale/it/LC_MESSAGES/converse.json
--- a/locale/it/LC_MESSAGES/converse.po
+++ b/locale/it/LC_MESSAGES/converse.po
--- a/locale/ja/LC_MESSAGES/converse.json
+++ b/locale/ja/LC_MESSAGES/converse.json
--- a/locale/ja/LC_MESSAGES/converse.po
+++ b/locale/ja/LC_MESSAGES/converse.po
--- a/locale/lt/LC_MESSAGES/converse.json
+++ b/locale/lt/LC_MESSAGES/converse.json
--- a/locale/lt/LC_MESSAGES/converse.po
+++ b/locale/lt/LC_MESSAGES/converse.po
--- a/locale/nb/LC_MESSAGES/converse.json
+++ b/locale/nb/LC_MESSAGES/converse.json
--- a/locale/nb/LC_MESSAGES/converse.po
+++ b/locale/nb/LC_MESSAGES/converse.po
--- a/locale/nl/LC_MESSAGES/converse.json
+++ b/locale/nl/LC_MESSAGES/converse.json
--- a/locale/nl/LC_MESSAGES/converse.po
+++ b/locale/nl/LC_MESSAGES/converse.po
--- a/locale/nl_BE/LC_MESSAGES/converse.json
+++ b/locale/nl_BE/LC_MESSAGES/converse.json
--- a/locale/nl_BE/LC_MESSAGES/converse.po
+++ b/locale/nl_BE/LC_MESSAGES/converse.po
--- a/locale/pl/LC_MESSAGES/converse.json
+++ b/locale/pl/LC_MESSAGES/converse.json
--- a/locale/pl/LC_MESSAGES/converse.po
+++ b/locale/pl/LC_MESSAGES/converse.po
--- a/locale/pt_BR/LC_MESSAGES/converse.json
+++ b/locale/pt_BR/LC_MESSAGES/converse.json
--- a/locale/pt_BR/LC_MESSAGES/converse.po
+++ b/locale/pt_BR/LC_MESSAGES/converse.po
--- a/locale/ro/LC_MESSAGES/converse.json
+++ b/locale/ro/LC_MESSAGES/converse.json
--- a/locale/ro/LC_MESSAGES/converse.po
+++ b/locale/ro/LC_MESSAGES/converse.po
--- a/locale/ru/LC_MESSAGES/converse.json
+++ b/locale/ru/LC_MESSAGES/converse.json
--- a/locale/ru/LC_MESSAGES/converse.po
+++ b/locale/ru/LC_MESSAGES/converse.po
--- a/locale/tr/LC_MESSAGES/converse.json
+++ b/locale/tr/LC_MESSAGES/converse.json
--- a/locale/tr/LC_MESSAGES/converse.po
+++ b/locale/tr/LC_MESSAGES/converse.po
--- a/locale/uk/LC_MESSAGES/converse.json
+++ b/locale/uk/LC_MESSAGES/converse.json
--- a/locale/uk/LC_MESSAGES/converse.po
+++ b/locale/uk/LC_MESSAGES/converse.po
--- a/locale/zh_CN/LC_MESSAGES/converse.json
+++ b/locale/zh_CN/LC_MESSAGES/converse.json
--- a/locale/zh_CN/LC_MESSAGES/converse.po
+++ b/locale/zh_CN/LC_MESSAGES/converse.po
--- a/locale/zh_TW/LC_MESSAGES/converse.json
+++ b/locale/zh_TW/LC_MESSAGES/converse.json
--- a/locale/zh_TW/LC_MESSAGES/converse.po
+++ b/locale/zh_TW/LC_MESSAGES/converse.po
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
 {
  "name": "converse.js",
-  "version": "4.1.2",
+  "version": "4.2.0",
  "description": "Browser based XMPP chat client",
  "main": "dist/converse.js",
  "directories": {

--- a/src/headless/converse-core.js
+++ b/src/headless/converse-core.js
@@ -72,7 +72,7 @@ const _converse = {
    'promises': {}
 }
-_converse.VERSION_NAME = "v4.1.2";
+_converse.VERSION_NAME = "v4.2.0";
 _.extend(_converse, Backbone.Events);

--- a/src/headless/dist/converse-headless.js
+++ b/src/headless/dist/converse-headless.js
@@ -41050,7 +41050,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
            // TODO: currently Strophe has no way to register a handler
            // for stanzas without a `type` attribute.
            // We could update it to accept null to mean no attribute,
-            // but that would be a backward-incompatible chnge
+            // but that would be a backward-incompatible change
            return true; // Gets handled above.
          }
@@ -41183,9 +41183,9 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
        if (!_.isNull(forwarded)) {
          const forwarded_message = forwarded.querySelector('message'),
-                forwarded_from = forwarded_message.getAttribute('from');
+                forwarded_from = forwarded_message.getAttribute('from'),
-          is_carbon = !_.isNull(stanza.querySelector(`received[xmlns="${Strophe.NS.CARBONS}"]`));
+                xmlns = Strophe.NS.CARBONS;
-          is_mam = sizzle(`message > result[xmlns="${Strophe.NS.MAM}"]`, stanza).length > 0;
+          is_carbon = sizzle(`received[xmlns="${xmlns}"]`, stanza).length > 0;
          if (is_carbon && Strophe.getBareJidFromJid(forwarded_from) !== from_jid) {
            // Prevent message forging via carbons
@@ -41193,6 +41193,7 @@ _converse_core__WEBPACK_IMPORTED_MODULE_2__["default"].plugins.add('converse-cha
            return true;
          }
+          is_mam = sizzle(`message > result[xmlns="${Strophe.NS.MAM}"]`, stanza).length > 0;
          stanza = forwarded_message;
          from_jid = stanza.getAttribute('from');
          to_jid = stanza.getAttribute('to');
@@ -41604,7 +41605,7 @@ const _converse = {
  'templates': {},
  'promises': {}
 };
-_converse.VERSION_NAME = "v4.1.2";
+_converse.VERSION_NAME = "v4.2.0";
 _lodash_noconflict__WEBPACK_IMPORTED_MODULE_4___default.a.extend(_converse, Backbone.Events); // Make converse pluggable
@@ -43741,9 +43742,9 @@ _converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins.add('converse-dis
          const stanza = await _converse.api.disco.info(this.get('jid'), null);
          this.onInfo(stanza);
        } catch (iq) {
-          this.waitUntilFeaturesDiscovered.resolve(this);
          _converse.log(iq, Strophe.LogLevel.ERROR);
+          this.waitUntilFeaturesDiscovered.resolve(this);
        }
      },
@@ -47253,7 +47254,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
        'image': _converse.DEFAULT_IMAGE,
        'image_type': _converse.DEFAULT_IMAGE_TYPE,
        'num_unread': 0,
-        'status': ''
+        'status': undefined
      },
      initialize(attributes) {
@@ -70825,7 +70826,7 @@ function convert(unicode) {
 }
 _core__WEBPACK_IMPORTED_MODULE_2__["default"].isSingleEmoji = function (str) {
-  if (!str || str.length > 2) {
+  if (!str || str.length > 2 && !str.startsWith(':')) {
    return;
  }
--- a/src/headless/package.json
+++ b/src/headless/package.json
 {
  "name": "@converse/headless",
-  "version": "4.1.2",
+  "version": "4.2.0",
  "description": "Converse.js Headless build",
  "author": "cmrd Senya <senya@riseup.net>",
  "homepage": "https://conversejs.org",