Make privacy list message blocking incoming only #1084
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gadgetci
reviewed
Nov 21, 2016
| @@ -513,8 +513,8 @@ allow_subscription_both_message(Config) -> | |||
| escalus_client:send(Alice, escalus_stanza:chat_to(bob, <<"Hi, Bob XYZ!">>)), | |||
There was a problem hiding this comment.
According to Elvis:
Line 513 is too long: escalus_client:send(Alice, escalus_stanza:chat_to(bob, <<"Hi, Bob XYZ!">>)),.
gadgetci
reviewed
Nov 21, 2016
| @@ -394,12 +394,12 @@ block_jid_message(Config) -> | |||
| timer:sleep(?SLEEP_TIME), | |||
| escalus_assert:has_no_stanzas(Alice), | |||
|
|
|||
| %% now Alice try to send a msg to Bob, whom she had blocked, and gets error | |||
| %% Blocking only applies to incoming messages, so Alice can still send | |||
| %% Bob a message | |||
| %% and Bob gets nothing | |||
| escalus_client:send(Alice, escalus_stanza:chat_to(Bob, <<"Hi, Bobbb!">>)), | |||
There was a problem hiding this comment.
According to Elvis:
Line 400 is too long: escalus_client:send(Alice, escalus_stanza:chat_to(Bob, <<"Hi, Bobbb!">>)),.
bernardd
force-pushed
the
privacy-message-incoming-only
branch
from
a9c2c98 to
ad4ce15
Compare
gadgetci
reviewed
Nov 21, 2016
| client_gets_blocking_error(C) -> | ||
| Stanza = escalus_client:wait_for_stanza(C), | ||
| escalus:assert(fun is_xep191_not_available/1, [], Stanza). | ||
|
|
||
| client_gets_block_iq(C) -> | ||
| escalus:assert(fun is_xep191_push/2, [<<"block">>], escalus:wait_for_stanza(C)). |
There was a problem hiding this comment.
According to Elvis:
Line 606 is too long: escalus:assert(fun is_xep191_push/2, [<<"block">>], escalus:wait_for_stanza(C))..
XEP-0016 2.9 describes the <message> blocking system only in terms of incoming messages, however the existing implementation also blocks matching outgoing messages. This change alters the behaviour so that only incoming messages that match `message` privacy list entries are blocked.
bernardd
force-pushed
the
privacy-message-incoming-only
branch
from
25cd17f to
7330993
Compare
|
Thanks a lot @bernardd for your contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
XEP-0016 s2.9 describes the
<message>blocking system only in terms ofincoming messages, however the existing implementation also blocks
matching outgoing messages. This change alters the behaviour so that
only incoming messages that match
messageprivacy list entries areblocked.
The reasoning for this is twofold: