Fix auto-accepting private chat portals with double puppeting

2020-07-29 22:21:26 +03:00
parent 7298d9dfdc
commit ffcfd019c2
1 changed files with 8 additions and 0 deletions
@@ -219,6 +219,14 @@ class PortalMetadata(BasePortal, ABC):
                if changed:
                    self.save()
                    await self.update_bridge_info()
+
+            puppet = p.Puppet.get_by_custom_mxid(user.mxid)
+            if puppet:
+                try:
+                    await puppet.intent.ensure_joined(self.mxid)
+                except Exception:
+                    self.log.exception("Failed to ensure %s is joined to portal", user.mxid)
+
        if self.sync_matrix_state:
            await self.main_intent.get_joined_members(self.mxid)