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/orgbot/org/online_controller.py
-21
View File
@@ -50,24 +50,3 @@ class OrgOnlineController(OnlineController):
if entry.logon:
return f"Your current logoff message is: <grey>{entry.logon}</grey>"
return f"You do not have a logoff message set."
@command(command="online", params=[Const('all', is_optional=True),
Int("min_level", is_optional=True),
Any("profession", is_optional=True)],
description="shows online players",
access_level="member")
def online_all_cmd(self, request, const_all, min_level, profession):
query = ""
params = [self.bot.name, self.bot.get_char_id()]
if const_all:
query += "and channel_id IN (1, 2, 3) "
else:
query += "and channel_id IN (1, 2) "
if min_level:
query += "and p.level >= ? "
params.append(min_level)
if profession:
query += "and p.profession = ? "
params.append(self.util.get_profession(profession))
blob = self.online_display.format_by_channel_main(query, params)
request.reply(self.online_display.format_blob(blob))
modules/orgbot/org/org_controller.py
+17 -17
View File
@@ -116,23 +116,23 @@ class OrgChannelController:
is_hidden=True)
def outgoing_org_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.ORG_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.ORG_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.ORG_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.ORG_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 = "{org} {message}".format(org=self.ORG_CHANNEL_PREFIX, message=event_data.message)
self.message_hub_service.send_message(self.MESSAGE_SOURCE,