]> granicus.if.org Git - ejabberd/commitdiff
Display muc#roomconfig_changesubject in room's disco#info
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 1 Jun 2018 05:56:56 +0000 (08:56 +0300)
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>
Fri, 1 Jun 2018 05:56:56 +0000 (08:56 +0300)
Fixes #2449

rebar.config
src/mod_muc_room.erl

index cb30f6003b15fd175e8853fca6473d8a93037e79..a9dccaac1ca512b4b44d5cf1cbd645d3298e268d 100644 (file)
@@ -25,7 +25,7 @@
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.22"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.11"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.30"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "6999333"}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "6e3feb7"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.14"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}},
index 4f707074183ecc9a17ebc5f8884b3cb53e4ad641..94c9ae327e12bcbcd6a4d50bf1b7635355c1f42d 100644 (file)
@@ -3848,6 +3848,7 @@ iq_disco_info_extras(Lang, StateData) ->
     Fs1 = [{description, (StateData#state.config)#config.description},
           {occupants, ?DICT:size(StateData#state.nicks)},
           {contactjid, get_owners(StateData)},
+          {changesubject, (StateData#state.config)#config.allow_change_subj},
           {lang, (StateData#state.config)#config.lang}],
     Fs2 = case (StateData#state.config)#config.pubsub of
              Node when is_binary(Node), Node /= <<"">> ->