From d3268bb106468a82fffe9a47241193e4af7f4880 Mon Sep 17 00:00:00 2001 From: William Kray Date: Mon, 12 Jun 2023 12:12:41 -0700 Subject: [PATCH] reference rooms by name for easier recognition --- kickbot/bot.py | 14 ++++++++++++-- maubot.yaml | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kickbot/bot.py b/kickbot/bot.py index e62b390..6e0ec9a 100644 --- a/kickbot/bot.py +++ b/kickbot/bot.py @@ -197,17 +197,27 @@ class KickBot(Plugin): for user in purgeable: purge_list[user] = [] for room in roomlist: + roomnamestate = await self.client.get_state_event(room, 'm.room.name') + roomname = roomnamestate['name'] + try: await self.client.get_state_event(room, EventType.ROOM_MEMBER, user) await self.client.kick_user(room, user, reason='inactivity') - purge_list[user].append(room) + if roomname: + purge_list[user].append(roomname) + else: + purge_list[user].append(room) time.sleep(0.5) except MNotFound: pass except Exception as e: self.log.warning(e) error_list[user] = [] - error_list[user].append(room) + if roomname: + error_list[user].append(roomname) + else: + error_list[user].append(room) + results = "the following users were purged:

{purge_list}

the following errors were \ recorded:

{error_list}

".format(purge_list=purge_list, error_list=error_list) diff --git a/maubot.yaml b/maubot.yaml index 585d5e8..0d226d7 100644 --- a/maubot.yaml +++ b/maubot.yaml @@ -1,6 +1,6 @@ maubot: 0.1.0 id: org.jobmachine.kickbot -version: 0.0.8 +version: 0.0.9 modules: - kickbot main_class: KickBot