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

Fix for callers, and auto-clear them if there's no inactivity for 60 minutes

Browse Source
This commit is contained in:
Minidodo
2021-09-13 14:28:53 +02:00
parent 04f96684cf
commit 5acfb6866a
5 changed files with 87 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/standard/loot/loot_lists_controller.py
+10 -11
View File
@@ -332,9 +332,9 @@ class LootListsController:
for raid in raids:
title = raid[0][1] if isinstance(raid[0], tuple) else raid[0]
cmd = raid[1]
show_loot = self.text.make_chatcmd("Loot table", "/tell <myname> %s" % cmd)
blob += "<highlight>%s<end>\n" % title
blob += " └ [%s]\n\n" % show_loot
show_loot = self.text.make_chatcmd("Loot table", f"/tell <myname> {cmd}")
blob += f"<highlight>{title}<end>\n"
blob += f" └ [{show_loot}]\n\n"
blob += "<pagebreak>"
return blob
@@ -348,7 +348,7 @@ class LootListsController:
if add_all:
blob += "%s items to loot list\n\n" % self.text.make_chatcmd(
"Add all", "/tell <myname> loot addraid %s %s" % (raid, category))
"Add all", f"/tell <myname> loot addraid {raid} {category}")
blob += "<header2>%s<end>\n" % category if category is not None else ""
@@ -357,26 +357,25 @@ class LootListsController:
item.id = self.text.make_item(item.low_id, item.high_id, item.ql, item.name + comment)
if item.multiloot > 1:
print(item)
single_link = self.text.make_chatcmd("Add to loot", f"/tell <myname> loot {item.id}")
single_link1 = self.text.make_chatcmd("Add to auction", f"/tell <myname> auction prepare {item.id} ")
multi_link = self.text.make_chatcmd(
f"Add x{item.multiloot:d} to loot", f"/tell <myname> loot {item.id} {item.multiloot}")
f"Add x{item.multiloot} to loot", f"/tell <myname> loot {item.id} {item.multiloot}")
multi_link2 = self.text.make_chatcmd(
f"Add x{item.multiloot:d} to auction", f"/tell <myname> auction prepare {item.id} (ALL)")
f"Add x{item.multiloot} to auction", f"/tell <myname> auction prepare {item.id} (ALL)")
add_links = f"└ [{single_link}] [{multi_link}]<br> └ [{single_link1}] [{multi_link2} (ALL) - One Winner]"
else:
add_links = f"└ [{self.text.make_chatcmd('Add to loot', f'/tell <myname> loot {item.id} {comment}')}]<br> " \
add_links = f"└ [{self.text.make_chatcmd('Add to loot', f'/tell <myname> loot {item.id}')}]<br> " \
f"└ [{self.text.make_chatcmd('Add to auction', f'/tell <myname> auction prepare {item.id}')}]"
# comment = f" ({item.comment})" if item.comment != "" else ""
if self.setting_service.get("use_item_icons").get_value():
item_link = self.text.make_item(item.low_id, item.high_id, item.ql, "<img src=rdb://%s>" % item.icon)
blob += "%s%s%s\n %s\n\n" % (item_link, item.name, comment, add_links)
item_link = self.text.make_item(item.low_id, item.high_id, item.ql, f"<img src=rdb://{item.icon}>")
blob += f"{item_link}{item.name}{comment}\n {add_links}\n\n"
else:
item_link = self.text.make_item(item.low_id, item.high_id, item.ql, item.name)
blob += "%s%s\n %s\n\n" % (item_link, comment, add_links)
blob += f"{item_link}{comment}\n {add_links}\n\n"
blob += "<pagebreak>"
return blob