Adjust for support channel changes and macos support

This commit is contained in:
Mary 2022-11-26 11:26:04 +01:00 committed by TSR Berry
parent 367cc8fe9d
commit b2bd3142a9
No known key found for this signature in database
GPG key ID: 52353C0A4CCA15E2

View file

@ -531,10 +531,6 @@ class LogFileReader(Cog):
except TypeError: except TypeError:
pass pass
if "Darwin" in self.embed["hardware_info"]["os"]:
mac_os_warning = "**❌ macOS is currently unsupported**"
self.embed["game_info"]["notes"].append(mac_os_warning)
if ( if (
"Windows" in self.embed["hardware_info"]["os"] "Windows" in self.embed["hardware_info"]["os"]
and self.embed["settings"]["graphics_backend"] != "Vulkan" and self.embed["settings"]["graphics_backend"] != "Vulkan"
@ -622,13 +618,14 @@ class LogFileReader(Cog):
pr_version = re.compile(r"^\d\.\d\.\d\+([a-f]|\d){7}$") pr_version = re.compile(r"^\d\.\d\.\d\+([a-f]|\d){7}$")
ldn_version = re.compile(r"^\d\.\d\.\d\-ldn\d+\.\d+(?:\.\d+|$)") ldn_version = re.compile(r"^\d\.\d\.\d\-ldn\d+\.\d+(?:\.\d+|$)")
if ( is_channel_allowed = False
message.channel.id == config.bot_log_allowed_channels["support"]
or message.channel.id for allowed_channel_id in config.bot_log_allowed_channels.values():
== config.bot_log_allowed_channels["patreon-support"] if message.channel.id == allowed_channel_id:
or message.channel.id is_channel_allowed = True
== config.bot_log_allowed_channels["linux-master-race"] break
):
if is_channel_allowed:
if re.match(pr_version, self.embed["emu_info"]["ryu_version"]): if re.match(pr_version, self.embed["emu_info"]["ryu_version"]):
pr_version_warning = f"**⚠️ PR build logs should be posted in <#{config.bot_log_allowed_channels['pr-testing']}> if reporting bugs or tests**" pr_version_warning = f"**⚠️ PR build logs should be posted in <#{config.bot_log_allowed_channels['pr-testing']}> if reporting bugs or tests**"
self.embed["game_info"]["notes"].append(pr_version_warning) self.embed["game_info"]["notes"].append(pr_version_warning)
@ -779,7 +776,9 @@ class LogFileReader(Cog):
description="\n".join( description="\n".join(
( (
f"Please upload Ryujinx log files to the correct location:\n", f"Please upload Ryujinx log files to the correct location:\n",
f'<#{config.bot_log_allowed_channels["support"]}>: General help and troubleshooting', f'<#{config.bot_log_allowed_channels["windows-support"]}>: Windows help and troubleshooting',
f'<#{config.bot_log_allowed_channels["linux-support"]}>: Linux help and troubleshooting',
f'<#{config.bot_log_allowed_channels["macos-support"]}>: macOS help and troubleshooting',
f'<#{config.bot_log_allowed_channels["patreon-support"]}>: Help and troubleshooting for Patreon subscribers', f'<#{config.bot_log_allowed_channels["patreon-support"]}>: Help and troubleshooting for Patreon subscribers',
f'<#{config.bot_log_allowed_channels["development"]}>: Ryujinx development discussion', f'<#{config.bot_log_allowed_channels["development"]}>: Ryujinx development discussion',
f'<#{config.bot_log_allowed_channels["pr-testing"]}>: Discussion of in-progress pull request builds', f'<#{config.bot_log_allowed_channels["pr-testing"]}>: Discussion of in-progress pull request builds',