Permalink
Browse files

Merge pull request #7 from matwey/master

Revert "Switch plugin_cerberus to Scold mode"
  • Loading branch information...
ermine committed Jan 8, 2017
2 parents cdf8fbe + d11c8eb commit 3ee4bd609b01e2093a6d37bf74579728d0a93b70
Showing with 1 addition and 4 deletions.
  1. +1 −4 src/plugin_cerberus.ml
View
@@ -304,9 +304,6 @@ let check ctx muc_context xmpp env jid_from place text =
report ctx room_env xmpp env jid_from place word text;
if jid_from.lresource <> "" then
match ctx.action with
- | Scold -> env.env_message xmpp (Some Groupchat) jid_from
- (Lang.get_msg env.env_lang "plugin_cerberus_cannot_kick_admin" []);
- false
| Kick
| Ban ->
if can_kill room_env jid_from then
@@ -392,7 +389,7 @@ let plugin opts =
| "kick" -> Kick
| "ban" -> Ban
| "scold" -> Scold
- | _ -> Scold
+ | _ -> Kick
in
Muc.add_for_muc_context
(fun muc_context xmpp ->

0 comments on commit 3ee4bd6

Please sign in to comment.