diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-03 21:09:27 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-03 21:09:27 +0300 |
| commit | 63dba3fd640c096c5e7956b8d910c55ecdb194d2 (patch) | |
| tree | b17fb85d04da9da05c950dc03dfabcf251cddf59 /src/mod_muc.erl | |
| parent | Let a MUC room to route presences from its bare JID (diff) | |
| parent | Revert "Support for default values in default_room_opts" (diff) | |
Merge branch 'master' into muc-self-presence
Diffstat (limited to 'src/mod_muc.erl')
| -rw-r--r-- | src/mod_muc.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mod_muc.erl b/src/mod_muc.erl index acfbb90a0..debda4cab 100644 --- a/src/mod_muc.erl +++ b/src/mod_muc.erl @@ -107,8 +107,7 @@ -callback unregister_online_user(binary(), ljid(), binary(), binary()) -> any(). -callback count_online_rooms_by_user(binary(), binary(), binary()) -> non_neg_integer(). -callback get_online_rooms_by_user(binary(), binary(), binary()) -> [{binary(), binary()}]. --callback get_subscribed_rooms(binary(), binary(), jid()) -> - {ok, [{ljid(), binary(), [binary()]}]} | {error, any()}. +-callback get_subscribed_rooms(binary(), binary(), jid()) -> [ljid()] | []. %%==================================================================== %% API @@ -727,7 +726,7 @@ iq_get_register_info(ServerHost, Host, From, Lang) -> instructions = [Inst], fields = Fields}, #register{nick = Nick, registered = Registered, - instructions = + instructions = translate:translate( Lang, <<"You need a client that supports x:data " "to register the nickname">>), |