From 95e58752dca1e72f4f22fb6a7f220f149c558d4c Mon Sep 17 00:00:00 2001 From: green <41323182+greeeen-dev@users.noreply.github.com> Date: Wed, 19 Feb 2025 11:21:13 +0100 Subject: [PATCH] v3.9.0 compatibility --- bridge_revolt.py | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/bridge_revolt.py b/bridge_revolt.py index 470131d..9a586b0 100644 --- a/bridge_revolt.py +++ b/bridge_revolt.py @@ -462,29 +462,44 @@ async def on_message(self, message): self.bot.bridge.msg_stats.update({roomname: 1}) if self.compatibility_mode: tasks.append(self.bot.loop.create_task( - self.bot.bridge.send(room=roomname, message=message, platform='revolt', - extbridge=False) + self.bot.bridge.send( + room=roomname, message=message, platform='revolt', extbridge=False + ) )) else: - tasks.append(self.bot.loop.create_task( - self.bot.bridge.send(room=roomname, message=message, source='revolt', platform='revolt', - extbridge=False) - )) + try: + tasks.append(self.bot.loop.create_task( + self.bot.bridge.send( + room=roomname, message=message, source='revolt', platform='revolt', extbridge=False, + is_first=True + ) + )) + except: + tasks.append(self.bot.loop.create_task( + self.bot.bridge.send( + room=roomname, message=message, source='revolt', platform='revolt', extbridge=False + ) + )) else: if self.compatibility_mode: - parent_id = await self.bot.bridge.send(room=roomname, message=message, - platform='revolt', - extbridge=False) + parent_id = await self.bot.bridge.send( + room=roomname, message=message, platform='revolt', extbridge=False + ) else: - parent_id = await self.bot.bridge.send(room=roomname, message=message, source='revolt', - platform='revolt', - extbridge=False) + try: + parent_id = await self.bot.bridge.send( + room=roomname, message=message, source='revolt', platform='revolt', extbridge=False, + is_first=True + ) + except: + parent_id = await self.bot.bridge.send( + room=roomname, message=message, source='revolt', platform='revolt', extbridge=False + ) if should_resend and parent_id == message.id: if self.compatibility_mode: tasks.append(self.bot.loop.create_task(self.bot.bridge.send( - room=roomname, message=message, platform='discord', extbridge=False, - id_override=parent_id + room=roomname, message=message, platform='discord', extbridge=False, id_override=parent_id ))) else: tasks.append(self.bot.loop.create_task(self.bot.bridge.send( @@ -581,7 +596,7 @@ async def on_message_update(self, before, message): msgdata = await self.bot.bridge.fetch_message(message.id) - await self.bot.bridge.edit(msgdata.id,message.content) + await self.bot.bridge.edit(msgdata.id, message.content, source='revolt') async def on_message_delete(self, message): roomname = None