Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use term 'out of band membership' instead

Browse Source
This commit is contained in:
Erik Johnston 2019-01-24 17:33:19 +00:00
parent 7c288c2250
commit b8082a5445
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/events/__init__.py
View File

@ -41,12 +41,13 @@ class _EventInternalMetadata(object):
def is_outlier(self): def is_outlier(self):
return getattr(self, "outlier", False) return getattr(self, "outlier", False)
def is_new_remote_event(self): def is_out_of_band_membership(self):
"""Whether this is a new remote event, like an invite or an invite """Whether this is an out of band membership, like an invite or an invite
rejection. This is needed as those events are marked as outliers, but rejection. This is needed as those events are marked as outliers, but
they still need to be processed. they still need to be processed as if they're new events (e.g. updating
invite state in the database, relaying to clients, etc).
""" """
return getattr(self, "new_remote_event", False) return getattr(self, "out_of_band_membership", False)
def get_send_on_behalf_of(self): def get_send_on_behalf_of(self):
"""Whether this server should send the event on behalf of another server. """Whether this server should send the event on behalf of another server.

4
synapse/handlers/federation.py
View File

@ -1284,7 +1284,7 @@ class FederationHandler(BaseHandler):
) )
event.internal_metadata.outlier = True event.internal_metadata.outlier = True
event.internal_metadata.new_remote_event = True event.internal_metadata.out_of_band_membership = True
event.signatures.update( event.signatures.update(
compute_event_signature( compute_event_signature(
@ -1310,7 +1310,7 @@ class FederationHandler(BaseHandler):
# Mark as outlier as we don't have any state for this event; we're not # Mark as outlier as we don't have any state for this event; we're not
# even in the room. # even in the room.
event.internal_metadata.outlier = True event.internal_metadata.outlier = True
event.internal_metadata.new_remote_event = True event.internal_metadata.out_of_band_membership = True
# Try the host that we succesfully called /make_leave/ on first for # Try the host that we succesfully called /make_leave/ on first for
# the /send_leave/ request. # the /send_leave/ request.

6
synapse/storage/roommember.py
View File

@ -589,11 +589,11 @@ class RoomMemberStore(RoomMemberWorkerStore):
# We update the local_invites table only if the event is "current", # We update the local_invites table only if the event is "current",
# i.e., its something that has just happened. If the event is an # i.e., its something that has just happened. If the event is an
# outlier it is only current if its a "new remote event", like a # outlier it is only current if its an "out of band membership",
# remote invite or a rejection of a remote invite. # like a remote invite or a rejection of a remote invite.
is_new_state = not backfilled and ( is_new_state = not backfilled and (
not event.internal_metadata.is_outlier() not event.internal_metadata.is_outlier()
or event.internal_metadata.is_new_remote_event() or event.internal_metadata.is_out_of_band_membership()
) )
is_mine = self.hs.is_mine_id(event.state_key) is_mine = self.hs.is_mine_id(event.state_key)
if is_new_state and is_mine: if is_new_state and is_mine: