mod_muc: Announce stable-id feature from XEP-0045 1.31, supported since long ago

Author: badlop

mix.exs

@@ -130,7 +130,7 @@ defmodule Ejabberd.MixProject do
      {:p1_utils, "~> 1.0"},
      {:pkix, "~> 1.0"},
      {:stringprep, ">= 1.0.26"},
-     {:xmpp, ">= 1.11.2"},
+     {:xmpp, git: "https://github.com/processone/xmpp", ref: "7285aa7802bfa90bcefafdad3a342fbb93ce7eea", override: true},
      {:yconf, ">= 1.0.22"}]
     ++ cond_deps()
   end

mix.lock

@@ -34,6 +34,6 @@
   "stringprep": {:hex, :stringprep, "1.0.33", "22f42866b4f6f3c238ea2b9cb6241791184ddedbab55e94a025511f46325f3ca", [:rebar3], [{:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "96f8b30bc50887f605b33b46bca1d248c19a879319b8c482790e3b4da5da98c0"},
   "stun": {:hex, :stun, "1.2.21", "735855314ad22cb7816b88597d2f5ca22e24aa5e4d6010a0ef3affb33ceed6a5", [:rebar3], [{:fast_tls, "1.1.25", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.28", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "3d7fe8efb9d05b240a6aa9a6bf8b8b7bff2d802895d170443c588987dc1e12d9"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.1", "a48703a25c170eedadca83b11e88985af08d35f37c6f664d6dcfb106a97782fc", [:rebar3], [], "hexpm", "b3a917854ce3ae233619744ad1e0102e05673136776fb2fa76234f3e03b23642"},
-  "xmpp": {:hex, :xmpp, "1.11.2", "6ef43a6e5fb71506af7eccd05bbb6cccb58eb1856c539613e76fd9a5c4e936ba", [:rebar3], [{:ezlib, "~> 1.0.12", [hex: :ezlib, repo: "hexpm", optional: false]}, {:fast_tls, "~> 1.1.19", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:fast_xml, "~> 1.1.51", [hex: :fast_xml, repo: "hexpm", optional: false]}, {:idna, "~> 6.0", [hex: :idna, repo: "hexpm", optional: false]}, {:p1_utils, "~> 1.0.26", [hex: :p1_utils, repo: "hexpm", optional: false]}, {:stringprep, "~> 1.0.29", [hex: :stringprep, repo: "hexpm", optional: false]}], "hexpm", "bb681644e15e3efc0008ab3a717944d67cf611a4b7e344382aa6367447bd52d2"},
+  "xmpp": {:git, "https://github.com/processone/xmpp", "7285aa7802bfa90bcefafdad3a342fbb93ce7eea", [ref: "7285aa7802bfa90bcefafdad3a342fbb93ce7eea"]},
   "yconf": {:hex, :yconf, "1.0.22", "52a435f9b60ab1e13950dfe3f7131ecdd8b3d1ca72c44bf66fc74b4571027124", [:rebar3], [{:fast_yaml, "1.0.39", [hex: :fast_yaml, repo: "hexpm", optional: false]}], "hexpm", "aca83457ceabe70756484b5c87ba7b1955f511d499168687eaeaa7c300e857f1"},
 }

rebar.config

@@ -77,7 +77,7 @@
         {stringprep, "~> 1.0.33", {git, "https://github.com/processone/stringprep", {tag, "1.0.33"}}},
         {if_var_true, stun,
          {stun, "~> 1.2.21", {git, "https://github.com/processone/stun", {tag, "1.2.21"}}}},
-        {xmpp, "~> 1.11.2", {git, "https://github.com/processone/xmpp", {tag, "1.11.2"}}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "7285aa7802bfa90bcefafdad3a342fbb93ce7eea"}},
         {yconf, "~> 1.0.22", {git, "https://github.com/processone/yconf", {tag, "1.0.22"}}}
        ]}.
 

rebar.lock

