Pass inherit_depth all the way down the line which we define only when prev_event query param is used

Author: MadLittleMods

synapse/events/builder.py

@@ -100,8 +100,8 @@ def is_state(self):
     async def build(
         self,
         prev_event_ids: List[str],
-        overriding_prev_events: Literal[False] = False,
         auth_event_ids: Optional[List[str]],
+        inherit_depth: bool = False,
     ) -> EventBase:
         """Transform into a fully signed and hashed event
 
@@ -135,7 +135,7 @@ async def build(
 
         old_depth = await self._store.get_max_depth_of(prev_event_ids)
         # If backfilling old message, let's just use the same depth of what we're inserting next to
-        if overriding_prev_events:
+        if inherit_depth:
             depth = old_depth
         # Otherwise, progress the depth as normal
         else:

synapse/handlers/message.py

@@ -438,6 +438,7 @@ async def create_event(
         event_dict: dict,
         txn_id: Optional[str] = None,
         prev_event_ids: Optional[List[str]] = None,
+        inherit_depth: bool = False,
         auth_event_ids: Optional[List[str]] = None,
         require_consent: bool = True,
     ) -> Tuple[EventBase, EventContext]:
@@ -525,6 +526,7 @@ async def create_event(
             builder=builder,
             requester=requester,
             prev_event_ids=prev_event_ids,
+            inherit_depth=inherit_depth,
             auth_event_ids=auth_event_ids,
         )
 
@@ -682,6 +684,7 @@ async def create_and_send_nonmember_event(
         self,
         requester: Requester,
         event_dict: dict,
+        inherit_depth: bool = False,
         ratelimit: bool = True,
         txn_id: Optional[str] = None,
         ignore_shadow_ban: bool = False,
@@ -741,7 +744,7 @@ async def create_and_send_nonmember_event(
                 prev_events = event_dict["prev_events"]
 
             event, context = await self.create_event(
-                requester, event_dict, txn_id=txn_id, prev_event_ids=prev_events
+                requester, event_dict, txn_id=txn_id, prev_event_ids=prev_events, inherit_depth=inherit_depth
             )
 
             assert self.hs.is_mine_id(event.sender), "User must be our own: %s" % (
@@ -772,6 +775,7 @@ async def create_new_client_event(
         builder: EventBuilder,
         requester: Optional[Requester] = None,
         prev_event_ids: Optional[List[str]] = None,
+        inherit_depth: bool = False,
         auth_event_ids: Optional[List[str]] = None,
     ) -> Tuple[EventBase, EventContext]:
         """Create a new event for a local client
@@ -794,10 +798,7 @@ async def create_new_client_event(
             Tuple of created event, context
         """
 
-        overriding_prev_events = False
         if prev_event_ids is not None:
-            overriding_prev_events = True
-
             assert len(prev_event_ids) <= 10, (
                 "Attempting to create an event with %i prev_events"
                 % (len(prev_event_ids),)
@@ -816,7 +817,7 @@ async def create_new_client_event(
 
         event = await builder.build(
             prev_event_ids=prev_event_ids,
-            overriding_prev_events=overriding_prev_events,
+            inherit_depth=inherit_depth,
             auth_event_ids=auth_event_ids,
         )
         context = await self.state.compute_event_context(event)

synapse/rest/client/v1/room.py

@@ -233,8 +233,11 @@ async def on_POST(self, request, room_id, event_type, txn_id=None):
             "sender": requester.user.to_string(),
         }
 
+        inherit_depth = False
         if prev_events:
             event_dict["prev_events"] = prev_events
+            # If backfilling old messages, let's just use the same depth of what we're inserting next to
+            inherit_depth = True
 
         # TODO: Put app_service logic back in place once we figure out how to make the Complement tests
         # run as an app service
@@ -246,7 +249,7 @@ async def on_POST(self, request, room_id, event_type, txn_id=None):
                 event,
                 _,
             ) = await self.event_creation_handler.create_and_send_nonmember_event(
-                requester, event_dict, txn_id=txn_id
+                requester, event_dict, txn_id=txn_id, inherit_depth=inherit_depth
             )
             event_id = event.event_id
         except ShadowBanError: