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

Fixed bidding, while not being in raid (Nolonger throws an error)

Browse Source 
Added default alias !list for !loot (bebot like)
Changed the layout of !notes, its more compact now.
fixed !count in the rare case of an empty private channel
This commit is contained in:
Minidodo
2021-08-15 15:47:06 +02:00
parent 46d0ba3634
commit d0c8c1744c
6 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/raidbot/raid/raidbot_controller.py
+12 -11
View File
@@ -101,7 +101,7 @@ class RaidbotController(BaseModule):
blob += f"Raidleader: " \
f"<highlight>" \
f"{self.leader.leader.name if self.leader.leader else '<red>not set - use !leader set<end>'}" \
f"<end>"
f"<end>\n"
blob += f"Started At: <highlight>{self.util.format_datetime(self.raid.started_at)}<end> " \
f"({self.util.time_to_readable(t - self.raid.started_at)} ago)\n"
if self.raid.is_open:
@@ -483,21 +483,21 @@ class RaidbotController(BaseModule):
blob += f"End time: <highlight>{self.util.format_datetime(log_entry[0].raid_end)}<end>\n"
blob += f"Run time: " \
f"<highlight>{self.util.time_to_readable(log_entry[0].raid_end - log_entry[0].raid_start)}<end>\n"
blob += f"Total points: <highlight>{pts_sum:d}<end>\n\n"
blob += f"Total points: <highlight>{pts_sum}<end>\n\n"
if char and log_entry_spec:
raider_name = self.character_service.resolve_char_to_name(log_entry_spec.raider_id)
main_info = self.account_service.get_main(log_entry_spec.raider_id)
alt_link = "Alt of %s" % main_info.name if main_info.char_id != log_entry_spec.raider_id else "Alts"
alt_link = self.text.make_chatcmd(alt_link, "/tell <myname> alts %s" % main_info.name)
blob += "<header2>Log entry for %s<end>\n" % raider_name
blob += "Raider: <highlight>%s<end> [%s]\n" % (raider_name, alt_link)
alt_link = f"Alt of {main_info.name}" if main_info.char_id != log_entry_spec.raider_id else "Alts"
alt_link = self.text.make_chatcmd(alt_link, f"/tell <myname> alts {main_info.name}")
blob += f"<header2>Log entry for {raider_name}<end>\n"
blob += f"Raider: <highlight>{raider_name}<end> [{alt_link}]\n"
blob += "Left raid: %s\n" % ("n/a"
if log_entry_spec.left_raid is None
else self.util.format_datetime(log_entry_spec.left_raid))
blob += "Was kicked: %s\n" % ("No"
if log_entry_spec.was_kicked is None
else "Yes [%s]" % (self.util.format_datetime(log_entry_spec.was_kicked)))
else f"Yes [{self.util.format_datetime(log_entry_spec.was_kicked)}]")
blob += "Kick reason: %s\n\n" % ("n/a"
if log_entry_spec.was_kicked_reason is None
else log_entry_spec.was_kicked_reason)
@@ -569,9 +569,9 @@ class RaidbotController(BaseModule):
def announce_raid(self, event_type, event_data):
if self.raid:
if self.raid.is_open:
self.bot.send_private_channel_message("<highlight>Raid Running<end> "
"<yellow>::<end> <green>%s<end> <yellow>::<end> %s" %
(self.raid.desc,
self.bot.send_private_channel_message(f"<highlight>Raid Running<end> "
f"<yellow>::<end> <green>{self.raid.desc}<end> <yellow>::<end> %s" %
(
f"<a href=\"text://{self.raid.raid_name}\">"
f"{self.get_raid_join_blob('Click to Join')}"
f"</a>"))
@@ -587,6 +587,7 @@ class RaidbotController(BaseModule):
self.bot.send_private_channel_message(f"<red>::</red> No Leader set <red>::</red> "
f"use <highlight>!leader set</highlight>")
return
if not self.is_in_raid(leader.char_id):
account = self.account_service.get_account(leader.char_id)
if not self.is_in_raid(account.main):
self.bot.send_private_channel_message(f"<red>::</red> Raidleader <highlight>{leader.name}</highlight> "
f"is not in raid <red>::</red>")