@@ -24,7 +24,10 @@
  {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.33">>},0},
  {<<"stun">>,{pkg,<<"stun">>,<<"1.2.21">>},0},
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.1">>},1},
- {<<"xmpp">>,{pkg,<<"xmpp">>,<<"1.11.2">>},0},
+ {<<"xmpp">>,
+  {git,"https://github.com/processone/xmpp",
+       {ref,"7285aa7802bfa90bcefafdad3a342fbb93ce7eea"}},
+  0},
  {<<"yconf">>,{pkg,<<"yconf">>,<<"1.0.22">>},0}]}.
 [
 {pkg_hash,[
@@ -53,7 +56,6 @@
  {<<"stringprep">>, <<"22F42866B4F6F3C238EA2B9CB6241791184DDEDBAB55E94A025511F46325F3CA">>},
  {<<"stun">>, <<"735855314AD22CB7816B88597D2F5CA22E24AA5E4D6010A0EF3AFFB33CEED6A5">>},
  {<<"unicode_util_compat">>, <<"A48703A25C170EEDADCA83B11E88985AF08D35F37C6F664D6DCFB106A97782FC">>},
- {<<"xmpp">>, <<"6EF43A6E5FB71506AF7ECCD05BBB6CCCB58EB1856C539613E76FD9A5C4E936BA">>},
  {<<"yconf">>, <<"52A435F9B60AB1E13950DFE3F7131ECDD8B3D1CA72C44BF66FC74B4571027124">>}]},
 {pkg_hash_ext,[
  {<<"base64url">>, <<"F9B3ADD4731A02A9B0410398B475B33E7566A695365237A6BDEE1BB447719F5C">>},
@@ -81,6 +83,5 @@
  {<<"stringprep">>, <<"96F8B30BC50887F605B33B46BCA1D248C19A879319B8C482790E3B4DA5DA98C0">>},
  {<<"stun">>, <<"3D7FE8EFB9D05B240A6AA9A6BF8B8B7BFF2D802895D170443C588987DC1E12D9">>},
  {<<"unicode_util_compat">>, <<"B3A917854CE3AE233619744AD1E0102E05673136776FB2FA76234F3E03B23642">>},
- {<<"xmpp">>, <<"BB681644E15E3EFC0008AB3A717944D67CF611A4B7E344382AA6367447BD52D2">>},
  {<<"yconf">>, <<"ACA83457CEABE70756484B5C87BA7B1955F511D499168687EAEAA7C300E857F1">>}]}
 ].

src/mod_muc.erl

@@ -24,7 +24,7 @@
 %%%----------------------------------------------------------------------
 -module(mod_muc).
 -author('alexey@process-one.net').
--protocol({xep, 45, '1.25', '0.5.0', "complete", ""}).
+-protocol({xep, 45, '1.35.2', '0.5.0', "complete", ""}).
 -protocol({xep, 249, '1.2', '0.5.0', "complete", ""}).
 -protocol({xep, 486, '0.1.0', '24.07', "complete", ""}).
 -ifndef(GEN_SERVER).
@@ -742,7 +742,8 @@ process_disco_info(#iq{type = get, from = From, to = To, lang = Lang,
 			   deny -> []
 		       end,
     Features = [?NS_DISCO_INFO, ?NS_DISCO_ITEMS,
-		?NS_MUC, ?NS_VCARD, ?NS_MUCSUB, ?NS_MUC_UNIQUE
+		?NS_MUC, ?NS_VCARD, ?NS_MUCSUB, ?NS_MUC_UNIQUE,
+		?NS_MUC_STABLE_ID
 		| RegisterFeatures ++ RSMFeatures ++ MAMFeatures ++ OccupantIdFeatures],
     Name = mod_muc_opt:name(ServerHost),
     Identity = #identity{category = <<"conference">>,

src/mod_muc_room.erl

@@ -4440,7 +4440,8 @@ make_disco_info(From, StateData) ->
     Config = StateData#state.config,
     ServerHost = StateData#state.server_host,
     AccessRegister = mod_muc_opt:access_register(ServerHost),
-    Feats = [?NS_VCARD, ?NS_MUC, ?NS_DISCO_INFO, ?NS_DISCO_ITEMS,
+    Feats = [?NS_VCARD, ?NS_MUC, ?NS_MUC_STABLE_ID,
+             ?NS_DISCO_INFO, ?NS_DISCO_ITEMS,
              ?NS_COMMANDS,
              ?NS_MESSAGE_MODERATE_0, ?NS_MESSAGE_MODERATE_1,
              ?NS_MESSAGE_RETRACT,