From: Badlop Date: Tue, 18 Dec 2007 19:19:24 +0000 (+0000) Subject: * src/mod_muc/mod_muc_log.erl: Add handling of kicks 321, 322, 332 X-Git-Tag: v2.0.0~90 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b07b2fe1593e0e89bf34cd0f359b83949fde2375;p=ejabberd * src/mod_muc/mod_muc_log.erl: Add handling of kicks 321, 322, 332 SVN Revision: 1080 --- diff --git a/ChangeLog b/ChangeLog index 53dc6785b..38388ece9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-12-18 Badlop + * src/mod_muc/mod_muc_log.erl: Add handling of kicks 321, 322, 332 + * doc/guide.tex: Document mod_privacy_odbc * doc/Makefile: Support for conditional inclusion of documentation diff --git a/src/mod_muc/mod_muc_log.erl b/src/mod_muc/mod_muc_log.erl index 2521a07cf..57cd03ed3 100644 --- a/src/mod_muc/mod_muc_log.erl +++ b/src/mod_muc/mod_muc_log.erl @@ -323,18 +323,27 @@ add_message_to_log(Nick1, Message, RoomJID, Opts, State) -> {leave, Reason} -> io_lib:format("~s ~s: ~s
", [Nick, ?T("leaves the room"), htmlize(Reason,NoFollow)]); - {kickban, "307", ""} -> - io_lib:format("~s ~s
", - [Nick, ?T("has been kicked")]); - {kickban, "307", Reason} -> - io_lib:format("~s ~s: ~s
", - [Nick, ?T("has been kicked"), htmlize(Reason)]); {kickban, "301", ""} -> io_lib:format("~s ~s
", [Nick, ?T("has been banned")]); {kickban, "301", Reason} -> io_lib:format("~s ~s: ~s
", [Nick, ?T("has been banned"), htmlize(Reason)]); + {kickban, "307", ""} -> + io_lib:format("~s ~s
", + [Nick, ?T("has been kicked")]); + {kickban, "307", Reason} -> + io_lib:format("~s ~s: ~s
", + [Nick, ?T("has been kicked"), htmlize(Reason)]); + {kickban, "321", ""} -> + io_lib:format("~s ~s
", + [Nick, ?T("has been kicked because of an affiliation change")]); + {kickban, "322", ""} -> + io_lib:format("~s ~s
", + [Nick, ?T("has been kicked because the room has been changed to members-only")]); + {kickban, "332", ""} -> + io_lib:format("~s ~s
", + [Nick, ?T("has been kicked because of a system shutdown")]); {nickchange, OldNick} -> io_lib:format("~s ~s ~s
", [htmlize(OldNick), ?T("is now known as"), Nick]);