diff options
| author | Badlop <badlop@process-one.net> | 2011-04-07 12:54:39 +0200 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2011-04-07 12:54:39 +0200 |
| commit | 449e56ed5241adc8e206d45b66515eca38d8df36 (patch) | |
| tree | f57784d0cbbed7af31b605594068958c1ce110f4 | |
| parent | mod_ping uses iqdisc no_queue by default (thanks to Chris Moos)(EJAB-1435) (diff) | |
Send jid attribute when occupant is banned (EJAB-1432)
| -rw-r--r-- | src/mod_muc/mod_muc_room.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl index 30e8897b..894abd53 100644 --- a/src/mod_muc/mod_muc_room.erl +++ b/src/mod_muc/mod_muc_room.erl @@ -2667,14 +2667,21 @@ send_kickban_presence(JID, Reason, Code, NewAffiliation, StateData) -> end, LJIDs). send_kickban_presence1(UJID, Reason, Code, Affiliation, StateData) -> - {ok, #user{jid = _RealJID, + {ok, #user{jid = RealJID, nick = Nick}} = ?DICT:find(jlib:jid_tolower(UJID), StateData#state.users), SAffiliation = affiliation_to_list(Affiliation), + BannedJIDString = jlib:jid_to_string(RealJID), lists:foreach( fun({_LJID, Info}) -> + JidAttrList = case (Info#user.role == moderator) orelse + ((StateData#state.config)#config.anonymous + == false) of + true -> [{"jid", BannedJIDString}]; + false -> [] + end, ItemAttrs = [{"affiliation", SAffiliation}, - {"role", "none"}], + {"role", "none"}] ++ JidAttrList, ItemEls = case Reason of "" -> []; |