mirror
/
federation
kopia lustrzana https://gitlab.com/jaywink/federation
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Make user own the Matrix profile room 

Avoids needing to join it.
merge-requests/165/head
Jason Robinson 2021-05-02 22:27:40 +03:00
rodzic 1d782f5f5a
commit d44e2e3c8f
1 zmienionych plików z 1 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
federation/entities/matrix/entities.py
Wyświetl plik

@ -104,7 +104,6 @@ class MatrixRoomMessage(Post, MatrixEntityMixin):
response.raise_for_status() response.raise_for_status()
self._thread_room_id = response.json()["room_id"] self._thread_room_id = response.json()["room_id"]
# Send the thread message # Send the thread message
# TODO move this to a payload
response = requests.put( response = requests.put(
url=f"{super().get_endpoint()}/rooms/{self._thread_room_id}/send/{self.event_type}/" url=f"{super().get_endpoint()}/rooms/{self._thread_room_id}/send/{self.event_type}/"
f"{str(uuid4())}?user_id={self.mxid}", f"{str(uuid4())}?user_id={self.mxid}",
@ -132,12 +131,6 @@ class MatrixRoomMessage(Post, MatrixEntityMixin):
def payloads(self) -> List[Dict]: def payloads(self) -> List[Dict]:
payloads = super().payloads() 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({ payloads.append({
"endpoint": f"{super().get_endpoint()}/rooms/{self._profile_room_id}/send/{self.event_type}/" "endpoint": f"{super().get_endpoint()}/rooms/{self._profile_room_id}/send/{self.event_type}/"
f"{self.txn_id}?user_id={self.mxid}", f"{self.txn_id}?user_id={self.mxid}",
@ -153,11 +146,6 @@ class MatrixRoomMessage(Post, MatrixEntityMixin):
}, },
"method": "put", "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 # Tag the thread room as low priority
payloads.append({ payloads.append({
"endpoint": f"{super().get_endpoint()}/user/{self.mxid}/rooms/{self._thread_room_id}/tags/m.lowpriority" "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): def create_profile_room(self):
headers = appservice_auth_header() headers = appservice_auth_header()
response = requests.post( response = requests.post(
url=f"{super().get_endpoint()}/createRoom", url=f"{super().get_endpoint()}/createRoom?user_id={self.mxid}",
json={ json={
"invite": [
self.mxid,
],
"name": self.name, "name": self.name,
"preset": "public_chat" if self.public else "private_chat", "preset": "public_chat" if self.public else "private_chat",
"room_alias_name": f"@{self.localpart}", "room_alias_name": f"@{self.localpart}",
@ -275,11 +260,6 @@ class MatrixProfile(Profile, MatrixEntityMixin):
self.register_user() self.register_user()
if self._remote_room_create_needed: if self._remote_room_create_needed:
self.create_profile_room() 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({ payloads.append({
"endpoint": f"{super().get_endpoint()}/profile/{self.mxid}/displayname?user_id={self.mxid}", "endpoint": f"{super().get_endpoint()}/profile/{self.mxid}/displayname?user_id={self.mxid}",
"payload": { "payload": {