fix for double blob spam (temp)

This commit is contained in:
2022-04-16 15:41:40 +02:00
parent b230660c2f
commit 250887e2bb
8 changed files with 48 additions and 66 deletions
+4 -2
View File
@@ -6,6 +6,7 @@ from core.bot_status import BotStatus
from core.buddy_service import BuddyService
from core.command_alias_service import CommandAliasService
from core.command_param_types import Int, Any, Const, Options
from core.command_request import CommandRequest
from core.db import DB
from core.decorators import instance, event, command
from core.dict_object import DictObject
@@ -108,8 +109,9 @@ class OnlineController:
Any("profession", is_optional=True)],
description="shows online players",
access_level="member")
def online_all_cmd(self, _, const_all, min_level, profession):
def online_all_cmd(self, request: CommandRequest, const_all, min_level, profession):
query = ""
const_all = True if request.channel == "discord" and const_all else False
params = [self.bot.name, self.bot.get_char_id()]
if const_all:
query += "and channel_id IN (1, 2, 3) "
@@ -122,7 +124,7 @@ class OnlineController:
query += "and p.profession = ? "
params.append(self.util.get_profession(profession))
blob = self.online_display.format_by_channel_main(query, params)
_.reply(self.online_display.format_blob(blob))
request.reply(self.online_display.format_blob(blob))
@command(command="count",
params=[Options(["org", "prof", "tl"], is_optional=True), Any("filter", is_optional=True)],
@@ -87,11 +87,11 @@ class CharacterInfoController:
blob += f"Faction: {self.text.get_formatted_faction(char_info.faction)}\n"
blob += f"Breed: {char_info.breed}\n"
blob += f"Gender: {char_info.gender}\n"
blob += f"Level: {char_info.level:d}\n"
blob += f"Level: {char_info.level}\n"
blob += f"AI Level: <green>{char_info.ai_level:d}</green>\n"
if char_info.org_id:
blob += f"Org: <highlight>{char_info.org_name}</highlight> ({char_info.org_id:d})\n"
blob += f"Org Rank: {char_info.org_rank_name} ({char_info.org_rank_id:d})\n"
blob += f"Org: <highlight>{char_info.org_name}</highlight> ({char_info.org_id})\n"
blob += f"Org Rank: {char_info.org_rank_name} ({char_info.org_rank_id})\n"
else:
blob += "Org: &lt;None&gt;\n"
blob += "Org Rank: &lt;None&gt;\n"