Bugfix. Fall back to normal query when no messages

fdf1a977 · JC Brand · 76170427 · fdf1a977
Commit fdf1a977 authored Jan 11, 2018 by JC Brand
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 8 deletions

src/converse-mam.js src/converse-mam.js +12 -8

No files found.
--- a/src/converse-mam.js
+++ b/src/converse-mam.js
@@ -78,15 +78,19 @@
                        (result) => { // Success
                            if (result.supported) {
                                const most_recent_msg = utils.getMostRecentMessage(this.model);
-                                const archive_id = most_recent_msg.get('archive_id');
+                                if (_.isNil(most_recent_msg)) {
-                                if (archive_id) {
+                                    this.fetchArchivedMessages();
-                                    this.fetchArchivedMessages({
-                                        'after': most_recent_msg.get('archive_id')
-                                    });
                                } else {
-                                    this.fetchArchivedMessages({
+                                    const archive_id = most_recent_msg.get('archive_id');
-                                        'start': most_recent_msg.get('time')
+                                    if (archive_id) {
-                                    });
+                                        this.fetchArchivedMessages({
+                                            'after': most_recent_msg.get('archive_id')
+                                        });
+                                    } else {
+                                        this.fetchArchivedMessages({
+                                            'start': most_recent_msg.get('time')
+                                        });
+                                    }
                                }
                            } else {
                                this.clearSpinner();