From: Badlop <badlop@process-one.net>
Date: Wed, 19 Dec 2018 10:59:52 +0000 (+0100)
Subject: Parse persistent and archiving room options importing from prosody (#2720)
X-Git-Tag: 19.02~91
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b151f5902c190e2d620ac234bfc48f76f18a0c8;p=ejabberd

Parse persistent and archiving room options importing from prosody (#2720)
---

diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl
index b8d9f4da1..2690eb960 100644
--- a/src/prosody2ejabberd.erl
+++ b/src/prosody2ejabberd.erl
@@ -358,9 +358,11 @@ convert_room_config(Data) ->
 		end,
     [{affiliations, convert_room_affiliations(Data)},
      {allow_change_subj, proplists:get_bool(<<"changesubject">>, Config)},
+     {mam, proplists:get_bool(<<"archiving">>, Config)},
      {description, proplists:get_value(<<"description">>, Config, <<"">>)},
      {members_only,	proplists:get_bool(<<"members_only">>, Config)},
      {moderated, proplists:get_bool(<<"moderated">>, Config)},
+     {persistent, proplists:get_bool(<<"persistent">>, Config)},
      {anonymous, Anonymous}] ++ Pass ++ Subj.
 
 convert_privacy_item({_, Item}) ->