Update xmpp to get XEP-0317 Hats namespaces version 0.2.0

Author: badlop

mix.exs

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

mix.lock

@@ -34,6 +34,6 @@
   "stringprep": {:hex, :stringprep, "1.0.30", "46cf0ff631b3e7328f61f20b454d59428d87738f25d709798b5dcbb9b83c23f1", [:rebar3], [{:p1_utils, "1.0.26", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "f6fc9b3384a03877830f89b2f38580caf3f4a27448a4a333d6a8c3975c220b9a"},
   "stun": {:hex, :stun, "1.2.15", "eec510af6509201ff97f1f2c87b7977c833bf29c04e985383370ec21f04e4ccf", [:rebar3], [{:fast_tls, "1.1.22", [hex: :fast_tls, repo: "hexpm", optional: false]}, {:p1_utils, "1.0.26", [hex: :p1_utils, repo: "hexpm", optional: false]}], "hexpm", "f6d8a541a29fd13f2ce658b676c0cc661262b96e045b52def1644b75ebc0edef"},
   "unicode_util_compat": {:hex, :unicode_util_compat, "0.7.0", "bc84380c9ab48177092f43ac89e4dfa2c6d62b40b8bd132b1059ecc7232f9a78", [:rebar3], [], "hexpm", "25eee6d67df61960cf6a794239566599b09e17e668d3700247bc498638152521"},
-  "xmpp": {:git, "https://github.com/processone/xmpp", "64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0", [ref: "64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0"]},
+  "xmpp": {:git, "https://github.com/processone/xmpp", "e295055dd1cb3dafb4b3134bc7462a775ff16b5c", [ref: "e295055dd1cb3dafb4b3134bc7462a775ff16b5c"]},
   "yconf": {:git, "https://github.com/processone/yconf", "9682a6025ed543eedf34637e4cfcc66837074af6", [ref: "9682a6025ed543eedf34637e4cfcc66837074af6"]},
 }

rebar.config

@@ -77,7 +77,7 @@
         {stringprep, "~> 1.0.29", {git, "https://github.com/processone/stringprep", {tag, "1.0.30"}}},
         {if_var_true, stun,
          {stun, "~> 1.2.12", {git, "https://github.com/processone/stun", {tag, "1.2.15"}}}},
-        {xmpp, "~> 1.9.2", {git, "https://github.com/processone/xmpp", "64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0"}},
+        {xmpp, "~> 1.9.2", {git, "https://github.com/processone/xmpp", "e295055dd1cb3dafb4b3134bc7462a775ff16b5c"}},
         {yconf, "~> 1.0.17", {git, "https://github.com/processone/yconf", "9682a6025ed543eedf34637e4cfcc66837074af6"}}
        ]}.
 

rebar.lock

@@ -24,10 +24,6 @@
  {<<"stringprep">>,{pkg,<<"stringprep">>,<<"1.0.30">>},0},
  {<<"stun">>,{pkg,<<"stun">>,<<"1.2.15">>},0},
  {<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},1},
- {<<"xmpp">>,
-  {git,"https://github.com/processone/xmpp",
-       {ref,"64d6d292015a7ec4de0b9e963d20b7ac5b63c7f0"}},
-  0},
  {<<"yconf">>,
   {git,"https://github.com/processone/yconf",
        {ref,"9682a6025ed543eedf34637e4cfcc66837074af6"}},

src/mod_muc.erl

@@ -1770,8 +1770,10 @@ mod_doc() ->
                        "The default value is an empty string.")}},
              {enable_hats,
               #{value => "true | false",
+                note => "improved in 25.xx",
                 desc =>
                     ?T("Allow extended roles as defined in XEP-0317 Hats. "
+                       "Check the _`../../tutorials/muc-hats.md|MUC Hats`_ tutorial. "
                        "The default value is 'false'.")}},
              {lang,
               #{value => ?T("Language"),

src/mod_muc_room.erl

@@ -27,7 +27,7 @@
 
 -author('[email protected]').
 
--protocol({xep, 317, '0.1', '21.12', "complete", "conversejs/prosody compatible"}).
+-protocol({xep, 317, '0.2.0', '25.xx', "complete", ""}).
 -protocol({xep, 410, '1.1.0', '18.12', "complete", ""}).
 
 -behaviour(p1_fsm).
@@ -79,9 +79,9 @@
 -define(MAX_USERS_DEFAULT_LIST,
 	[5, 10, 20, 30, 50, 100, 200, 500, 1000, 2000, 5000]).
 
--define(MUC_HAT_ADD_CMD, <<"http://prosody.im/protocol/hats#add">>).
--define(MUC_HAT_REMOVE_CMD, <<"http://prosody.im/protocol/hats#remove">>).
--define(MUC_HAT_LIST_CMD, <<"p1:hats#list">>).
+-define(MUC_HAT_ADD_CMD, <<"urn:xmpp:hats:commands:don">>).
+-define(MUC_HAT_REMOVE_CMD, <<"urn:xmpp:hats:commands:doff">>).
+-define(MUC_HAT_LIST_CMD, <<"urn:xmpp:hats:commands:dlist">>).
 -define(MAX_HATS_USERS, 100).
 -define(MAX_HATS_PER_USER, 10).
 -define(CLEAN_ROOM_TIMEOUT, 30000).