summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-03-10 13:43:40 +0000
committerDavid Robertson <davidr@element.io>2023-03-10 13:43:40 +0000
commitc246e64701b478c0a3f6cadcd49ade27327f7763 (patch)
tree58582b203fb616c6690342dc04c4a05e52459c6e
parentChangelog (diff)
downloadsynapse-c246e64701b478c0a3f6cadcd49ade27327f7763.tar.xz
Rename param
-rw-r--r--synapse/federation/sender/per_destination_queue.py2
-rw-r--r--synapse/handlers/federation.py8
-rw-r--r--synapse/visibility.py8
-rw-r--r--tests/test_visibility.py10
4 files changed, 14 insertions, 14 deletions
diff --git a/synapse/federation/sender/per_destination_queue.py b/synapse/federation/sender/per_destination_queue.py
index 29345c05b1..478187ce44 100644
--- a/synapse/federation/sender/per_destination_queue.py
+++ b/synapse/federation/sender/per_destination_queue.py
@@ -548,7 +548,7 @@ class PerDestinationQueue:
                         new_pdus,
                         redact=False,
                         filter_out_erased_senders=True,
-                        filter_out_partial_state_rooms=True,
+                        filter_out_remote_partial_state_events=True,
                     )
 
                     # If we've filtered out all the extremities, fall back to
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 26883b8ca4..80156ef343 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -401,7 +401,7 @@ class FederationHandler:
                 events_to_check,
                 redact=False,
                 filter_out_erased_senders=False,
-                filter_out_partial_state_rooms=False,
+                filter_out_remote_partial_state_events=False,
             )
             if filtered_extremities:
                 extremities_to_request.append(bp.event_id)
@@ -1338,7 +1338,7 @@ class FederationHandler:
             events,
             redact=True,
             filter_out_erased_senders=True,
-            filter_out_partial_state_rooms=True,
+            filter_out_remote_partial_state_events=True,
         )
 
         return events
@@ -1375,7 +1375,7 @@ class FederationHandler:
             [event],
             redact=True,
             filter_out_erased_senders=True,
-            filter_out_partial_state_rooms=True,
+            filter_out_remote_partial_state_events=True,
         )
         event = events[0]
         return event
@@ -1409,7 +1409,7 @@ class FederationHandler:
             missing_events,
             redact=True,
             filter_out_erased_senders=True,
-            filter_out_partial_state_rooms=True,
+            filter_out_remote_partial_state_events=True,
         )
 
         return missing_events
diff --git a/synapse/visibility.py b/synapse/visibility.py
index d943ead6c5..468e22f8f6 100644
--- a/synapse/visibility.py
+++ b/synapse/visibility.py
@@ -579,7 +579,7 @@ async def filter_events_for_server(
     *,
     redact: bool,
     filter_out_erased_senders: bool,
-    filter_out_partial_state_rooms: bool,
+    filter_out_remote_partial_state_events: bool,
 ) -> List[EventBase]:
     """Filter a list of events based on whether the target server is allowed to
     see them.
@@ -605,8 +605,8 @@ async def filter_events_for_server(
         filter_out_erased_senders: If true, also filter out events whose sender has been
             erased. This is used e.g. during pagination to decide whether to
             backfill or not.
-        filter_out_partial_state_rooms: If True, also filter out events in partial state
-            rooms.
+        filter_out_remote_partial_state_events: If True, also filter out events in
+            partial state rooms created by other homeservers.
     Returns
         The filtered events.
     """
@@ -656,7 +656,7 @@ async def filter_events_for_server(
     # this check but would base the filtering on an outdated view of the membership events.
 
     partial_state_invisible_event_ids: Set[str] = set()
-    if filter_out_partial_state_rooms:
+    if filter_out_remote_partial_state_events:
         for e in events:
             sender_domain = get_domain_from_id(e.sender)
             if (
diff --git a/tests/test_visibility.py b/tests/test_visibility.py
index f758232d08..9ed330f554 100644
--- a/tests/test_visibility.py
+++ b/tests/test_visibility.py
@@ -69,7 +69,7 @@ class FilterEventsForServerTestCase(unittest.HomeserverTestCase):
                 events_to_filter,
                 redact=True,
                 filter_out_erased_senders=True,
-                filter_out_partial_state_rooms=True,
+                filter_out_remote_partial_state_events=True,
             )
         )
 
@@ -97,7 +97,7 @@ class FilterEventsForServerTestCase(unittest.HomeserverTestCase):
                     [outlier],
                     redact=True,
                     filter_out_erased_senders=True,
-                    filter_out_partial_state_rooms=True,
+                    filter_out_remote_partial_state_events=True,
                 )
             ),
             [outlier],
@@ -114,7 +114,7 @@ class FilterEventsForServerTestCase(unittest.HomeserverTestCase):
                 [outlier, evt],
                 redact=True,
                 filter_out_erased_senders=True,
-                filter_out_partial_state_rooms=True,
+                filter_out_remote_partial_state_events=True,
             )
         )
         self.assertEqual(len(filtered), 2, f"expected 2 results, got: {filtered}")
@@ -132,7 +132,7 @@ class FilterEventsForServerTestCase(unittest.HomeserverTestCase):
                 [outlier, evt],
                 redact=True,
                 filter_out_erased_senders=True,
-                filter_out_partial_state_rooms=True,
+                filter_out_remote_partial_state_events=True,
             )
         )
         self.assertEqual(filtered[0], outlier)
@@ -173,7 +173,7 @@ class FilterEventsForServerTestCase(unittest.HomeserverTestCase):
                 events_to_filter,
                 redact=True,
                 filter_out_erased_senders=True,
-                filter_out_partial_state_rooms=True,
+                filter_out_remote_partial_state_events=True,
             )
         )