summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorgenric <genrich.ivaska@epfl.ch>2016-04-04 14:02:34 +0200
committergenric <genrich.ivaska@epfl.ch>2016-04-04 14:02:34 +0200
commit490aa2c6a659f86e5138905fa8b5042893d0f9b9 (patch)
treee2ffdba3bc0fa735bc0b560547e1f1acbeea3d4a /src
parentMerge pull request #1046 from processone/commands-update (diff)
Fix mod_muc_admin:set_room_affiliation
Add missing options so they are stored when set_room_affiliation is invoked, instead of being ignored and set to default values after muc restart.
Diffstat (limited to 'src')
-rw-r--r--src/mod_muc_admin.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 7c6e84c4..70426010 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -881,12 +881,19 @@ make_opts(StateData) ->
Config = StateData#state.config,
[
{title, Config#config.title},
+ {vcard, Config#config.vcard},
+ {voice_request_min_interval, Config#config.voice_request_min_interval},
{allow_change_subj, Config#config.allow_change_subj},
{allow_query_users, Config#config.allow_query_users},
{allow_private_messages, Config#config.allow_private_messages},
+ {allow_private_messages_from_visitors, Config#config.allow_private_messages_from_visitors},
+ {allow_visitor_status, Config#config.allow_visitor_status},
+ {allow_visitor_nickchange, Config#config.allow_visitor_nickchange},
+ {allow_voice_requests, Config#config.allow_voice_requests},
{public, Config#config.public},
{public_list, Config#config.public_list},
{persistent, Config#config.persistent},
+ {mam, Config#config.mam},
{moderated, Config#config.moderated},
{members_by_default, Config#config.members_by_default},
{members_only, Config#config.members_only},
@@ -894,6 +901,8 @@ make_opts(StateData) ->
{password_protected, Config#config.password_protected},
{password, Config#config.password},
{anonymous, Config#config.anonymous},
+ {captcha_protected, Config#config.captcha_protected},
+ {description, Config#config.description},
{logging, Config#config.logging},
{max_users, Config#config.max_users},
{affiliations, ?DICT:to_list(StateData#state.affiliations)},