vel/matrix-vona
1
0
Fork 0
Code Issues Pull Requests Actions Activity

Make sending Matrix requests easier

Browse Source
This commit is contained in:
Kierre
2025-10-17 17:44:41 -04:00
parent 6dd4fb04e3
commit 9ca4c913f3
5 changed files with 99 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
vona/utils/joinroom.py
View File

@@ -1,16 +1,18 @@
from resolvematrix import ServerResolver
import urllib.parse, time, json, httpx
import vona.globals as globals
import vona.config as config
import urllib.parse
import httpx
import json
import time
http_client = globals.http_client
http_client = globals.http_client()
def get_user_input(prompt):
try:
return urllib.parse.quote(input(prompt).replace("\\n", "\n", count=32))
answer = input(prompt)
while "\\n" in answer:
answer = answer.replace("\\n", "\n")
return urllib.parse.quote(answer)
except Exception as e:
print(f"Error reading input: {e}")
return None
@@ -21,27 +23,19 @@ room_id = get_user_input("Room ID:\n\t")
try:
unresolved_server_name = input("\nServer name before resolve:\n\t")
resolved_server_name = input("Server name after resolve:\n\t")
server_name = input("\nServer name to join via:\n\t")
except Exception as e:
print(f"Error reading server names: {e}")
exit(1)
resolver = ServerResolver(client=http_client)
try:
make_join_auth = globals.make_auth_header(
unresolved_server_name,
"GET",
f"/_matrix/federation/v1/make_join/{room_id}/%40{username}%3A{config.server_name}?ver=1&ver=2&ver=3&ver=4&ver=5&ver=6&ver=7&ver=8&ver=9&ver=10&ver=11&ver=12",
)
print("\nSending make_join request..")
make_join_response = http_client.get(
f"https://{resolved_server_name}/_matrix/federation/v1/make_join/{room_id}/%40{username}%3A{config.server_name}?ver=1&ver=2&ver=3&ver=4&ver=5&ver=6&ver=7&ver=8&ver=9&ver=10&ver=11&ver=12",
headers={
"Authorization": make_join_auth
},
path=f"/_matrix/federation/v1/make_join/{room_id}/%40{username}%3A{config.server_name}?ver=1&ver=2&ver=3&ver=4&ver=5&ver=6&ver=7&ver=8&ver=9&ver=10&ver=11&ver=12",
destination=server_name,
)
make_join_response.raise_for_status()
@@ -51,7 +45,7 @@ except httpx.HTTPStatusError as e:
print(f"HTTP error occurred: {e.response.status_code} - {e.response.text}")
exit(1)
except json.JSONDecodeError:
print("Failed to decode JSON response.")
print("Failed to decode response.")
exit(1)
except Exception as e:
print(f"An error occurred: {e}")
@@ -59,7 +53,7 @@ except Exception as e:
join_event = make_join.get("event", {})
if make_join.get("room_version") in ["1", "2"]:
if make_join.get("room_version", "1") in ["1", "2"]:
# NOTE: if we always make it opaque than Synapse will 500 lmao
join_event["event_id"] = globals.make_event_id()
@@ -72,19 +66,10 @@ except ValueError:
signed_join = globals.hash_and_sign_event(join_event)
try:
send_join_auth = globals.make_auth_header(
unresolved_server_name,
"PUT",
f"/_matrix/federation/v2/send_join/{room_id}/%24doesntmatter?omit_members=true",
signed_join,
)
send_join_response = http_client.put(
f"https://{resolved_server_name}/_matrix/federation/v2/send_join/{room_id}/%24doesntmatter?omit_members=true",
headers={
"Authorization": send_join_auth
},
path=f"/_matrix/federation/v2/send_join/{room_id}/%24doesntmatter?omit_members=true",
json=signed_join,
destination=server_name,
)
send_join_response.raise_for_status()