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

Move locked_muc_domain and muc_domain to model

Browse Source
This commit is contained in:
JC Brand 2019-05-21 13:05:55 +02:00
parent 9cb9151265
commit 53520317fc
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/converse-muc-views.js
View File

@ -113,10 +113,8 @@ converse.plugins.add('converse-muc-views', {
_converse.api.settings.update({ _converse.api.settings.update({
'auto_list_rooms': false, 'auto_list_rooms': false,
'cache_muc_messages': true, 'cache_muc_messages': true,
'locked_muc_domain': false,
'locked_muc_nickname': false, 'locked_muc_nickname': false,
'muc_disable_slash_commands': false, 'muc_disable_slash_commands': false,
'muc_domain': undefined,
'muc_show_join_leave': true, 'muc_show_join_leave': true,
'muc_show_join_leave_status': true, 'muc_show_join_leave_status': true,
'roomconfig_whitelist': [], 'roomconfig_whitelist': [],
@ -125,11 +123,6 @@ converse.plugins.add('converse-muc-views', {
} }
}); });
if (_converse.locked_muc_domain && !_.isString(_converse.muc_domain)) {
throw new Error("Config Error: it makes no sense to set locked_muc_domain "+
"to true when muc_domain is not set");
}
function ___ (str) { function ___ (str) {
/* This is part of a hack to get gettext to scan strings to be /* This is part of a hack to get gettext to scan strings to be
* translated. Strings we cannot send to the function above because * translated. Strings we cannot send to the function above because

23
src/headless/converse-muc.js
View File

@ -112,17 +112,24 @@ converse.plugins.add('converse-muc', {
// Refer to docs/source/configuration.rst for explanations of these // Refer to docs/source/configuration.rst for explanations of these
// configuration settings. // configuration settings.
_converse.api.settings.update({ _converse.api.settings.update({
allow_muc: true, 'allow_muc': true,
allow_muc_invitations: true, 'allow_muc_invitations': true,
auto_join_on_invite: false, 'auto_join_on_invite': false,
auto_join_rooms: [], 'auto_join_rooms': [],
auto_register_muc_nickname: false, 'auto_register_muc_nickname': false,
muc_history_max_stanzas: undefined, 'locked_muc_domain': false,
muc_instant_rooms: true, 'muc_domain': undefined,
muc_nickname_from_jid: false 'muc_history_max_stanzas': undefined,
'muc_instant_rooms': true,
'muc_nickname_from_jid': false
}); });
_converse.api.promises.add(['roomsAutoJoined']); _converse.api.promises.add(['roomsAutoJoined']);
if (_converse.locked_muc_domain && !_.isString(_converse.muc_domain)) {
throw new Error("Config Error: it makes no sense to set locked_muc_domain "+
"to true when muc_domain is not set");
}
async function openRoom (jid) { async function openRoom (jid) {
if (!u.isValidMUCJID(jid)) { if (!u.isValidMUCJID(jid)) {