get rid of the MessageDistributor module... & update discord, to work with API v10

Added discord commands (issue: as they're running over the event hub, they're processed on the same track as other events. => activity ingame triggers the next run; otherwise there's some delay for responses) relay is a standard module now.
2022-04-15 17:05:30 +02:00
parent fd84d82af2
commit a3a26f2ba4
32 changed files with 1036 additions and 729 deletions
@@ -235,22 +235,25 @@ class PrivateChannelController:
    @event(event_type=IgnCore.OUTGOING_PRIVATE_CHANNEL_MESSAGE_EVENT,
           description="Relay commands from the private channel to the relay hub", is_hidden=True)
    def outgoing_private_channel_message_event(self, _, event_data):
+
        if isinstance(event_data.message, ChatBlob):
            pages = self.text.paginate(event_data.message,
                                       self.setting_service.get("org_channel_max_page_length").get_value())
            if len(pages) < 4:
                for page in pages:
-                    message = "{priv}{message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=page)
+                    # message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=page)
+                    event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX
                    self.message_hub_service.send_message(self.MESSAGE_SOURCE,
                                                          None,
                                                          page,
-                                                          message)
+                                                          event_data.message)
            else:
-                message = "{priv}{message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=event_data.message.title)
+                # message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message.title)
+                event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX
                self.message_hub_service.send_message(self.MESSAGE_SOURCE,
                                                      None,
                                                      event_data.message.title,
-                                                      message)
+                                                      event_data.message)
        else:
            message = "{priv}{message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=event_data.message)
            self.message_hub_service.send_message(self.MESSAGE_SOURCE,