aboutsummaryrefslogtreecommitdiff
path: root/src/mod_mam.erl
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-01-26 15:02:06 +0300
committerEvgeniy Khramtsov <ekhramtsov@process-one.net>2018-01-26 15:02:06 +0300
commit4b012a99d2bdd6d22f05676e9a7989409e314fca (patch)
treeb2ab9099df553d850dac7be313ec2b07bf7c846a /src/mod_mam.erl
parentFix more tests (diff)
Introduce option 'captcha' for mod_block_strangers
When the option is set to `true`, the module will generate CAPTCHA challenges for incoming subscription requests. The option also implies that option `drop` is set to `true`. Note that the module won't generate CAPTCHA challenges for messages: they will still be rejected if `drop` is set to `true`. Fixes #2246
Diffstat (limited to 'src/mod_mam.erl')
-rw-r--r--src/mod_mam.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index b6f80be67..8e8f57171 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -672,10 +672,10 @@ should_archive_peer(LUser, LServer,
always -> true;
never -> false;
roster ->
- {Sub, _} = ejabberd_hooks:run_fold(
- roster_get_jid_info,
- LServer, {none, []},
- [LUser, LServer, Peer]),
+ {Sub, _, _} = ejabberd_hooks:run_fold(
+ roster_get_jid_info,
+ LServer, {none, none, []},
+ [LUser, LServer, Peer]),
Sub == both orelse Sub == from orelse Sub == to
end
end