Browse Source

Don't assume id of "current" for bookmarks' PEP node

Causes problems with some versions of Ejabberd which use a different id.
Will be fixed in upcoming versions.
JC Brand 6 years ago
parent
commit
2fb435b2e0
2 changed files with 3 additions and 6 deletions
  1. 1 1
      dist/converse.js
  2. 2 5
      src/converse-bookmarks.js

+ 1 - 1
dist/converse.js

@@ -48817,7 +48817,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
       },
       },
 
 
       createBookmarksFromStanza(stanza) {
       createBookmarksFromStanza(stanza) {
-        const bookmarks = sizzle('items[node="storage:bookmarks"] ' + 'item#current ' + 'storage[xmlns="storage:bookmarks"] ' + 'conference', stanza);
+        const bookmarks = sizzle(`items[node="storage:bookmarks"] item storage[xmlns="storage:bookmarks"] conference`, stanza);
 
 
         _.forEach(bookmarks, bookmark => {
         _.forEach(bookmarks, bookmark => {
           const jid = bookmark.getAttribute('jid');
           const jid = bookmark.getAttribute('jid');

+ 2 - 5
src/converse-bookmarks.js

@@ -351,12 +351,9 @@ converse.plugins.add('converse-bookmarks', {
 
 
             createBookmarksFromStanza (stanza) {
             createBookmarksFromStanza (stanza) {
                 const bookmarks = sizzle(
                 const bookmarks = sizzle(
-                    'items[node="storage:bookmarks"] '+
-                    'item#current '+
-                    'storage[xmlns="storage:bookmarks"] '+
-                    'conference',
+                    `items[node="storage:bookmarks"] item storage[xmlns="storage:bookmarks"] conference`,
                     stanza
                     stanza
-                )
+                );
                 _.forEach(bookmarks, (bookmark) => {
                 _.forEach(bookmarks, (bookmark) => {
                     const jid = bookmark.getAttribute('jid');
                     const jid = bookmark.getAttribute('jid');
                     this.create({
                     this.create({