summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-02-22 15:27:44 +0000
committerRichard van der Hoff <github@rvanderhoff.org.uk>2016-02-22 15:27:44 +0000
commit5be3944730ccf809b72a4412d599b5f622246589 (patch)
tree1ebce61b35fd50ea0195f3ae24ef5710f163e5ab
parentInterpret unknown visibilities the same as shared (diff)
downloadsynapse-5be3944730ccf809b72a4412d599b5f622246589.tar.xz
address review comments
drop commented-out special casing for historyvisibility event
s/he/they/ for users
Diffstat (limited to '')
-rw-r--r--synapse/handlers/_base.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index ef6716002c..5613bd2059 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -106,23 +106,18 @@ class BaseHandler(object):
             if membership == Membership.JOIN:
                 return True
 
-            if event.type == EventTypes.RoomHistoryVisibility:
-                # XXX why are m.room.history_visibility events special?
-                # return True
-                pass
-
             if visibility == "joined":
                 # we weren't a member at the time of the event, so we can't
                 # see this event.
                 return False
 
             elif visibility == "invited":
-                # user can also see the event if he was *invited* at the time
+                # user can also see the event if they were *invited* at the time
                 # of the event.
                 return membership == Membership.INVITE
 
             else:
-                # visibility is shared: user can also see the event if he has
+                # visibility is shared: user can also see the event if they have
                 # become a member since the event
                 #
                 # XXX: if the user has subsequently joined and then left again,