From d44e2e3c8fb959a89f49888bab9885daeb0b1e8c Mon Sep 17 00:00:00 2001
From: Jason Robinson <mail@jasonrobinson.me>
Date: Sun, 2 May 2021 22:27:40 +0300
Subject: [PATCH] Make user own the Matrix profile room

Avoids needing to join it.
---
 federation/entities/matrix/entities.py | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/federation/entities/matrix/entities.py b/federation/entities/matrix/entities.py
index 94729d9..17df35c 100644
--- a/federation/entities/matrix/entities.py
+++ b/federation/entities/matrix/entities.py
@@ -104,7 +104,6 @@ class MatrixRoomMessage(Post, MatrixEntityMixin):
         response.raise_for_status()
         self._thread_room_id = response.json()["room_id"]
         # Send the thread message
-        # TODO move this to a payload
         response = requests.put(
             url=f"{super().get_endpoint()}/rooms/{self._thread_room_id}/send/{self.event_type}/"
                 f"{str(uuid4())}?user_id={self.mxid}",
@@ -132,12 +131,6 @@ class MatrixRoomMessage(Post, MatrixEntityMixin):
 
     def payloads(self) -> List[Dict]:
         payloads = super().payloads()
-        # Ensure we're joined to the profile room
-        # TODO remove this after a bit, once the auto-join on creation works
-        payloads.append({
-            "endpoint": f"{super().get_endpoint()}/rooms/{self._profile_room_id}/join?user_id={self.mxid}",
-            "payload": {},
-        })
         payloads.append({
             "endpoint": f"{super().get_endpoint()}/rooms/{self._profile_room_id}/send/{self.event_type}/"
                         f"{self.txn_id}?user_id={self.mxid}",
@@ -153,11 +146,6 @@ class MatrixRoomMessage(Post, MatrixEntityMixin):
             },
             "method": "put",
         })
-        # Join the thread room
-        payloads.append({
-            "endpoint": f"{super().get_endpoint()}/rooms/{self._thread_room_id}/join?user_id={self.mxid}",
-            "payload": {},
-        })
         # Tag the thread room as low priority
         payloads.append({
             "endpoint": f"{super().get_endpoint()}/user/{self.mxid}/rooms/{self._thread_room_id}/tags/m.lowpriority"
@@ -238,11 +226,8 @@ class MatrixProfile(Profile, MatrixEntityMixin):
     def create_profile_room(self):
         headers = appservice_auth_header()
         response = requests.post(
-            url=f"{super().get_endpoint()}/createRoom",
+            url=f"{super().get_endpoint()}/createRoom?user_id={self.mxid}",
             json={
-                "invite": [
-                    self.mxid,
-                ],
                 "name": self.name,
                 "preset": "public_chat" if self.public else "private_chat",
                 "room_alias_name": f"@{self.localpart}",
@@ -275,11 +260,6 @@ class MatrixProfile(Profile, MatrixEntityMixin):
             self.register_user()
         if self._remote_room_create_needed:
             self.create_profile_room()
-        # Ensure we're joined to the profile room
-        payloads.append({
-            "endpoint": f"{super().get_endpoint()}/rooms/{self._profile_room_id}/join?user_id={self.mxid}",
-            "payload": {},
-        })
         payloads.append({
             "endpoint": f"{super().get_endpoint()}/profile/{self.mxid}/displayname?user_id={self.mxid}",
             "payload": {