aboutsummaryrefslogtreecommitdiff
path: root/src/mod_muc_mnesia.erl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2018-08-20 15:39:58 +0200
committerBadlop <badlop@process-one.net>2018-08-20 15:47:53 +0200
commit0cbd41fbdc6a9a3d2d3153fd9305c90538b0448a (patch)
tree067a95a69ab555b1f030531187fd468e8ee7503d /src/mod_muc_mnesia.erl
parentUse "localhost" as a default host (diff)
Fix max_user_conferences in Mnesia to consider only one MUC service (#2556)
Diffstat (limited to '')
-rw-r--r--src/mod_muc_mnesia.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl
index 84db17b0a..918ce1dcb 100644
--- a/src/mod_muc_mnesia.erl
+++ b/src/mod_muc_mnesia.erl
@@ -263,12 +263,13 @@ unregister_online_user(_ServerHost, {U, S, R}, Room, Host) ->
#muc_online_users{us = {U, S}, resource = R,
room = Room, host = Host}).
-count_online_rooms_by_user(_ServerHost, U, S) ->
+count_online_rooms_by_user(ServerHost, U, S) ->
+ MucHost = gen_mod:get_module_opt_host(ServerHost, mod_muc, <<"conference.@HOST@">>),
ets:select_count(
muc_online_users,
ets:fun2ms(
- fun(#muc_online_users{us = {U1, S1}}) ->
- U == U1 andalso S == S1
+ fun(#muc_online_users{us = {U1, S1}, host = Host}) ->
+ U == U1 andalso S == S1 andalso MucHost == Host
end)).
get_online_rooms_by_user(ServerHost, U, S) ->