diff options
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/captcha.py | 14 | ||||
| -rw-r--r-- | synapse/storage/stream.py | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py index a97a5bab1e..8ebcfc3623 100644 --- a/synapse/config/captcha.py +++ b/synapse/config/captcha.py @@ -14,13 +14,16 @@ from ._base import Config + class CaptchaConfig(Config): def __init__(self, args): super(CaptchaConfig, self).__init__(args) self.recaptcha_private_key = args.recaptcha_private_key self.enable_registration_captcha = args.enable_registration_captcha - self.captcha_ip_origin_is_x_forwarded = args.captcha_ip_origin_is_x_forwarded + self.captcha_ip_origin_is_x_forwarded = ( + args.captcha_ip_origin_is_x_forwarded + ) @classmethod def add_arguments(cls, parser): @@ -32,11 +35,12 @@ class CaptchaConfig(Config): ) group.add_argument( "--enable-registration-captcha", type=bool, default=False, - help="Enables ReCaptcha checks when registering, preventing signup "+ - "unless a captcha is answered. Requires a valid ReCaptcha public/private key." + help="Enables ReCaptcha checks when registering, preventing signup" + + " unless a captcha is answered. Requires a valid ReCaptcha " + + "public/private key." ) group.add_argument( "--captcha_ip_origin_is_x_forwarded", type=bool, default=False, - help="When checking captchas, use the X-Forwarded-For (XFF) header as the client IP "+ - "and not the actual client IP." + help="When checking captchas, use the X-Forwarded-For (XFF) header" + + " as the client IP and not the actual client IP." ) \ No newline at end of file diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 8c766b8a00..a76fecf24f 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -146,7 +146,7 @@ class StreamStore(SQLBaseStore): current_room_membership_sql = ( "SELECT m.room_id FROM room_memberships as m " "INNER JOIN current_state_events as c ON m.event_id = c.event_id " - "WHERE m.user_id = ?" + "WHERE m.user_id = ? AND m.membership = 'join'" ) # We also want to get any membership events about that user, e.g. |