Check type in extra so we don't iterate thru str

This commit is contained in:
Andrew 2023-12-29 12:11:29 -05:00
parent a67f53a4c9
commit 60ac3bf630

View File

@ -12,6 +12,7 @@ from app.classes.minecraft.bedrock_ping import BedrockPing
from app.classes.shared.console import Console from app.classes.shared.console import Console
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
MOTD_CODES = ["bold", "italic", "underlined", "strikethrough"]
class Server: class Server:
@ -37,20 +38,16 @@ class Server:
if "text" in description.keys(): if "text" in description.keys():
lines.append(description["text"]) lines.append(description["text"])
if "extra" in description.keys(): if "extra" in description.keys():
if isinstance(description["extra"], list):
for e in description["extra"]: for e in description["extra"]:
if not isinstance(e, dict): if not isinstance(e, dict):
lines.append(e) lines.append(e)
continue continue
# Conversion format code needed only for Java Version # Conversion format code needed only for Java Version
lines.append(get_code_format("reset")) lines.append(get_code_format("reset"))
if "bold" in e.keys(): for item in MOTD_CODES:
lines.append(get_code_format("bold")) if e.get(item, False):
if "italic" in e.keys(): lines.append(get_code_format(item))
lines.append(get_code_format("italic"))
if "underlined" in e.keys():
lines.append(get_code_format("underlined"))
if "strikethrough" in e.keys():
lines.append(get_code_format("strikethrough"))
if "color" in e.keys(): if "color" in e.keys():
lines.append(get_code_format(e["color"])) lines.append(get_code_format(e["color"]))
# Then append the text # Then append the text