Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Khramtsov <xramtsov@gmail.com>2018-02-12 17:36:47 +0300
committerGitHub <noreply@github.com>2018-02-12 17:36:47 +0300
commit42794ce4e4164d82b6612741dcd58a438224dbd4 (patch)
treedeff9371277b555c62cf9c081c3a3ec0e5d0d567
parent66fc1bf3b6cab63559fa58a086a1439ecdebfea7 (diff)
parent9188a7b838d9bc73cdc791bff32d60691a083460 (diff)
Merge pull request #2274 from Torxen/feature/fixed-return-value-mod_muc
Issue: mod_muc.erl expect wrong return value
-rw-r--r--src/mod_muc.erl5
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">>),