From 2fb435b2e0fab3c34bbc345ba0e294af6031c846 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Tue, 8 Jan 2019 15:08:02 +0100
Subject: [PATCH] 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.
---
 dist/converse.js          | 2 +-
 src/converse-bookmarks.js | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dist/converse.js b/dist/converse.js
index e280bc969..68686fb4e 100644
--- a/dist/converse.js
+++ b/dist/converse.js
@@ -48817,7 +48817,7 @@ _converse_headless_converse_core__WEBPACK_IMPORTED_MODULE_0__["default"].plugins
       },
 
       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 => {
           const jid = bookmark.getAttribute('jid');
diff --git a/src/converse-bookmarks.js b/src/converse-bookmarks.js
index b2354666e..a0d2ece68 100644
--- a/src/converse-bookmarks.js
+++ b/src/converse-bookmarks.js
@@ -351,12 +351,9 @@ converse.plugins.add('converse-bookmarks', {
 
             createBookmarksFromStanza (stanza) {
                 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
-                )
+                );
                 _.forEach(bookmarks, (bookmark) => {
                     const jid = bookmark.getAttribute('jid');
                     this.create({