diff options
| author | Badlop <badlop@process-one.net> | 2018-12-10 21:06:26 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2018-12-10 21:06:26 +0100 |
| commit | 446ff9257c24903731f3ac23957b7e333b0a5067 (patch) | |
| tree | 23c37e45e4da2130c4108dfc6c04b6b6606a542c /src | |
| parent | When unknown roster version, return an acceptable version ID binary (#2709) (diff) | |
Don't require a full JID as argument, instead set a dummy resource (#2710)
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_muc_admin.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl index c050d4fc2..23d821642 100644 --- a/src/mod_muc_admin.erl +++ b/src/mod_muc_admin.erl @@ -263,9 +263,9 @@ get_commands_spec() -> #ejabberd_commands{name = subscribe_room, tags = [muc_room], desc = "Subscribe to a MUC conference", module = ?MODULE, function = subscribe_room, - args_desc = ["Full JID, including some resource", "a user's nick", + args_desc = ["User JID", "a user's nick", "the room to subscribe", "nodes separated by commas: ,"], - args_example = ["tom@localhost/dummy", "Tom", "room1@conference.localhost", + args_example = ["tom@localhost", "Tom", "room1@conference.localhost", "urn:xmpp:mucsub:nodes:messages,urn:xmpp:mucsub:nodes:affiliations"], result_desc = "The list of nodes that has subscribed", result_example = ["urn:xmpp:mucsub:nodes:messages", @@ -1104,9 +1104,8 @@ subscribe_room(User, Nick, Room, Nodes) -> try jid:decode(Room) of #jid{luser = Name, lserver = Host} when Name /= <<"">> -> try jid:decode(User) of - #jid{lresource = <<"">>} -> - throw({error, "User's JID should have a resource"}); - UserJID -> + UserJID1 -> + UserJID = jid:replace_resource(UserJID1, <<"modmucadmin">>), case get_room_pid(Name, Host) of Pid when is_pid(Pid) -> case p1_fsm:sync_send_all_state_event( |