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

Changed the string formatter from % to f"",

Browse Source 
Fixed a bug related to logging [log dir does not exist on master, and needs to get created on first startup]
Added !prefadmin <user> to view preferences of players, and change them
Orgrank & name will be hidden in !alts, if the character is not in an org
Page prefix & suffix are now being relayed [for example, it affects !online
Fixed !perks
Added comments regarding external API's.
This commit is contained in:
Minidodo
2021-08-14 02:36:20 +02:00
parent 80b5a4b577
commit 46d0ba3634
19 changed files with 104 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/private_channel/private_channel_controller.py
+7 -7
View File
@@ -183,7 +183,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,
@@ -193,8 +193,8 @@ class PrivateChannelController:
if main:
info = "" if self.account_service.check_superadmin(main.char_id) else \
":: <red>Admin</red> " if self.account_service.check_admin(main.char_id) else \
":: <red>Moderator</red> " if self.account_service.check_moderator(main.char_id) else \
":: <orange>Raidleader</orange> " if self.account_service.check_leader(main.char_id) else ""
":: <red>Moderator</red> " if self.account_service.check_moderator(main.char_id) else \
":: <orange>Raidleader</orange> " if self.account_service.check_leader(main.char_id) else ""
if main.char_id != event_data.char_id:
info += f":: Alt of <{main.faction.lower()}>{main.name}</{main.faction.lower()}>"
else:
@@ -223,23 +223,23 @@ class PrivateChannelController:
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(ChatBlob(event_data.message.title, event_data.message.msg),
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 = "{priv}{message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=page)
self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None,
page,
message)
else:
message = "{priv} {message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=event_data.message.title)
message = "{priv}{message}".format(priv=self.PRIVATE_CHANNEL_PREFIX, message=event_data.message.title)
self.message_hub_service.send_message(self.MESSAGE_SOURCE,
None,
event_data.message.title,
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,