Commit bad9b08b authored by JC Brand's avatar JC Brand

`disable_mam` should now be set on the model

parent 038359c7
......@@ -82,7 +82,7 @@ converse.plugins.add('converse-headline', {
initialize () {
this.initDebounced();
this.disable_mam = true; // Don't do MAM queries for this box
this.model.disable_mam = true; // Don't do MAM queries for this box
this.model.messages.on('add', this.onMessageAdded, this);
this.model.on('show', this.show, this);
this.model.on('destroy', this.hide, this);
......@@ -116,7 +116,7 @@ converse.plugins.add('converse-headline', {
/* Handler method for all incoming messages of type "headline". */
if (utils.isHeadlineMessage(_converse, message)) {
const from_jid = message.getAttribute('from');
if (_.includes(from_jid, '@') &&
if (_.includes(from_jid, '@') &&
!_converse.roster.get(from_jid) &&
!_converse.allow_non_roster_messaging) {
return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment