PrivateCoffee/matrix-roomba
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(bot): include room name in logging and messages

Browse source 
Updated room block and shutdown procedures to fetch and log room names, enhancing clarity in debug logs and notifications. This involved modifying URLs and introducing additional GET requests to retrieve room metadata.
This commit is contained in:
Kumi 2024-09-01 09:09:02 +02:00
parent 94bcd8bdd4
commit b2cc13b72d
Signed by: kumi
GPG key ID: ECBCC9082395383F
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/matrix_roomba/bot.py
View file

@ -111,7 +111,7 @@ class RoombaBot:
room_id (str): The room ID to block or unblock.
block (bool): Whether to block or unblock the room.
"""
url = f"{self.homeserver}/_synapse/admin/v1/rooms/{room_id}/block"
url = f"{self.homeserver}/_synapse/admin/v1/rooms/{room_id}"
headers = {
"Authorization": f"Bearer {self.access_token}",
"Content-Type": "application/json",
@ -119,11 +119,17 @@ class RoombaBot:
body = {"block": block}
async with aiohttp.ClientSession() as session:
async with session.put(url, headers=headers, json=body) as resp:
async with session.get(url, headers=headers) as resp:
if resp.status == 200:
room_name = (await resp.json()).get("name")
else:
room_name = None
async with session.put(f"{url}/block", headers=headers, json=body) as resp:
if resp.status == 200:
response = await resp.json()
self.logger.debug(
f"Room {room_id} {'blocked' if block else 'unblocked'} successfully: {response}"
f"Room {room_id}{f' ({room_name})' if room_name else ''} {'blocked' if block else 'unblocked'} successfully: {response}"
)
local_users = await self.get_local_users(room_id)
await self.send_message(
@ -176,6 +182,7 @@ class RoombaBot:
purge (bool, optional): Whether to purge the room. Defaults to True.
"""
url = f"{self.homeserver}/_synapse/admin/v2/rooms/{room_id}"
v1_url = f"{self.homeserver}/_synapse/admin/v1/rooms/{room_id}"
headers = {
"Authorization": f"Bearer {self.access_token}",
"Content-Type": "application/json",
@ -191,16 +198,22 @@ class RoombaBot:
local_users = await self.get_local_users(room_id)
async with aiohttp.ClientSession() as session:
async with session.get(v1_url, headers=headers) as resp:
if resp.status == 200:
room_name = (await resp.json()).get("name")
else:
room_name = None
async with session.delete(url, headers=headers, json=body) as resp:
if resp.status == 200:
response = await resp.json()
delete_id = response.get("delete_id")
self.logger.debug(
f"Room {room_id} shutdown initiated successfully: delete_id={delete_id}"
f"Room {room_id}{f' ({room_name})' if room_name else ''} shutdown initiated successfully: delete_id={delete_id}"
)
await self.send_message(
self.moderation_room_id,
f"Room {room_id} shutdown initiated successfully. Delete ID: {delete_id}. Local users: {', '.join(local_users)}",
f"Room {room_id}{f' ({room_name})' if room_name else ''} shutdown initiated successfully. Delete ID: {delete_id}. Local users: {', '.join(local_users)}",
)
else:
self.logger.error(