Minidodo/igncore
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

fix for double blob spam (temp)

Browse Source
This commit is contained in:
Minidodo
2022-04-16 15:41:40 +02:00
parent b230660c2f
commit 250887e2bb
8 changed files with 48 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/accounting/alts_controller.py
+1 -1
View File
@@ -189,7 +189,7 @@ class AltsController:
f":: <{alt.faction.lower()}>{name}</{alt.faction.lower()}>"
if alt.org_name != "":
blob += f" [<{alt.faction.lower()}>{alt.org_name}</{alt.faction.lower()}> - " \
f"<highlight>{alt.org_rank_id + 1}</highlight>]"
f"<highlight>{alt.org_rank_id}</highlight>]"
if self.buddy_service.is_online(alt.char_id):
blob += " [<green>Online</green>]"
blob += "\n"
modules/core/private_channel/private_channel_controller.py
+21 -21
View File
@@ -24,7 +24,7 @@ from modules.standard.online.online_display import OnlineDisplay
@instance()
class PrivateChannelController:
MESSAGE_SOURCE = "private_channel"
PRIVATE_CHANNEL_PREFIX = "[<cyan>Priv</cyan>] "
PRIVATE_CHANNEL_PREFIX = "[<cyan>Priv</cyan>]"
def inject(self, registry):
self.bot: IgnCore = registry.get_instance("bot")
@@ -192,7 +192,7 @@ class PrivateChannelController:
char_name = self.character_service.resolve_char_to_name(event_data.char_id)
sender = DictObject({"char_id": event_data.char_id, "name": char_name})
char = self.text.make_charlink(char_name)
formatted_message = f"{self.PRIVATE_CHANNEL_PREFIX}{char}: {event_data.message}"
formatted_message = f"{self.PRIVATE_CHANNEL_PREFIX} {char}: {event_data.message}"
self.message_hub_service.send_message(self.MESSAGE_SOURCE, sender, event_data.message, formatted_message)
@event(event_type=PrivateChannelService.JOINED_PRIVATE_CHANNEL_EVENT,
@@ -214,7 +214,7 @@ class PrivateChannelController:
msg = f"{self.text.format_char_info(self.pork.get_character_info(event_data.char_id))} joined us {info}"
self.bot.send_private_channel_message(msg, fire_outgoing_event=False)
self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, msg, self.PRIVATE_CHANNEL_PREFIX + msg)
self.message_hub_service.send_message(self.MESSAGE_SOURCE, None, msg, self.PRIVATE_CHANNEL_PREFIX + " " + msg)
afk_list = {}
if self.online_controller:
afk_list = self.online_controller.afk_list
@@ -237,25 +237,25 @@ class PrivateChannelController:
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 = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=page)
event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + " " + event_data.message.page_prefix
self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None,
page,
event_data.message)
else:
# message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message.title)
event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + " " + event_data.message.page_prefix
self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None,
event_data.message.title,
event_data.message)
# 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 = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=page)
# event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + " " + event_data.message.page_prefix
# self.message_hub_service.send_message(self.MESSAGE_SOURCE,
# None,
# page,
# event_data.message)
# else:
# message = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message.title)
event_data.message.page_prefix = self.PRIVATE_CHANNEL_PREFIX + " " + event_data.message.page_prefix
self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None,
event_data.message.title,
event_data.message)
else:
message = "{priv}{message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=event_data.message)
message = "{priv} {message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=event_data.message)
self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None,
message,