mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-24 10:35:46 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rename key and values for m.room.history_visibility. Support 'invited' value

Browse source
This commit is contained in:
Erik Johnston 2015-07-06 13:05:52 +01:00
parent c3e2600c67
commit fb47c3cfbe
4 changed files with 61 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/events/utils.py
View file

@ -75,7 +75,7 @@ def prune_event(event):
elif event_type == EventTypes.Aliases:
add_fields("aliases")
elif event_type == EventTypes.RoomHistoryVisibility:
add_fields("visibility")
add_fields("history_visibility")
allowed_fields = {
k: v

10
synapse/handlers/federation.py
View file

@ -239,7 +239,9 @@ class FederationHandler(BaseHandler):
return event
history = state.get((EventTypes.RoomHistoryVisibility, ''), None)
if history and history.content.get("visibility", None) == "after_join":
if history:
visibility = history.content.get("history_visibility", "shared")
if visibility in ["invited", "joined"]:
for ev in state.values():
if ev.type != EventTypes.Member:
continue
@ -251,7 +253,11 @@ class FederationHandler(BaseHandler):
if domain != server_name:
continue
if ev.membership == Membership.JOIN:
memtype = ev.membership
if memtype == Membership.JOIN:
return event
elif memtype == Membership.INVITE:
if visibility == "invited":
return event
else:
return prune_event(event)

24
synapse/handlers/message.py
View file

@ -149,13 +149,29 @@ class MessageHandler(BaseHandler):
if event.type == EventTypes.RoomHistoryVisibility:
return True
membership = state.get((EventTypes.Member, user_id), None)
if membership and membership.membership == Membership.JOIN:
membership_ev = state.get((EventTypes.Member, user_id), None)
if membership_ev:
membership = membership_ev.membership
else:
membership = Membership.LEAVE
if membership == Membership.JOIN:
return True
history = state.get((EventTypes.RoomHistoryVisibility, ''), None)
if history and history.content.get("visibility", None) == "after_join":
return False
if history:
visibility = history.content.get("history_visibility", "shared")
else:
visibility = "shared"
if visibility == "public":
return True
elif visibility == "shared":
return True
elif visibility == "joined":
return membership == Membership.JOIN
elif visibility == "invited":
return membership == Membership.INVITE
return True

25
synapse/handlers/sync.py
View file

@ -306,16 +306,31 @@ class SyncHandler(BaseHandler):
if event.type == EventTypes.RoomHistoryVisibility:
return True
membership = state.get((EventTypes.Member, user_id), None)
if membership and membership.membership == Membership.JOIN:
membership_ev = state.get((EventTypes.Member, user_id), None)
if membership_ev:
membership = membership_ev.membership
else:
membership = Membership.LEAVE
if membership == Membership.JOIN:
return True
history = state.get((EventTypes.RoomHistoryVisibility, ''), None)
if history and history.content.get("visibility", None) == "after_join":
return False
if history:
visibility = history.content.get("history_visibility", "shared")
else:
visibility = "shared"
if visibility == "public":
return True
elif visibility == "shared":
return True
elif visibility == "joined":
return membership == Membership.JOIN
elif visibility == "invited":
return membership == Membership.INVITE
return True
events_and_states = filter(allowed, events_and_states)
defer.returnValue([
ev