From 48b982793ef7b28eb407da77fe84d970d5a9fe7f Mon Sep 17 00:00:00 2001 From: nex Date: Sat, 12 Aug 2023 14:05:09 +0100 Subject: [PATCH] Change mine-diamonds.opus to mine-diamonds.ogg --- .../{mine-diamonds.opus => mine-diamonds.ogg} | Bin 3491333 -> 3491332 bytes cogs/events.py | 19 ++++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) rename assets/{mine-diamonds.opus => mine-diamonds.ogg} (99%) diff --git a/assets/mine-diamonds.opus b/assets/mine-diamonds.ogg similarity index 99% rename from assets/mine-diamonds.opus rename to assets/mine-diamonds.ogg index 25e327d277428442cc62559981db81069d2f5b73..5e3b9d1f559a143a0a71e64537b592912a65faad 100644 GIT binary patch delta 6340 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 diff --git a/cogs/events.py b/cogs/events.py index 5c87777..4ca9026 100644 --- a/cogs/events.py +++ b/cogs/events.py @@ -390,7 +390,7 @@ class Events(commands.Cog): }, r"[s5]+(m)+[e3]+[g9]+": { # "func": send_smeg, - "file": lambda: discord.File(random.choice(list((assets/ "smeg").iterdir()))), + "file": lambda: discord.File(random.choice(list((assets / "smeg").iterdir()))), "delete_after": 30, "meta": { "sub": { @@ -411,9 +411,9 @@ class Events(commands.Cog): "delete_after": None }, r"mine(ing|d)? (diamonds|away)": { - "func": play_voice(assets / "mine-diamonds.opus"), + "func": play_voice(assets / "mine-diamonds.ogg"), "meta": { - "check": (assets / "mine-diamonds.opus").exists + "check": (assets / "mine-diamonds.ogg").exists } }, r"v[ei]r[mg]in(\sme(d|m[a]?)ia\W*)?(\W\w*\W*)?$": { @@ -512,6 +512,9 @@ class Events(commands.Cog): data[k] = await v() elif callable(v): data[k] = v() + if data.get("file") is not None: + if not isinstance(data["file"], discord.File): + data["file"] = discord.File(data["file"]) data.setdefault("delete_after", 30) await message.channel.trigger_typing() await message.reply(**data) @@ -624,13 +627,13 @@ class Events(commands.Cog): content += "\n\n" _status = { - "Resolved": discord.Color.green(), - "Investigating": discord.Color.dark_orange(), - "Identified": discord.Color.orange(), - "Monitoring": discord.Color.blurple(), + "resolved": discord.Color.green(), + "investigating": discord.Color.dark_orange(), + "identified": discord.Color.orange(), + "monitoring": discord.Color.blurple(), } - colour = _status.get(content.splitlines()[1].split(" - ")[0].title(), discord.Color.greyple()) + colour = _status.get(content.splitlines()[1].split(" - ")[0].lower(), discord.Color.greyple()) if len(content) > 4096: content = f"[open on discordstatus.com (too large to display)]({entry.link['href']})"