Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

* src/mod_muc/mod_muc_room.erl: Fixed room shaper processing 

SVN Revision: 1305
This commit is contained in:
Alexey Shchepin 2008-04-27 19:06:34 +00:00
parent 4c937ab94e
commit 85d3b27d71
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-04-27 Alexey Shchepin <alexey@process-one.net>
* src/mod_muc/mod_muc_room.erl: Fixed room shaper processing
2008-04-26 Badlop <badlop@process-one.net> 2008-04-26 Badlop <badlop@process-one.net>
* src/mod_shared_roster.erl: Fix for new registered accounts not * src/mod_shared_roster.erl: Fix for new registered accounts not

44
src/mod_muc/mod_muc_room.erl
View File

@ -694,31 +694,27 @@ code_change(_OldVsn, StateName, StateData, _Extra) ->
%% {stop, Reason, NewStateData} %% {stop, Reason, NewStateData}
%%---------------------------------------------------------------------- %%----------------------------------------------------------------------
handle_info({process_user_presence, From}, normal_state = _StateName, StateData) -> handle_info({process_user_presence, From}, normal_state = _StateName, StateData) ->
Activity = get_user_activity(From, StateData), RoomQueueEmpty = queue:is_empty(StateData#state.room_queue),
Now = now_to_usec(now()), RoomQueue = queue:in({presence, From}, StateData#state.room_queue),
{Nick, Packet} = Activity#activity.presence, StateData1 = StateData#state{room_queue = RoomQueue},
NewActivity = Activity#activity{presence_time = Now, if
presence = undefined}, RoomQueueEmpty ->
StateData1 = StateData2 = prepare_room_queue(StateData1),
StateData#state{ {next_state, normal_state, StateData2};
activity = ?DICT:store( true ->
jlib:jid_tolower(From), {next_state, normal_state, StateData1}
NewActivity, end;
StateData#state.activity)},
process_presence(From, Nick, Packet, StateData1);
handle_info({process_user_message, From}, normal_state = _StateName, StateData) -> handle_info({process_user_message, From}, normal_state = _StateName, StateData) ->
Activity = get_user_activity(From, StateData), RoomQueueEmpty = queue:is_empty(StateData#state.room_queue),
Now = now_to_usec(now()), RoomQueue = queue:in({message, From}, StateData#state.room_queue),
Packet = Activity#activity.message, StateData1 = StateData#state{room_queue = RoomQueue},
NewActivity = Activity#activity{message_time = Now, if
message = undefined}, RoomQueueEmpty ->
StateData1 = StateData2 = prepare_room_queue(StateData1),
StateData#state{ {next_state, normal_state, StateData2};
activity = ?DICT:store( true ->
jlib:jid_tolower(From), {next_state, normal_state, StateData1}
NewActivity, end;
StateData#state.activity)},
process_groupchat_message(From, Packet, StateData1);
handle_info(process_room_queue, normal_state = StateName, StateData) -> handle_info(process_room_queue, normal_state = StateName, StateData) ->
case queue:out(StateData#state.room_queue) of case queue:out(StateData#state.room_queue) of
{{value, {message, From}}, RoomQueue} -> {{value, {message, From}}, RoomQueue} ->