Compare commits
5 commits
master
...
ryuko_mast
Author | SHA1 | Date | |
---|---|---|---|
|
da9ea20a9d | ||
|
d1c536e792 | ||
|
d562e2ab88 | ||
|
8e05468cb7 | ||
|
86eb6a7ad2 |
4 changed files with 712 additions and 10 deletions
610
robocop_ng/cogs/logfilereader.py
Normal file
610
robocop_ng/cogs/logfilereader.py
Normal file
|
@ -0,0 +1,610 @@
|
|||
import logging
|
||||
import re
|
||||
|
||||
import aiohttp
|
||||
import config
|
||||
import discord
|
||||
from discord.ext.commands import Cog
|
||||
|
||||
logging.basicConfig(
|
||||
format="%(asctime)s (%(levelname)s) %(message)s (Line %(lineno)d)",
|
||||
level=logging.INFO,
|
||||
)
|
||||
|
||||
|
||||
class LogFileReader(Cog):
|
||||
def __init__(self, bot):
|
||||
self.bot = bot
|
||||
# Allows log analysis in #support and #patreon-support channels respectively
|
||||
self.bot_log_allowed_channels = config.bot_log_allowed_channels
|
||||
self.uploaded_log_filenames = []
|
||||
|
||||
async def download_file(self, log_url):
|
||||
async with aiohttp.ClientSession() as session:
|
||||
# Grabs first and last few bytes of log file to prevent abuse from large files
|
||||
headers = {"Range": "bytes=0-25000, -6000"}
|
||||
async with session.get(log_url, headers=headers) as response:
|
||||
return await response.text("UTF-8")
|
||||
|
||||
async def log_file_read(self, message):
|
||||
self.embed = {
|
||||
"hardware_info": {
|
||||
"cpu": "Unknown",
|
||||
"gpu": "Unknown",
|
||||
"ram": "Unknown",
|
||||
"os": "Unknown",
|
||||
},
|
||||
"emu_info": {
|
||||
"ryu_version": "Unknown",
|
||||
"ryu_firmware": "Unknown",
|
||||
"logs_enabled": None,
|
||||
},
|
||||
"game_info": {
|
||||
"game_name": "Unknown",
|
||||
"errors": "No errors found in log",
|
||||
"mods": "No mods found",
|
||||
"notes": [],
|
||||
},
|
||||
"settings": {
|
||||
"audio_backend": "Unknown",
|
||||
"docked": "Unknown",
|
||||
"ignore_missing_services": "Unknown",
|
||||
"pptc": "Unknown",
|
||||
"shader_cache": "Unknown",
|
||||
"vsync": "Unknown",
|
||||
"resolution_scale": "Unknown",
|
||||
"anisotropic_filtering": "Unknown",
|
||||
"aspect_ratio": "Unknown",
|
||||
},
|
||||
}
|
||||
attached_log = message.attachments[0]
|
||||
author_name = f"@{message.author.name}"
|
||||
log_file = await self.download_file(attached_log.url)
|
||||
# Large files show a header value when not downloaded completely
|
||||
# this regex makes sure that the log text to read starts from the first timestamp, ignoring headers
|
||||
log_file_header_regex = re.compile(r"\d{2}:\d{2}:\d{2}\.\d{3}.*", re.DOTALL)
|
||||
log_file = re.search(log_file_header_regex, log_file).group(0)
|
||||
|
||||
def get_hardware_info(log_file=log_file):
|
||||
for setting in self.embed["hardware_info"]:
|
||||
try:
|
||||
if setting == "cpu":
|
||||
self.embed["hardware_info"][setting] = (
|
||||
re.search(r"CPU:\s([^;\n\r]*)", log_file, re.MULTILINE)
|
||||
.group(1)
|
||||
.rstrip()
|
||||
)
|
||||
if setting == "ram":
|
||||
self.embed["hardware_info"][setting] = (
|
||||
re.search(
|
||||
r"RAM:(\sTotal)?\s([^;\n\r]*)", log_file, re.MULTILINE
|
||||
)
|
||||
.group(2)
|
||||
.rstrip()
|
||||
)
|
||||
if setting == "os":
|
||||
self.embed["hardware_info"][setting] = (
|
||||
re.search(
|
||||
r"Operating System:\s([^;\n\r]*)",
|
||||
log_file,
|
||||
re.MULTILINE,
|
||||
)
|
||||
.group(1)
|
||||
.rstrip()
|
||||
)
|
||||
if setting == "gpu":
|
||||
self.embed["hardware_info"][setting] = (
|
||||
re.search(
|
||||
r"PrintGpuInformation:\s([^;\n\r]*)",
|
||||
log_file,
|
||||
re.MULTILINE,
|
||||
)
|
||||
.group(1)
|
||||
.rstrip()
|
||||
)
|
||||
except AttributeError:
|
||||
continue
|
||||
|
||||
def get_ryujinx_info(log_file=log_file):
|
||||
# try:
|
||||
for setting in self.embed["emu_info"]:
|
||||
try:
|
||||
if setting == "ryu_version":
|
||||
self.embed["emu_info"][setting] = [
|
||||
line.split()[-1]
|
||||
for line in log_file.splitlines()
|
||||
if "Ryujinx Version:" in line
|
||||
][0]
|
||||
if setting == "logs_enabled":
|
||||
self.embed["emu_info"][setting] = (
|
||||
re.search(
|
||||
r"Logs Enabled:\s([^;\n\r]*)", log_file, re.MULTILINE
|
||||
)
|
||||
.group(1)
|
||||
.rstrip()
|
||||
)
|
||||
if setting == "ryu_firmware":
|
||||
self.embed["emu_info"]["ryu_firmware"] = [
|
||||
line.split()[-1]
|
||||
for line in log_file.splitlines()
|
||||
if "Firmware Version:" in line
|
||||
][0]
|
||||
except (AttributeError, IndexError):
|
||||
continue
|
||||
|
||||
def format_log_embed():
|
||||
cleaned_game_name = re.sub(
|
||||
r"\s\[(64|32)-bit\]$", "", self.embed["game_info"]["game_name"]
|
||||
)
|
||||
self.embed["game_info"]["game_name"] = cleaned_game_name
|
||||
|
||||
hardware_info = " | ".join(
|
||||
(
|
||||
f"**CPU:** {self.embed['hardware_info']['cpu']}",
|
||||
f"**GPU:** {self.embed['hardware_info']['gpu']}",
|
||||
f"**RAM:** {self.embed['hardware_info']['ram']}",
|
||||
f"**OS:** {self.embed['hardware_info']['os']}",
|
||||
)
|
||||
)
|
||||
|
||||
system_settings_info = "\n".join(
|
||||
(
|
||||
f"**Audio Backend:** `{self.embed['settings']['audio_backend']}`",
|
||||
f"**Console Mode:** `{self.embed['settings']['docked']}`",
|
||||
f"**PPTC:** `{self.embed['settings']['pptc']}`",
|
||||
f"**V-Sync:** `{self.embed['settings']['vsync']}`",
|
||||
)
|
||||
)
|
||||
|
||||
graphics_settings_info = "\n".join(
|
||||
(
|
||||
f"**Resolution:** `{self.embed['settings']['resolution_scale']}`",
|
||||
f"**Anisotropic Filtering:** `{self.embed['settings']['anisotropic_filtering']}`",
|
||||
f"**Aspect Ratio:** `{self.embed['settings']['aspect_ratio']}`",
|
||||
)
|
||||
)
|
||||
|
||||
ryujinx_info = " | ".join(
|
||||
(
|
||||
f"**Version:** {self.embed['emu_info']['ryu_version']}",
|
||||
f"**Firmware:** {self.embed['emu_info']['ryu_firmware']}",
|
||||
)
|
||||
)
|
||||
|
||||
log_embed = discord.Embed(
|
||||
title=f"{cleaned_game_name}", colour=discord.Colour(0x4A90E2)
|
||||
)
|
||||
log_embed.set_footer(text=f"Log uploaded by {author_name}")
|
||||
log_embed.add_field(
|
||||
name="General Info",
|
||||
value=" | ".join((ryujinx_info, hardware_info)),
|
||||
inline=False,
|
||||
)
|
||||
log_embed.add_field(
|
||||
name="System Settings",
|
||||
value=system_settings_info,
|
||||
inline=True,
|
||||
)
|
||||
log_embed.add_field(
|
||||
name="Graphics Settings",
|
||||
value=graphics_settings_info,
|
||||
inline=True,
|
||||
)
|
||||
if cleaned_game_name == "Unknown":
|
||||
log_embed.add_field(
|
||||
name="Empty Log",
|
||||
value=f"""This log file appears to be empty. To get a proper log, follow these steps:
|
||||
1) In Logging settings, ensure `Enable Logging to File` is checked.
|
||||
2) Ensure the following default logs are enabled: `Info`, `Warning`, `Error`, `Guest` and `Stub`.
|
||||
3) Start a game up.
|
||||
4) Play until your issue occurs.
|
||||
5) Upload the latest log file.""",
|
||||
inline=False,
|
||||
)
|
||||
log_embed.add_field(
|
||||
name="Latest Error Snippet",
|
||||
value=self.embed["game_info"]["errors"],
|
||||
inline=False,
|
||||
)
|
||||
else:
|
||||
log_embed.add_field(
|
||||
name="Latest Error Snippet",
|
||||
value=self.embed["game_info"]["errors"],
|
||||
inline=False,
|
||||
)
|
||||
log_embed.add_field(
|
||||
name="Mods", value=self.embed["game_info"]["mods"], inline=False
|
||||
)
|
||||
|
||||
try:
|
||||
notes_value = "\n".join(game_notes)
|
||||
except TypeError:
|
||||
notes_value = "Nothing to note"
|
||||
log_embed.add_field(
|
||||
name="Notes",
|
||||
value=notes_value,
|
||||
inline=False,
|
||||
)
|
||||
|
||||
return log_embed
|
||||
|
||||
def analyse_log(log_file=log_file):
|
||||
try:
|
||||
for setting_name in self.embed["settings"]:
|
||||
# Some log info may be missing for users that use older versions of Ryujinx, so reading the settings is not always possible.
|
||||
# As settings are initialized with "Unknown" values, False should not be an issue for setting.get()
|
||||
def get_setting(name, setting_string, log_file=log_file):
|
||||
setting = self.embed["settings"]
|
||||
setting_value = [
|
||||
line.split()[-1]
|
||||
for line in log_file.splitlines()
|
||||
if re.search(fr"LogValueChange: ({setting_string})\s", line)
|
||||
][-1]
|
||||
if setting_value and setting.get(name):
|
||||
setting[name] = setting_value
|
||||
if name == "docked":
|
||||
setting[
|
||||
name
|
||||
] = f"{'Docked' if setting_value == 'True' else 'Handheld'}"
|
||||
if name == "resolution_scale":
|
||||
resolution_map = {
|
||||
"-1": "Custom",
|
||||
"1": "Native (720p/1080p)",
|
||||
"2": "2x (1440p/2160p)",
|
||||
"3": "3x (2160p/3240p)",
|
||||
"4": "4x (2880p/4320p)",
|
||||
}
|
||||
setting[name] = resolution_map[setting_value]
|
||||
if name == "anisotropic_filtering":
|
||||
anisotropic_map = {
|
||||
"-1": "Auto",
|
||||
"2": "2x",
|
||||
"4": "4x",
|
||||
"8": "8x",
|
||||
"16": "16x",
|
||||
}
|
||||
setting[name] = anisotropic_map[setting_value]
|
||||
if name == "aspect_ratio":
|
||||
aspect_map = {
|
||||
"Fixed4x3": "4:3",
|
||||
"Fixed16x9": "16:9",
|
||||
"Fixed16x10": "16:10",
|
||||
"Fixed21x9": "21:9",
|
||||
"Fixed32x9": "32:9",
|
||||
"Stretched": "Stretch to Fit Window",
|
||||
}
|
||||
setting[name] = aspect_map[setting_value]
|
||||
if name in [
|
||||
"ignore_missing_services",
|
||||
"pptc",
|
||||
"shader_cache",
|
||||
"vsync",
|
||||
]:
|
||||
setting[
|
||||
name
|
||||
] = f"{'Enabled' if setting_value == 'True' else 'Disabled'}"
|
||||
return setting[name]
|
||||
|
||||
setting_map = {
|
||||
"anisotropic_filtering": "MaxAnisotropy",
|
||||
"aspect_ratio": "AspectRatio",
|
||||
"audio_backend": "AudioBackend",
|
||||
"docked": "EnableDockedMode",
|
||||
"ignore_missing_services": "IgnoreMissingServices",
|
||||
"pptc": "EnablePtc",
|
||||
"resolution_scale": "ResScale",
|
||||
"shader_cache": "EnableShaderCache",
|
||||
"vsync": "EnableVsync",
|
||||
}
|
||||
try:
|
||||
self.embed[setting_name] = get_setting(
|
||||
setting_name, setting_map[setting_name], log_file=log_file
|
||||
)
|
||||
except (AttributeError, IndexError) as error:
|
||||
print(
|
||||
f"Settings exception: {setting_name}: {type(error).__name__}"
|
||||
)
|
||||
continue
|
||||
# Game name parsed last so that user settings are visible with empty log
|
||||
self.embed["game_info"]["game_name"] = (
|
||||
re.search(
|
||||
r"Loader LoadNca: Application Loaded:\s([^;\n\r]*)",
|
||||
log_file,
|
||||
re.MULTILINE,
|
||||
)
|
||||
.group(1)
|
||||
.rstrip()
|
||||
)
|
||||
|
||||
def analyse_error_message(log_file=log_file):
|
||||
try:
|
||||
errors = []
|
||||
curr_error_lines = []
|
||||
for line in log_file.splitlines():
|
||||
if line == "":
|
||||
continue
|
||||
if "|E|" in line:
|
||||
curr_error_lines = [line]
|
||||
errors.append(curr_error_lines)
|
||||
elif line[0] == " " or line == "":
|
||||
curr_error_lines.append(line)
|
||||
|
||||
def error_search(search_terms):
|
||||
for term in search_terms:
|
||||
for error_lines in errors:
|
||||
line = "\n".join(error_lines)
|
||||
if term in line:
|
||||
return True
|
||||
|
||||
return False
|
||||
|
||||
shader_cache_collision = error_search(["Cache collision found"])
|
||||
dump_hash_warning = error_search(["ResultFsInvalidIvfcHash"])
|
||||
shader_cache_corruption = error_search(
|
||||
[
|
||||
"""Object reference not set to an instance of an object.
|
||||
at Ryujinx.Graphics.Gpu.Shader.ShaderCache.Initialize()""",
|
||||
"System.IO.InvalidDataException: End of Central Directory record could not be found",
|
||||
]
|
||||
)
|
||||
last_errors = "\n".join(
|
||||
errors[-1][:2] if "|E|" in errors[-1][0] else ""
|
||||
)
|
||||
except IndexError:
|
||||
last_errors = None
|
||||
return (
|
||||
last_errors,
|
||||
shader_cache_collision,
|
||||
dump_hash_warning,
|
||||
shader_cache_corruption,
|
||||
)
|
||||
|
||||
# Finds the lastest error denoted by |E| in the log and its first line
|
||||
# Also warns of common issues
|
||||
(
|
||||
last_error_snippet,
|
||||
shader_cache_warn,
|
||||
dump_hash_warning,
|
||||
shader_cache_corruption_warn,
|
||||
) = analyse_error_message()
|
||||
if last_error_snippet:
|
||||
self.embed["game_info"]["errors"] = f"```{last_error_snippet}```"
|
||||
else:
|
||||
pass
|
||||
# Game name parsed last so that user settings are visible with empty log
|
||||
self.embed["game_info"]["game_name"] = (
|
||||
re.search(
|
||||
r"Loader LoadNca: Application Loaded:\s([^;\n\r]*)",
|
||||
log_file,
|
||||
re.MULTILINE,
|
||||
)
|
||||
.group(1)
|
||||
.rstrip()
|
||||
)
|
||||
|
||||
if shader_cache_warn:
|
||||
shader_cache_warn = f"⚠️ Cache collision detected. Investigate possible shader cache issues"
|
||||
self.embed["game_info"]["notes"].append(shader_cache_warn)
|
||||
|
||||
if shader_cache_corruption_warn:
|
||||
shader_cache_corruption_warn = f"⚠️ Cache corruption detected. Investigate possible shader cache issues"
|
||||
self.embed["game_info"]["notes"].append(
|
||||
shader_cache_corruption_warn
|
||||
)
|
||||
|
||||
if dump_hash_warning:
|
||||
dump_hash_warning = f"⚠️ Dump error detected. Investigate possible bad game/firmware dump issues"
|
||||
self.embed["game_info"]["notes"].append(dump_hash_warning)
|
||||
|
||||
timestamp_regex = re.compile(r"\d{2}:\d{2}:\d{2}\.\d{3}")
|
||||
latest_timestamp = re.findall(timestamp_regex, log_file)[-1]
|
||||
if latest_timestamp:
|
||||
timestamp_message = f"ℹ️ Time elapsed in log: `{latest_timestamp}`"
|
||||
self.embed["game_info"]["notes"].append(timestamp_message)
|
||||
|
||||
def mods_information(log_file=log_file):
|
||||
mods_regex = re.compile(r"Found mod\s\'(.+?)\'\s(\[.+?\])")
|
||||
matches = re.findall(mods_regex, log_file)
|
||||
if matches:
|
||||
mods = [
|
||||
{"mod": match[0], "status": match[1]} for match in matches
|
||||
]
|
||||
mods_status = [
|
||||
f"ℹ️ {i['mod']} ({'ExeFS' if i['status'] == '[E]' else 'RomFS'})"
|
||||
for i in mods
|
||||
]
|
||||
return mods_status
|
||||
|
||||
# Find information on installed mods
|
||||
game_mods = mods_information()
|
||||
if game_mods:
|
||||
self.embed["game_info"]["mods"] = "\n".join(game_mods)
|
||||
else:
|
||||
pass
|
||||
|
||||
controllers_regex = re.compile(r"Hid Configure: ([^\r\n]+)")
|
||||
controllers = re.findall(controllers_regex, log_file)
|
||||
if controllers:
|
||||
input_status = [f"ℹ {match}" for match in controllers]
|
||||
# Hid Configure lines can appear multiple times, so converting to dict keys removes duplicate entries,
|
||||
# also maintains the list order
|
||||
input_status = list(dict.fromkeys(input_status))
|
||||
input_string = "\n".join(input_status)
|
||||
else:
|
||||
input_string = "⚠️ No controller information found"
|
||||
self.embed["game_info"]["notes"].append(input_string)
|
||||
|
||||
try:
|
||||
ram_available_regex = re.compile(r"Available\s(\d+)(?=\sMB)")
|
||||
ram_available = re.search(ram_available_regex, log_file)[1]
|
||||
if int(ram_available) < 8000:
|
||||
ram_warning = (
|
||||
f"⚠️ Less than 8GB RAM available ({str(ram_available)} MB)"
|
||||
)
|
||||
self.embed["game_info"]["notes"].append(ram_warning)
|
||||
except TypeError:
|
||||
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 "Intel" in self.embed["hardware_info"]["gpu"]:
|
||||
if (
|
||||
"Darwin" in self.embed["hardware_info"]["os"]
|
||||
or "Windows" in self.embed["hardware_info"]["os"]
|
||||
):
|
||||
intel_gpu_warning = "**⚠️ Intel iGPUs are known to have driver issues, consider using a discrete GPU**"
|
||||
self.embed["game_info"]["notes"].append(intel_gpu_warning)
|
||||
try:
|
||||
# Find information on logs, whether defaults are enabled or not
|
||||
default_logs = ["Info", "Warning", "Error", "Guest", "Stub"]
|
||||
user_logs = (
|
||||
self.embed["emu_info"]["logs_enabled"]
|
||||
.rstrip()
|
||||
.replace(" ", "")
|
||||
.split(",")
|
||||
)
|
||||
disabled_logs = set(default_logs).difference(set(user_logs))
|
||||
if disabled_logs:
|
||||
logs_status = [
|
||||
f"⚠️ {log} log is not enabled" for log in disabled_logs
|
||||
]
|
||||
log_string = "\n".join(logs_status)
|
||||
else:
|
||||
log_string = "✅ Default logs enabled"
|
||||
self.embed["game_info"]["notes"].append(log_string)
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
if self.embed["emu_info"]["ryu_firmware"] == "Unknown":
|
||||
firmware_warning = f"**❌ Nintendo Switch firmware not found**"
|
||||
self.embed["game_info"]["notes"].append(firmware_warning)
|
||||
|
||||
mainline_version = re.compile(r"^\d\.\d\.(\d){4}$")
|
||||
pr_version = re.compile(r"^\d\.\d\.\d\+([a-f]|\d){7}$")
|
||||
ldn_version = re.compile(r"^\d\.\d\.\d\-ldn\d\.\d$")
|
||||
|
||||
if (
|
||||
message.channel.id == config.bot_log_allowed_channels["support"]
|
||||
or message.channel.id
|
||||
== config.bot_log_allowed_channels["patreon-support"]
|
||||
or message.channel.id
|
||||
== config.bot_log_allowed_channels["linux-master-race"]
|
||||
):
|
||||
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']}>**"
|
||||
self.embed["game_info"]["notes"].append(pr_version_warning)
|
||||
|
||||
if not (
|
||||
re.match(
|
||||
mainline_version, self.embed["emu_info"]["ryu_version"]
|
||||
)
|
||||
or re.match(ldn_version, self.embed["emu_info"]["ryu_version"])
|
||||
or re.match(pr_version, self.embed["emu_info"]["ryu_version"])
|
||||
or re.match("Unknown", self.embed["emu_info"]["ryu_version"])
|
||||
):
|
||||
custom_firmware_warning = (
|
||||
"**⚠️ Custom builds are not officially supported**"
|
||||
)
|
||||
self.embed["game_info"]["notes"].append(custom_firmware_warning)
|
||||
|
||||
def severity(log_note_string):
|
||||
symbols = ["❌", "⚠️", "ℹ", "✅"]
|
||||
return next(
|
||||
i
|
||||
for i, symbol in enumerate(symbols)
|
||||
if symbol in log_note_string
|
||||
)
|
||||
|
||||
game_notes = [note for note in self.embed["game_info"]["notes"]]
|
||||
# Warnings split on the string after the warning symbol for alphabetical ordering
|
||||
# Severity key then orders alphabetically sorted warnings to show most severe first
|
||||
ordered_game_notes = sorted(
|
||||
sorted(game_notes, key=lambda x: x.split()[1]), key=severity
|
||||
)
|
||||
return ordered_game_notes
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
get_hardware_info()
|
||||
get_ryujinx_info()
|
||||
game_notes = analyse_log()
|
||||
|
||||
return format_log_embed()
|
||||
|
||||
@Cog.listener()
|
||||
async def on_message(self, message):
|
||||
await self.bot.wait_until_ready()
|
||||
if message.author.bot:
|
||||
return
|
||||
try:
|
||||
author_mention = message.author.mention
|
||||
filename = message.attachments[0].filename
|
||||
# Any message over 2000 chars is uploaded as message.txt, so this is accounted for
|
||||
ryujinx_log_file_regex = re.compile(r"^Ryujinx_.*\.log|message\.txt$")
|
||||
log_file = re.compile(r"^.*\.log|.*\.txt$")
|
||||
is_ryujinx_log_file = re.match(ryujinx_log_file_regex, filename)
|
||||
is_log_file = re.match(log_file, filename)
|
||||
|
||||
if (
|
||||
message.channel.id in self.bot_log_allowed_channels.values()
|
||||
and is_ryujinx_log_file
|
||||
):
|
||||
if filename not in self.uploaded_log_filenames:
|
||||
reply_message = await message.channel.send(
|
||||
"Log detected, parsing..."
|
||||
)
|
||||
try:
|
||||
embed = await self.log_file_read(message)
|
||||
if "Ryujinx_" in filename:
|
||||
self.uploaded_log_filenames.append(filename)
|
||||
# Avoid duplicate log file analysis, at least temporarily; keep track of the last few filenames of uploaded logs
|
||||
# this should help support channels not be flooded with too many log files
|
||||
# fmt: off
|
||||
self.uploaded_log_filenames = self.uploaded_log_filenames[-5:]
|
||||
# fmt: on
|
||||
return await reply_message.edit(content=None, embed=embed)
|
||||
except UnicodeDecodeError:
|
||||
return await message.channel.send(
|
||||
f"This log file appears to be invalid {author_mention}. Please re-check and re-upload your log file."
|
||||
)
|
||||
except Exception as error:
|
||||
await reply_message.edit(
|
||||
content=f"Error: Couldn't parse log; parser threw {type(error).__name__} exception."
|
||||
)
|
||||
print(logging.warn(error))
|
||||
else:
|
||||
await message.channel.send(
|
||||
f"The log file `{filename}` appears to be a duplicate {author_mention}. Please upload a more recent file."
|
||||
)
|
||||
elif (
|
||||
is_log_file
|
||||
and not is_ryujinx_log_file
|
||||
and message.channel.id in self.bot_log_allowed_channels.values()
|
||||
):
|
||||
return await message.channel.send(
|
||||
f"{author_mention} Your file does not match the Ryujinx log format. Please check your file."
|
||||
)
|
||||
elif (
|
||||
is_log_file
|
||||
and not message.channel.id in self.bot_log_allowed_channels.values()
|
||||
):
|
||||
return await message.author.send(
|
||||
"\n".join(
|
||||
(
|
||||
f"{author_mention} 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["patreon-support"]}>: Help and troubleshooting for Patreon subscribers',
|
||||
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["linux-master-race"]}>: Linux support and discussion',
|
||||
)
|
||||
)
|
||||
)
|
||||
except IndexError:
|
||||
pass
|
||||
|
||||
|
||||
def setup(bot):
|
||||
bot.add_cog(LogFileReader(bot))
|
|
@ -588,12 +588,6 @@ class Mod(Cog):
|
|||
if warn_count == 2:
|
||||
msg += " __The next warn will automatically kick.__"
|
||||
if warn_count == 3:
|
||||
msg += (
|
||||
"\n\nYou were kicked because of this warning. "
|
||||
"You can join again right away. "
|
||||
"Two more warnings will result in an automatic ban."
|
||||
)
|
||||
if warn_count == 4:
|
||||
msg += (
|
||||
"\n\nYou were kicked because of this warning. "
|
||||
"This is your final warning. "
|
||||
|
@ -601,8 +595,8 @@ class Mod(Cog):
|
|||
"**one more warn will result in a ban**."
|
||||
)
|
||||
chan_msg += "**This resulted in an auto-kick.**\n"
|
||||
if warn_count == 5:
|
||||
msg += "\n\nYou were automatically banned due to five warnings."
|
||||
if warn_count == 4:
|
||||
msg += "\n\nYou were automatically banned due to four warnings."
|
||||
chan_msg += "**This resulted in an auto-ban.**\n"
|
||||
try:
|
||||
await target.send(msg)
|
||||
|
@ -610,9 +604,9 @@ class Mod(Cog):
|
|||
# Prevents log issues in cases where user blocked bot
|
||||
# or has DMs disabled
|
||||
pass
|
||||
if warn_count == 3 or warn_count == 4:
|
||||
if warn_count == 3:
|
||||
await target.kick()
|
||||
if warn_count >= 5: # just in case
|
||||
if warn_count >= 4: # just in case
|
||||
await target.ban(reason="exceeded warn limit", delete_message_days=0)
|
||||
await ctx.send(
|
||||
f"{target.mention} warned. " f"User has {warn_count} warning(s)."
|
||||
|
|
94
robocop_ng/cogs/ryujinx_verification.py
Normal file
94
robocop_ng/cogs/ryujinx_verification.py
Normal file
|
@ -0,0 +1,94 @@
|
|||
import discord
|
||||
from discord.ext import commands
|
||||
from discord.ext.commands import Cog
|
||||
import config
|
||||
import random
|
||||
from helpers.checks import check_if_staff
|
||||
|
||||
|
||||
class RyujinxVerification(Cog):
|
||||
def __init__(self, bot):
|
||||
self.bot = bot
|
||||
|
||||
# Export reset channel functions
|
||||
self.bot.do_reset = self.do_reset
|
||||
self.bot.do_resetalgo = self.do_resetalgo
|
||||
|
||||
@Cog.listener()
|
||||
async def on_member_join(self, member):
|
||||
await self.bot.wait_until_ready()
|
||||
|
||||
if (member.guild.id not in config.guild_whitelist):
|
||||
return
|
||||
|
||||
join_channel = self.bot.get_channel(config.welcome_channel)
|
||||
|
||||
if join_channel is not None:
|
||||
await join_channel.send('Hello {0.mention}! Welcome to Ryujinx! Please read the <#411271165429022730>, and then type the verifying command here to gain access to the rest of the channels.\n\nIf you need help with basic common questions, visit the <#585288848704143371> channel after joining.\n\nIf you need help with Animal Crossing visit the <#692104087889641472> channel for common issues and solutions. If you need help that is not Animal Crossing related, please visit the <#410208610455519243> channel after verifying.'.format(member))
|
||||
|
||||
async def process_message(self, message):
|
||||
"""Process the verification process"""
|
||||
if message.channel.id == config.welcome_channel:
|
||||
# Assign common stuff into variables to make stuff less of a mess
|
||||
mcl = message.content.lower()
|
||||
|
||||
# Get the role we will give in case of success
|
||||
success_role = message.guild.get_role(config.participant_role)
|
||||
|
||||
if config.verification_string == mcl:
|
||||
await message.author.add_roles(success_role)
|
||||
await message.delete()
|
||||
|
||||
@Cog.listener()
|
||||
async def on_message(self, message):
|
||||
if message.author.bot:
|
||||
return
|
||||
|
||||
try:
|
||||
await self.process_message(message)
|
||||
except discord.errors.Forbidden:
|
||||
chan = self.bot.get_channel(message.channel)
|
||||
await chan.send("💢 I don't have permission to do this.")
|
||||
|
||||
@Cog.listener()
|
||||
async def on_message_edit(self, before, after):
|
||||
if after.author.bot:
|
||||
return
|
||||
|
||||
try:
|
||||
await self.process_message(after)
|
||||
except discord.errors.Forbidden:
|
||||
chan = self.bot.get_channel(after.channel)
|
||||
await chan.send("💢 I don't have permission to do this.")
|
||||
|
||||
@Cog.listener()
|
||||
async def on_member_join(self, member):
|
||||
await self.bot.wait_until_ready()
|
||||
|
||||
if (member.guild.id not in config.guild_whitelist):
|
||||
return
|
||||
|
||||
join_channel = self.bot.get_channel(config.welcome_channel)
|
||||
|
||||
if join_channel is not None:
|
||||
await join_channel.send(config.join_message.format(member))
|
||||
|
||||
@commands.check(check_if_staff)
|
||||
@commands.command()
|
||||
async def reset(self, ctx, limit: int = 100, force: bool = False):
|
||||
"""Wipes messages and pastes the welcome message again. Staff only."""
|
||||
if ctx.message.channel.id != config.welcome_channel and not force:
|
||||
await ctx.send(f"This command is limited to"
|
||||
f" <#{config.welcome_channel}>, unless forced.")
|
||||
return
|
||||
await self.do_reset(ctx.channel, ctx.author.mention, limit)
|
||||
|
||||
async def do_reset(self, channel, author, limit: int = 100):
|
||||
await channel.purge(limit=limit)
|
||||
|
||||
async def do_resetalgo(self, channel, author, limit: int = 100):
|
||||
# We only auto clear the channel daily
|
||||
await self.do_reset(channel, author)
|
||||
|
||||
def setup(bot):
|
||||
bot.add_cog(RyujinxVerification(bot))
|
|
@ -51,6 +51,10 @@ initial_cogs = [
|
|||
# and sends pins above limit to a github gist
|
||||
|
||||
|
||||
# The string that users need to say to get past verification
|
||||
verification_string = "go read the rules, not the code"
|
||||
|
||||
|
||||
# Minimum account age required to join the guild
|
||||
# If user's account creation is shorter than the time delta given here
|
||||
# then user will be kicked and informed
|
||||
|
|
Loading…
Reference in a new issue