aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--src/mod_muc/mod_muc_log.erl21
2 files changed, 17 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 53dc6785b..38388ece9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-12-18 Badlop <badlop@process-one.net>
+ * 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("<font class=\"ml\">~s ~s: ~s</font><br/>",
[Nick, ?T("leaves the room"), htmlize(Reason,NoFollow)]);
- {kickban, "307", ""} ->
- io_lib:format("<font class=\"mk\">~s ~s</font><br/>",
- [Nick, ?T("has been kicked")]);
- {kickban, "307", Reason} ->
- io_lib:format("<font class=\"mk\">~s ~s: ~s</font><br/>",
- [Nick, ?T("has been kicked"), htmlize(Reason)]);
{kickban, "301", ""} ->
io_lib:format("<font class=\"mb\">~s ~s</font><br/>",
[Nick, ?T("has been banned")]);
{kickban, "301", Reason} ->
io_lib:format("<font class=\"mb\">~s ~s: ~s</font><br/>",
[Nick, ?T("has been banned"), htmlize(Reason)]);
+ {kickban, "307", ""} ->
+ io_lib:format("<font class=\"mk\">~s ~s</font><br/>",
+ [Nick, ?T("has been kicked")]);
+ {kickban, "307", Reason} ->
+ io_lib:format("<font class=\"mk\">~s ~s: ~s</font><br/>",
+ [Nick, ?T("has been kicked"), htmlize(Reason)]);
+ {kickban, "321", ""} ->
+ io_lib:format("<font class=\"mk\">~s ~s</font><br/>",
+ [Nick, ?T("has been kicked because of an affiliation change")]);
+ {kickban, "322", ""} ->
+ io_lib:format("<font class=\"mk\">~s ~s</font><br/>",
+ [Nick, ?T("has been kicked because the room has been changed to members-only")]);
+ {kickban, "332", ""} ->
+ io_lib:format("<font class=\"mk\">~s ~s</font><br/>",
+ [Nick, ?T("has been kicked because of a system shutdown")]);
{nickchange, OldNick} ->
io_lib:format("<font class=\"mnc\">~s ~s ~s</font><br/>",
[htmlize(OldNick), ?T("is now known as"), Nick]);