diff options
| author | Alexey Shchepin <alexey@process-one.net> | 2004-05-01 20:10:25 +0000 |
|---|---|---|
| committer | Alexey Shchepin <alexey@process-one.net> | 2004-05-01 20:10:25 +0000 |
| commit | 4760ff32011d32641850a7a7c187d91165a2c91f (patch) | |
| tree | f2d6ac464f9bc06e707b303634c03f31b5068d91 /src/mod_muc | |
| parent | * src/translate.erl: Search translations directory in priv_dir (diff) | |
* src/web/ejabberd_http.erl: 'Accept-Language' header support
* src/web/ejabberd_web_admin.erl: Likewise
* src/msgs/ru.msg: Updated
* src/mod_muc/mod_muc_room.erl: Send status code "201" on room
creation
SVN Revision: 227
Diffstat (limited to 'src/mod_muc')
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 0d83361bb..12a51b3c8 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -65,7 +65,8 @@ affiliations = ?DICT:new(), history = lqueue_new(20), subject = "", - subject_author = ""}). + subject_author = "", + just_created = false}). %-define(DBGFSM, true). @@ -102,7 +103,8 @@ init([Host, Room, Creator, Nick]) -> State = set_affiliation(Creator, owner, #state{host = Host, room = Room, - jid = jlib:make_jid(Room, Host, "")}), + jid = jlib:make_jid(Room, Host, ""), + just_created = true}), {ok, normal_state, State}; init([Host, Room, Opts]) -> State = set_opts(Opts, #state{host = Host, @@ -919,7 +921,12 @@ add_new_user(From, Nick, {xmlelement, _, Attrs, Els} = Packet, StateData) -> _ -> send_subject(From, Lang, StateData) end, - NewState; + case NewState#state.just_created of + true -> + NewState#state{just_created = false}; + false -> + NewState + end; nopass -> ErrText = "Password required to enter this room", Err = jlib:make_error_reply( @@ -1216,10 +1223,16 @@ send_new_presence(NJID, StateData) -> [{"affiliation", SAffiliation}, {"role", SRole}] end, + Status = case StateData#state.just_created of + true -> + [{xmlelement, "status", [{"code", "201"}], []}]; + false -> + [] + end, Packet = append_subtags( Presence, [{xmlelement, "x", [{"xmlns", ?NS_MUC_USER}], - [{xmlelement, "item", ItemAttrs, []}]}]), + [{xmlelement, "item", ItemAttrs, []} | Status]}]), ejabberd_router:route( jlib:jid_replace_resource(StateData#state.jid, Nick), Info#user.jid, |