Merge remote-tracking branch 'origin/master'

docs/source/configuration.rst

@@ -169,6 +169,8 @@ Allows users to be invited to join MUC chat rooms. An "Invite" widget will
 appear in the sidebar of the chat room where you can type in the JID of a user
 to invite into the chat room.
 
+.. _`allow_non_roster_messaging`:
+
 allow_non_roster_messaging
 --------------------------
 

docs/source/developer_api.rst

@@ -681,7 +681,7 @@ Note, for MUC chat rooms, you need to use the "rooms" grouping instead.
 get
 ~~~
 
-Returns an object representing a chat box.
+Returns an object representing a chat box. The chat box should already be open.
 
 To return a single chat box, provide the JID of the contact you're chatting
 with in that chat box:
@@ -703,15 +703,35 @@ To return all open chat boxes, call the method without any JIDs::
 open
 ~~~~
 
-Opens a chat box and returns a Backbone.View object representing a chat box.
+Opens a chat box and returns a `Backbone.View <http://backbonejs.org/#View>`_ object
+representing a chat box.
 
-To open a single chat box, provide the JID of the contact:
+Note that converse doesn't allow opening chats with users who aren't in your roster
+(unless you have set :ref:`allow_non_roster_messaging` to ``true``).
+
+Before opening a chat, you should first wait until the roster has been populated.
+This is the :ref:`rosterContactsFetched` event/promise.
+
+Besides that, it's a good idea to also first wait until already opened chat boxes
+(which are cached in sessionStorage) have also been fetched from the cache.
+This is the :ref:`chatBoxesFetched` event/promise.
+
+These two events fire only once per session, so they're also available as promises.
+
+So, to open a single chat box:
 
 .. code-block:: javascript
 
     converse.plugins.add('myplugin', {
-        initialize: function () {
-            this._converse.api.chats.open('buddy@example.com')
+      initialize: function() {
+        var _converse = this._converse;
+        Promise.all([
+            _converse.api.waitUntil('rosterContactsFetched'),
+            _converse.api.waitUntil('chatBoxesFetched')
+        ]).then(function() {
+            // Note, buddy@example.org must be in your contacts roster!
+            _converse.api.chats.open('buddy@example.com')
+        });
       }
     });
 
@@ -721,7 +741,14 @@ To return an array of chat boxes, provide an array of JIDs:
 
     converse.plugins.add('myplugin', {
         initialize: function () {
-            this._converse.api.chats.open(['buddy1@example.com', 'buddy2@example.com'])
+            var _converse = this._converse;
+            Promise.all([
+                _converse.api.waitUntil('rosterContactsFetched'),
+                _converse.api.waitUntil('chatBoxesFetched')
+            ]).then(function() {
+                // Note, these users must first be in your contacts roster!
+                _converse.api.chats.open(['buddy1@example.com', 'buddy2@example.com'])
+            });
         }
     });
 

src/converse-bookmarks.js

@@ -381,8 +381,8 @@
 
                 onBookmarksReceivedError (deferred, iq) {
                     window.sessionStorage.setItem(this.fetched_flag, true);
-                    _converse.log('Error while fetching bookmarks', Strophe.LogLevel.ERROR);
-                    _converse.log(iq, Strophe.LogLevel.DEBUG);
+                    _converse.log('Error while fetching bookmarks', Strophe.LogLevel.WARN);
+                    _converse.log(iq.outerHTML, Strophe.LogLevel.DEBUG);
                     if (!_.isNil(deferred)) {
                         return deferred.reject();
                     }

src/converse-core.js

@@ -748,8 +748,10 @@
             if (ignore_cache) {
                 _converse.send_initial_presence = true;
                 _converse.roster.fetchFromServer()
-                    .then(_converse.sendInitialPresence)
-                    .catch(_converse.sendInitialPresence);
+                    .then(() => {
+                        _converse.emit('rosterContactsFetched');
+                        _converse.sendInitialPresence();
+                    }).catch(_converse.sendInitialPresence);
             } else {
                 _converse.rostergroups.fetchRosterGroups().then(() => {
                     _converse.emit('rosterGroupsFetched');