Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Kick occupants with reason when room is stopped due to MUC shutdown (EJAB-1149)

Browse Source 
SVN Revision: 2848
This commit is contained in:
Badlop 2009-12-30 01:25:35 +00:00
parent 5d749de74d
commit d9a1eecdca
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/mod_muc/mod_muc_room.erl
View File

@ -571,7 +571,7 @@ handle_event({destroy, Reason}, _StateName, StateData) ->
?INFO_MSG("Destroyed MUC room ~s with reason: ~p", ?INFO_MSG("Destroyed MUC room ~s with reason: ~p",
[jlib:jid_to_string(StateData#state.jid), Reason]), [jlib:jid_to_string(StateData#state.jid), Reason]),
add_to_log(room_existence, destroyed, StateData), add_to_log(room_existence, destroyed, StateData),
{stop, normal, StateData}; {stop, Reason, StateData};
handle_event(destroy, StateName, StateData) -> handle_event(destroy, StateName, StateData) ->
?INFO_MSG("Destroyed MUC room ~s", ?INFO_MSG("Destroyed MUC room ~s",
[jlib:jid_to_string(StateData#state.jid)]), [jlib:jid_to_string(StateData#state.jid)]),
@ -728,12 +728,33 @@ handle_info(_Info, StateName, StateData) ->
%% Purpose: Shutdown the fsm %% Purpose: Shutdown the fsm
%% Returns: any %% Returns: any
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
terminate(_Reason, _StateName, StateData) -> terminate(Reason, _StateName, StateData) ->
?INFO_MSG("Stopping MUC room ~s@~s", ?INFO_MSG("Stopping MUC room ~s@~s",
[StateData#state.room, StateData#state.host]), [StateData#state.room, StateData#state.host]),
ReasonT = case Reason of
shutdown -> "You are being removed from the room because"
" of a system shutdown";
_ -> atom_to_list(Reason)
end,
ItemAttrs = [{"affiliation", "none"}, {"role", "none"}],
ReasonEl = {xmlelement, "reason", [], [{xmlcdata, ReasonT}]},
Packet = {xmlelement, "presence", [{"type", "unavailable"}],
[{xmlelement, "x", [{"xmlns", ?NS_MUC_USER}],
[{xmlelement, "item", ItemAttrs, [ReasonEl]},
{xmlelement, "status", [{"code", "332"}], []}
]}]},
?DICT:fold( ?DICT:fold(
fun(J, _, _) -> fun(LJID, Info, _) ->
tab_remove_online_user(J, StateData) Nick = Info#user.nick,
case Reason of
shutdown ->
ejabberd_router:route(
jlib:jid_replace_resource(StateData#state.jid, Nick),
Info#user.jid,
Packet);
_ -> ok
end,
tab_remove_online_user(LJID, StateData)
end, [], StateData#state.users), end, [], StateData#state.users),
add_to_log(room_existence, stopped, StateData), add_to_log(room_existence, stopped, StateData),
mod_muc:room_destroyed(StateData#state.host, StateData#state.room, self(), mod_muc:room_destroyed(StateData#state.host, StateData#state.room, self(),