Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

cleanup

Browse Source
This commit is contained in:
JC Brand 2019-05-22 19:45:00 +02:00
parent a1c33d2140
commit 7032ded53f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/headless/converse-mam.js
View File

@ -204,22 +204,23 @@ converse.plugins.add('converse-mam', {
}; };
/************************ BEGIN Event Handlers ************************/ /************************ BEGIN Event Handlers ************************/
_converse.api.listen.on('serviceDiscovered', (feature) => { function getMAMPrefsFromFeature (feature) {
const prefs = feature.get('preferences') || {}; const prefs = feature.get('preferences') || {};
if (feature.get('var') === Strophe.NS.MAM && if (feature.get('var') !== Strophe.NS.MAM || _.isUndefined(_converse.message_archiving)) {
prefs['default'] !== _converse.message_archiving && // eslint-disable-line dot-notation return;
!_.isUndefined(_converse.message_archiving) ) { }
// Ask the server for archiving preferences if (prefs['default'] !== _converse.message_archiving) {
_converse.api.sendIQ($iq({'type': 'get'}).c('prefs', {'xmlns': Strophe.NS.MAM})) _converse.api.sendIQ($iq({'type': 'get'}).c('prefs', {'xmlns': Strophe.NS.MAM}))
.then(_.partial(_converse.onMAMPreferences, feature)) .then(_.partial(_converse.onMAMPreferences, feature))
.catch(_converse.onMAMError); .catch(_converse.onMAMError);
} }
}); }
_converse.api.listen.on('serviceDiscovered', getMAMPrefsFromFeature);
_converse.api.listen.on('afterMessagesFetched', chat => chat.fetchNewestMessages()); _converse.api.listen.on('afterMessagesFetched', chat => chat.fetchNewestMessages());
_converse.api.listen.on('chatReconnected', chat => chat.fetchNewestMessages()); _converse.api.listen.on('chatReconnected', chat => chat.fetchNewestMessages());
_converse.api.listen.on('addClientFeatures', () => _converse.api.disco.own.features.add(Strophe.NS.MAM)); _converse.api.listen.on('addClientFeatures', () => _converse.api.disco.own.features.add(Strophe.NS.MAM));
/************************ END Event Handlers ************************/ /************************ END Event Handlers **************************/
/************************ BEGIN API ************************/ /************************ BEGIN API ************************/
@ -410,12 +411,12 @@ converse.plugins.add('converse-mam', {
} }
const attrs = {'type':'set'}; const attrs = {'type':'set'};
if (options && options.groupchat) { if (options && options.groupchat) {
if (!options['with']) { // eslint-disable-line dot-notation if (!options['with']) {
throw new Error( throw new Error(
'You need to specify a "with" value containing '+ 'You need to specify a "with" value containing '+
'the chat room JID, when querying groupchat messages.'); 'the chat room JID, when querying groupchat messages.');
} }
attrs.to = options['with']; // eslint-disable-line dot-notation attrs.to = options['with'];
} }
const jid = attrs.to || _converse.bare_jid; const jid = attrs.to || _converse.bare_jid;
@ -432,9 +433,9 @@ converse.plugins.add('converse-mam', {
.c('field', {'var':'FORM_TYPE', 'type': 'hidden'}) .c('field', {'var':'FORM_TYPE', 'type': 'hidden'})
.c('value').t(Strophe.NS.MAM).up().up(); .c('value').t(Strophe.NS.MAM).up().up();
if (options['with'] && !options.groupchat) { // eslint-disable-line dot-notation if (options['with'] && !options.groupchat) {
stanza.c('field', {'var':'with'}).c('value') stanza.c('field', {'var':'with'}).c('value')
.t(options['with']).up().up(); // eslint-disable-line dot-notation .t(options['with']).up().up();
} }
['start', 'end'].forEach(t => { ['start', 'end'].forEach(t => {
if (options[t]) { if (options[t]) {
@ -456,7 +457,7 @@ converse.plugins.add('converse-mam', {
const messages = []; const messages = [];
const message_handler = _converse.connection.addHandler(message => { const message_handler = _converse.connection.addHandler(message => {
if (options.groupchat && message.getAttribute('from') !== options['with']) { // eslint-disable-line dot-notation if (options.groupchat && message.getAttribute('from') !== options['with']) {
return true; return true;
} }
const result = message.querySelector('result'); const result = message.querySelector('result');