From 528a596d68ec0c6d8ba71a3b2a4c9947d02f9260 Mon Sep 17 00:00:00 2001 From: gammafn Date: Thu, 6 May 2021 16:08:49 -0500 Subject: [PATCH] Split find_and_create_room out of send_msg --- bot.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/bot.py b/bot.py index 9a0e772..bde25ec 100755 --- a/bot.py +++ b/bot.py @@ -236,7 +236,16 @@ class Bot: :return bool: Success upon sending the message """ # Sends private message to user. Returns true on success. + msg_room = await self.find_or_create_private_msg(mxid, roomname) + if not msg_room or (type(msg_room) is RoomCreateError): + self.logger.error(f'Unable to create room when trying to message {mxid}') + return False + # Send message to the room + await self.send_text(msg_room, message) + return True + + async def find_or_create_private_msg(self, mxid, roomname): # Find if we already have a common room with user: msg_room = None for croomid in self.client.rooms: @@ -253,15 +262,9 @@ class Bot: is_direct=True, preset=RoomPreset.private_chat, invite={mxid}, - ) + ) + return msg_room - if not msg_room or (type(msg_room) is RoomCreateError): - self.logger.error(f'Unable to create room when trying to message {mxid}') - return False - - # Send message to the room - await self.send_text(msg_room, message) - return True def remove_callback(self, callback): for cb_object in self.client.event_callbacks: