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
core/text.py
+8 -8
View File
@@ -60,19 +60,19 @@ class Text:
def make_chatcmd(self, name, msg, style=""):
msg = msg.strip()
msg = msg.replace("'", "&#39;")
return "<a %s href='chatcmd://%s'>%s</a>" % (style, msg, name)
return f"<a {style} href='chatcmd://{msg}'>{name}</a>"
def make_tellcmd(self, name, msg, style="", char="<myname>"):
return self.make_chatcmd(name, f"/tell {char} {msg}", style)
def make_charlink(self, char, style=""):
return "<a %s href='user://%s'>%s</a>" % (style, char, char)
return f"<a {style} href='user://{char}'>{char}</a>"
def make_item(self, low_id, high_id, ql, name):
return "<a href='itemref://%d/%d/%d'>%s</a>" % (low_id, high_id, ql, name)
return f"<a href='itemref://{low_id:d}/{high_id:d}/{ql:d}'>{name}</a>"
def make_image(self, image_id, image_db="rdb"):
return "<img src='%s://%s'>" % (image_db, image_id)
return f"<img src='{image_db}://{image_id}'>"
def format_item(self, item, ql=None, with_icon=True):
if not item:
@@ -89,8 +89,8 @@ class Text:
def generate_item(self, item, ql, synonym=None):
if synonym:
return {"icon_%s" % synonym: self.make_item(item.lowid, item.highid, ql, self.make_image(item.icon)),
"text_%s" % synonym: self.make_item(item.lowid, item.highid, ql, item.name)}
return {f"icon_{synonym}": self.make_item(item.lowid, item.highid, ql, self.make_image(item.icon)),
f"text_{synonym}": self.make_item(item.lowid, item.highid, ql, item.name)}
else:
return {"icon": self.make_item(item.lowid, item.highid, ql, self.make_image(item.icon)),
"text": self.make_item(item.lowid, item.highid, ql, item.name)}
@@ -120,10 +120,10 @@ class Text:
count = len(selected)
pages = ""
if page > 1:
pages += "Pages: " + self.make_tellcmd("«« Page %d" % (page - 1), f'{cmd} --page={page - 1}')
pages += "Pages: " + self.make_tellcmd(f"«« Page {page - 1:d}", f'{cmd} --page={page - 1}')
if offset + page_size < len(data):
pages += f" Page {page}/{math.ceil(len(data) / page_size)}"
pages += " " + self.make_tellcmd("Page %d »»" % (page + 1), f'{cmd} --page={page + 1}')
pages += " " + self.make_tellcmd(f"Page {page + 1:d} »»", f'{cmd} --page={page + 1}')
pages += "\n"
if count == 0:
return no_data_msg