Fix compatibility mode for outbound messages

Author: greeeen-dev

shinobu/beacon/discord/driver.py

@@ -531,10 +531,6 @@ def sanitize_outbound(self, content: str) -> str:
 
         return content
 
-    def sanitize_inbound(self, content: str) -> str:
-        # Nothing to sanitize
-        return content
-
     # Beacon driver functions
     def get_user(self, user_id: str):
         user = self.bot.get_user(int(user_id))

shinobu/beacon/models/driver.py

@@ -145,11 +145,19 @@ async def _purge(self, messages: list[beacon_message.BeaconMessage]):
 
     def sanitize_inbound(self, content: str) -> str:
         """Sanitizes content to be friendly with the driver's platform."""
-        raise BeaconDriverUnsupported()
+        return content
 
     def sanitize_outbound(self, content: str) -> str:
         """Sanitizes content to be friendly with other platforms."""
-        raise BeaconDriverUnsupported()
+        return content
+
+    def sanitize_inbound_compat(self, content: str) -> str:
+        """Sanitizes content to be friendly with other platforms with compatibility mode enabled."""
+        return content
+
+    def sanitize_outbound_compat(self, content: str) -> str:
+        """Sanitizes content to be friendly with driver's platform with compatibility mode enabled."""
+        return content
 
     # The following properties and methods are already implemented but can be overwritten
     # for custom behavior.

shinobu/beacon/stoat/driver.py

@@ -198,9 +198,10 @@ async def _to_stoat_content(self, content: beacon_message.BeaconMessageContent,
             replies.append(reply_obj)
 
         # Get final content
-        final_content: str = "\n".join(text_components)
+        final_content: str = self.sanitize_inbound("\n".join(text_components))
+
         if compatibility:
-            final_content = self._sanitize_inbound_compat(final_content)
+            final_content = self.sanitize_inbound_compat(final_content)
 
         # Assemble to StoatMessageContent
         return StoatMessageContent(
@@ -275,8 +276,20 @@ def sanitize_inbound(self, content: str) -> str:
         # Return content
         return content
 
-    @staticmethod
-    def _sanitize_inbound_compat(content: str) -> str:
+    def sanitize_outbound_compat(self, content: str) -> str:
+        # Detect spoilered content
+        components: list[str] = content.split('!!||')
+
+        if len(components) < 2:
+            return content
+
+        for index in range(1, len(components)):
+            if "||!!" in components[index]:
+                components[index] = "||" + components[index].replace("||!!", "||", 1)
+
+        return ''.join(components)
+
+    def sanitize_inbound_compat(self, content: str) -> str:
         # Detect spoilered content
         components: list[str] = content.split('||')
 

shinobu/beacon/stoat/parent.py

@@ -54,10 +54,15 @@ def register_driver(self):
     async def add_extensions(self):
         await self.load_extension("shinobu.beacon.stoat.modules.frontend")
 
-    async def _to_beacon_content(self, message: stoat.Message | stoat.PartialMessage) -> beacon_message.BeaconMessageContent:
+    async def _to_beacon_content(self, message: stoat.Message | stoat.PartialMessage, compatibility: bool = False
+                                 ) -> beacon_message.BeaconMessageContent:
         # Create text content block
+        final_content: str = self._driver.sanitize_outbound(str(message.content))
+        if compatibility:
+            final_content = self._driver.sanitize_outbound_compat(final_content)
+
         text_content: beacon_content.BeaconContentText = beacon_content.BeaconContentText(
-            content=self._driver.sanitize_outbound(str(message.content))
+            content=final_content
         )
 
         # Create embed blocks