diff options
| author | Badlop <badlop@process-one.net> | 2015-12-23 19:34:23 +0100 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2015-12-23 19:34:23 +0100 |
| commit | c42e026f9cf1af344043e1bb411f0a88139335b6 (patch) | |
| tree | d214b53d911e3d71b8e1c09e14eb43a6929ad741 /src/mod_muc_room.erl | |
| parent | Update set-dep-versions script to work with new rebar.config (diff) | |
Degenderise room error message (#747)
Diffstat (limited to 'src/mod_muc_room.erl')
| -rw-r--r-- | src/mod_muc_room.erl | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl index 1606b593a..df7b7d3e3 100644 --- a/src/mod_muc_room.erl +++ b/src/mod_muc_room.erl @@ -225,8 +225,9 @@ normal_state({route, From, <<"">>, <<"error">> -> case is_user_online(From, StateData) of true -> - ErrorText = <<"This participant is kicked from the " - "room because he sent an error message">>, + ErrorText = <<"It is not allowed to send error messages to the" + " room. This participant (~s) sent an error " + "message (~s) and gets kicked from the room">>, NewState = expulse_participant(Packet, From, StateData, translate:translate(Lang, ErrorText)), @@ -512,9 +513,9 @@ normal_state({route, From, ToNick, of {expulse_sender, Reason} -> ?DEBUG(Reason, []), - ErrorText = <<"This participant is kicked from the " - "room because he sent an error message " - "to another participant">>, + ErrorText = <<"It is not allowed to send error messages to the" + " room. This participant (~s) sent an error " + "message (~s) and gets kicked from the room">>, NewState = expulse_participant(Packet, From, StateData, translate:translate(Lang, ErrorText)), {next_state, normal_state, NewState}; @@ -1053,9 +1054,9 @@ process_presence(From, Nick, end, remove_online_user(From, NewState, Reason); <<"error">> -> - ErrorText = - <<"This participant is kicked from the " - "room because he sent an error presence">>, + ErrorText = <<"It is not allowed to send error messages to the" + " room. This participant (~s) sent an error " + "message (~s) and gets kicked from the room">>, expulse_participant(Packet, From, StateData, translate:translate(Lang, ErrorText)); @@ -1310,11 +1311,13 @@ get_error_condition2(Packet) -> <- EEls], {condition, Condition}. +make_reason(Packet, From, StateData, Reason1) -> + {ok, #user{nick = FromNick}} = (?DICT):find(jlib:jid_tolower(From), StateData#state.users), + Condition = get_error_condition(Packet), + iolist_to_binary(io_lib:format(Reason1, [FromNick, Condition])). + expulse_participant(Packet, From, StateData, Reason1) -> - ErrorCondition = get_error_condition(Packet), - Reason2 = iolist_to_binary( - io_lib:format(binary_to_list(Reason1) ++ ": " ++ "~s", - [ErrorCondition])), + Reason2 = make_reason(Packet, From, StateData, Reason1), NewState = add_user_presence_un(From, #xmlel{name = <<"presence">>, attrs = |