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

Moved the coloring from <color>[text]<end> to <color>[test]</color>, which allows the discord module to reparse the messages more accurately

Browse Source
This commit is contained in:
Minidodo
2022-04-29 20:12:15 +02:00
parent fcea02e1c9
commit 3cade228fe
22 changed files with 177 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/standard/whois/org_list_controller.py
+6 -6
View File
@@ -93,7 +93,7 @@ class OrgListController:
blob += "History: <{side}>{HISTORY}</{side}><br><br>"
blob += "[{ADD}] - [{REM}]<br>"
if info[0]["GOVERNINGNAME"] == "Department":
blob += "<br><notice>Generals<end><br>"
blob += "<br><notice>Generals</notice><br>"
blob += "<generals>"
blob = blob.format(**info[0], side=info[0]["SIDE_NAME"].lower(),
ADD=self.text.make_chatcmd("Add to our orgs",
@@ -106,20 +106,20 @@ class OrgListController:
blob = blob.replace("<president>", member["NAME"])
if info[0]["GOVERNINGNAME"] == "Department":
if member["RANK"] == 1:
generals += "- {NAME} ({LEVELX}/<green>{ALIENLEVEL}<end>) {PROF}<br>".format(**member)
generals += "- {NAME} ({LEVELX}/<green>{ALIENLEVEL}</green>) {PROF}<br>".format(**member)
blob = blob.replace("<generals>", generals)
return ChatBlob(orgs[0].org_name, blob)
elif len(orgs) == 0:
return f"No org with the name <highlight>{org}<end> was found on PoRK."
return f"No org with the name <highlight>{org}</highlight> was found on PoRK."
else:
blob = "Your search had multiple results; please pick an org:<br>"
for org in orgs:
if Registry.get_instance('org_alias_controller', is_optional=True):
blob += f'[{self.text.make_chatcmd("Add", f"/tell <myname> orgs add {org.org_id}")}]'
blob += f'[{self.text.make_chatcmd("More", f"/tell <myname> orgs info {org.org_id}")}]'
blob += f' <highlight>{org.org_name}<end> ' \
f'(<highlight>{org.org_id}<end>) <{org.faction.lower()}>{org.faction}<end> ' \
f'[<highlight>{org.member_count}<end> members]<br><pagebreak>'
blob += f' <highlight>{org.org_name}</highlight> ' \
f'(<highlight>{org.org_id}</highlight>) <{org.faction.lower()}>{org.faction}</{org.faction.lower()}> ' \
f'[<highlight>{org.member_count}</highlight> members]<br><pagebreak>'
return ChatBlob("Pick an Org", blob)
def start_orglist_lookup(self, reply, org_id):