such cleanup

This commit is contained in:
2025-02-15 08:36:45 -05:00
parent d60828df07
commit 9d23438b13
12 changed files with 357 additions and 209 deletions

View File

@ -9,13 +9,14 @@ from typing import Optional
import discord
import requests
from discord.ext import bridge, commands
from disc_havoc import Havoc
import util
class Owner(commands.Cog):
"""Owner Cog for Havoc"""
def __init__(self, bot) -> None:
self.bot: discord.Bot = bot
self.former_roles_store: dict = {}
def __init__(self, bot: Havoc) -> None:
self.bot: Havoc = bot
self.former_roles_store: dict[int, list[discord.Role]] = {}
self._temperature: int = random.randrange(20, 30)
@bridge.bridge_command(guild_ids=[1145182936002482196])
@ -41,7 +42,7 @@ class Owner(commands.Cog):
return await ctx.respond("Too cold! (-15°C minimum)")
elif _temperature > 35:
return await ctx.respond("Too hot! (35°C maximum)")
self._temperature: int = _temperature
self._temperature = _temperature
return await ctx.respond(f"As per your request, I have adjusted the temperature to {_temperature} °C.")
@bridge.bridge_command()
@ -54,6 +55,7 @@ class Owner(commands.Cog):
Returns:
None
"""
self.bot.load_exts(False)
await ctx.respond("Reloaded!", ephemeral=True)
@ -70,20 +72,18 @@ class Owner(commands.Cog):
Returns:
None
"""
parameters: list[str] = parameters.split(" ")
_parameters: list[str] = parameters.split(" ")
if not len(parameters) > 1:
if not len(_parameters) > 1:
return await ctx.respond("**Error**: Incorrect command usage; required: <chan> <msg>", ephemeral=True)
channel: str = parameters[0]
channel_mentions: list[str] = discord.utils.raw_channel_mentions(channel)
channel: str = _parameters[0]
channel_mentions: list[int] = discord.utils.raw_channel_mentions(channel)
if channel_mentions:
channel: str = str(channel_mentions[0])
channel = str(channel_mentions[0])
msg: str = " ".join(parameters[1:])
sent = await util.discord_helpers.send_message(self.bot, channel=channel,
await util.discord_helpers.send_message(self.bot, channel=channel,
message=msg)
if not sent:
return await ctx.respond("**Failed.**", ephemeral=True)
return await ctx.respond("**Done.**", ephemeral=True)
@bridge.bridge_command()
@ -144,6 +144,8 @@ class Owner(commands.Cog):
None
"""
try:
if not isinstance(message.channel, discord.TextChannel):
return
memes_channel: discord.TextChannel = ctx.guild.get_channel(1147229098544988261)
message_content: str = message.content
message_author: str = message.author.display_name
@ -156,7 +158,9 @@ class Owner(commands.Cog):
timeout=20).raw.read())
ext: str = item.url.split(".")[-1]\
.split("?")[0].split("&")[0]
_file: discord.File = discord.File(image, filename=f'img.{ext}')
_file = discord.File(image, filename=f'img.{ext}')
if not _file:
return # No file to move
await memes_channel.send(f"*Performing bureaucratic duties (this didn't belong in #{message_channel})...*\n**{message_author}:** {message_content}", file=_file)
await message.delete()
await ctx.respond("OK!", ephemeral=True)
@ -176,6 +180,8 @@ class Owner(commands.Cog):
None
"""
try:
if not isinstance(message.channel, discord.TextChannel):
return
drugs_channel: discord.TextChannel = ctx.guild.get_channel(1172247451047034910)
message_content: str = message.content
message_author: str = message.author.display_name
@ -188,7 +194,9 @@ class Owner(commands.Cog):
timeout=20).raw.read())
ext: str = item.url.split(".")[-1]\
.split("?")[0].split("&")[0]
_file: discord.File = discord.File(image, filename=f'img.{ext}')
_file = discord.File(image, filename=f'img.{ext}')
if not _file:
return # No file to move
await drugs_channel.send(f"*Performing bureaucratic duties (this didn't belong in #{message_channel})...\
*\n**{message_author}:** {message_content}", file=_file)
await message.delete()
@ -209,6 +217,8 @@ class Owner(commands.Cog):
None
"""
try:
if not isinstance(message.channel, discord.TextChannel):
return
funhouse_channel: discord.TextChannel = ctx.guild.get_channel(1213160512364478607)
message_content: str = message.content
message_author: str = message.author.display_name
@ -221,7 +231,7 @@ class Owner(commands.Cog):
timeout=20).raw.read())
ext: str = item.url.split(".")[-1]\
.split("?")[0].split("&")[0]
_file: discord.File = discord.File(image, filename=f'img.{ext}')
_file = discord.File(image, filename=f'img.{ext}')
await funhouse_channel.send(f"*Performing bureaucratic duties (this didn't belong in #{message_channel})\
...*\n**{message_author}:** {message_content}")
await message.delete()
@ -244,12 +254,14 @@ class Owner(commands.Cog):
try:
if not ctx.guild.id == 1145182936002482196:
return # Not home server!
if not member.roles:
return # No roles
audit_reason: str = f"Einsperren von {ctx.user.display_name}"
member: discord.Member = ctx.guild.get_member(member.id)
member = ctx.guild.get_member(member.id)
member_display: str = member.display_name
einsperren_role: discord.Role = ctx.guild.get_role(1235415059300093973) if ctx.guild.id != 1145182936002482196\
else ctx.guild.get_role(1235406301614309386)
member_roles: list[discord.Role] = [role for role in member.roles if not role.name == "@everyone"]
member_roles: list = [role for role in member.roles if not role.name == "@everyone"]
member_role_names: list[str] = [str(role.name).lower() for role in member_roles]
opers_chan: discord.TextChannel = ctx.guild.get_channel(1181416083287187546)
if not "einsperren" in member_role_names:
@ -271,7 +283,7 @@ class Owner(commands.Cog):
if not member.id in self.former_roles_store:
await member.edit(roles=[]) # No roles
else:
former_roles: list[discord.Role] = self.former_roles_store.get(member.id)
former_roles: list = self.former_roles_store.get(member.id, [0])
await member.edit(roles=former_roles, reason=f"De-{audit_reason}")
await ctx.respond(f"{member_display} wurde von der Einsperre befreit.", ephemeral=True)