forked from gooberinc/goober
added permission wrapper
This commit is contained in:
parent
f7042ed8a7
commit
f186e079da
29 changed files with 860 additions and 788 deletions
319
bot.py
319
bot.py
|
|
@ -7,12 +7,23 @@ import traceback
|
|||
import subprocess
|
||||
import tempfile
|
||||
import shutil
|
||||
import uuid
|
||||
import asyncio
|
||||
import sys
|
||||
from typing import List, Dict, Literal, Set, Optional, Tuple, Any, TypedDict, Union, Callable, Coroutine, TypeVar, Type
|
||||
from typing import (
|
||||
List,
|
||||
Dict,
|
||||
Literal,
|
||||
Set,
|
||||
Optional,
|
||||
Tuple,
|
||||
Any,
|
||||
TypedDict,
|
||||
Union,
|
||||
Callable,
|
||||
Coroutine,
|
||||
TypeVar,
|
||||
Type,
|
||||
)
|
||||
import logging
|
||||
from modules.globalvars import *
|
||||
from modules.prestartchecks import start_checks
|
||||
from modules.logger import GooberFormatter
|
||||
import modules.keys as k
|
||||
|
|
@ -21,9 +32,18 @@ import logging
|
|||
from watchdog.observers import Observer
|
||||
from watchdog.events import FileSystemEventHandler
|
||||
from modules.settings import Settings as SettingsManager
|
||||
from modules.permission import requires_admin
|
||||
|
||||
|
||||
def build_keys():
|
||||
key_compiler.build_result("en", "assets/locales", types=True, output_path="modules/keys.py", generate_comments=True)
|
||||
key_compiler.build_result(
|
||||
"en",
|
||||
"assets/locales",
|
||||
types=True,
|
||||
output_path="modules/keys.py",
|
||||
generate_comments=True,
|
||||
)
|
||||
|
||||
|
||||
build_keys()
|
||||
|
||||
|
|
@ -52,29 +72,21 @@ with open(settings["splash_text_loc"], "r", encoding="UTF-8") as f:
|
|||
|
||||
start_checks()
|
||||
|
||||
import requests
|
||||
import discord
|
||||
from discord.ext import commands
|
||||
from discord import app_commands
|
||||
from discord import Colour, Embed, File, Interaction, Message
|
||||
from discord.abc import Messageable
|
||||
from discord import Colour, Message
|
||||
|
||||
from better_profanity import profanity
|
||||
from discord.ext import commands
|
||||
|
||||
from modules.markovmemory import *
|
||||
from modules.version import *
|
||||
from modules.sentenceprocessing import *
|
||||
from modules.unhandledexception import handle_exception
|
||||
from modules.image import gen_meme, gen_demotivator
|
||||
from modules.image import gen_demotivator
|
||||
|
||||
sys.excepthook = handle_exception
|
||||
check_for_update() # Check for updates (from modules/version.py)
|
||||
|
||||
# Type aliases
|
||||
T = TypeVar('T')
|
||||
MessageContext = Union[commands.Context, discord.Interaction]
|
||||
MessageReference = Union[Message, discord.WebhookMessage]
|
||||
|
||||
class MessageMetadata(TypedDict):
|
||||
user_id: str
|
||||
|
|
@ -86,6 +98,7 @@ class MessageMetadata(TypedDict):
|
|||
message: str
|
||||
timestamp: float
|
||||
|
||||
|
||||
# Constants with type hints
|
||||
positive_gifs: List[str] = settings["bot"]["misc"]["positive_gifs"]
|
||||
currenthash: str = ""
|
||||
|
|
@ -100,7 +113,9 @@ intents.message_content = True
|
|||
bot: commands.Bot = commands.Bot(
|
||||
command_prefix=settings["bot"]["prefix"],
|
||||
intents=intents,
|
||||
allowed_mentions=discord.AllowedMentions(everyone=False, roles=False, users=False, replied_user=True)
|
||||
allowed_mentions=discord.AllowedMentions(
|
||||
everyone=False, roles=False, users=False, replied_user=True
|
||||
),
|
||||
)
|
||||
|
||||
# Load memory and Markov model for text generation
|
||||
|
|
@ -114,9 +129,10 @@ if not markov_model:
|
|||
generated_sentences: Set[str] = set()
|
||||
used_words: Set[str] = set()
|
||||
|
||||
|
||||
async def load_cogs_from_folder(bot: commands.Bot, folder_name="assets/cogs"):
|
||||
for filename in [file for file in os.listdir(folder_name) if file.endswith(".py")]:
|
||||
cog_name:str = filename[:-3]
|
||||
cog_name: str = filename[:-3]
|
||||
print(cog_name)
|
||||
|
||||
if cog_name not in settings["bot"]["enabled_cogs"]:
|
||||
|
|
@ -132,25 +148,17 @@ async def load_cogs_from_folder(bot: commands.Bot, folder_name="assets/cogs"):
|
|||
logger.error(f"{k.cog_fail()} {cog_name} {e}")
|
||||
traceback.print_exc()
|
||||
|
||||
async def send_alive_ping_periodically() -> None:
|
||||
while True:
|
||||
try:
|
||||
requests.post(f"{VERSION_URL}/aliveping", json={"name": settings["name"]})
|
||||
except Exception as e:
|
||||
logger.error(f"{k.error_sending_alive_ping(e)}{RESET} {e}")
|
||||
await asyncio.sleep(60)
|
||||
|
||||
# Event: Called when the bot is ready
|
||||
@bot.event
|
||||
async def on_ready() -> None:
|
||||
global launched
|
||||
global slash_commands_enabled
|
||||
global NAME
|
||||
|
||||
|
||||
folder_name: str = "cogs"
|
||||
if launched:
|
||||
return
|
||||
|
||||
|
||||
await load_cogs_from_folder(bot)
|
||||
try:
|
||||
synced: List[discord.app_commands.AppCommand] = await bot.tree.sync()
|
||||
|
|
@ -158,52 +166,64 @@ async def on_ready() -> None:
|
|||
slash_commands_enabled = True
|
||||
logger.info(k.started(settings["name"]))
|
||||
|
||||
bot.loop.create_task(send_alive_ping_periodically())
|
||||
except discord.errors.Forbidden as perm_error:
|
||||
logger.error(f"Permission error while syncing commands: {perm_error}")
|
||||
logger.error("Make sure the bot has the 'applications.commands' scope and is invited with the correct permissions.")
|
||||
logger.error(f"Permission error while syncing commands: {perm_error}")
|
||||
logger.error(
|
||||
"Make sure the bot has the 'applications.commands' scope and is invited with the correct permissions."
|
||||
)
|
||||
quit()
|
||||
except Exception as e:
|
||||
logger.error(f"{k.fail_commands_sync()} {e}")
|
||||
traceback.print_exc()
|
||||
quit()
|
||||
|
||||
|
||||
if not settings["bot"]["misc"]["active_song"]:
|
||||
return
|
||||
await bot.change_presence(activity=discord.Activity(type=discord.ActivityType.listening, name=settings["bot"]["misc"]["active_song"]))
|
||||
return
|
||||
await bot.change_presence(
|
||||
activity=discord.Activity(
|
||||
type=discord.ActivityType.listening,
|
||||
name=settings["bot"]["misc"]["active_song"],
|
||||
)
|
||||
)
|
||||
launched = True
|
||||
|
||||
|
||||
@bot.event
|
||||
async def on_command_error(ctx: commands.Context, error: commands.CommandError) -> None:
|
||||
from modules.unhandledexception import handle_exception
|
||||
|
||||
|
||||
if isinstance(error, commands.CommandInvokeError):
|
||||
original: Exception = error.original
|
||||
handle_exception(
|
||||
type(original), original, original.__traceback__,
|
||||
context=f"Command: {ctx.command} | User: {ctx.author}"
|
||||
type(original),
|
||||
original,
|
||||
original.__traceback__,
|
||||
context=f"Command: {ctx.command} | User: {ctx.author}",
|
||||
)
|
||||
else:
|
||||
handle_exception(
|
||||
type(error), error, error.__traceback__,
|
||||
context=f"Command: {ctx.command} | User: {ctx.author}"
|
||||
type(error),
|
||||
error,
|
||||
error.__traceback__,
|
||||
context=f"Command: {ctx.command} | User: {ctx.author}",
|
||||
)
|
||||
|
||||
|
||||
# Command: Retrain the Markov model from memory
|
||||
@requires_admin()
|
||||
@bot.hybrid_command(description=f"{k.command_desc_retrain()}")
|
||||
async def retrain(ctx: commands.Context) -> None:
|
||||
global markov_model
|
||||
|
||||
if ctx.author.id not in settings["bot"]["owner_ids"]:
|
||||
return
|
||||
|
||||
message_ref: discord.Message | None = await send_message(ctx, f"{k.command_markov_retrain()}")
|
||||
message_ref: discord.Message | None = await send_message(
|
||||
ctx, f"{k.command_markov_retrain()}"
|
||||
)
|
||||
if message_ref is None:
|
||||
logger.error("Failed to send message!")
|
||||
return
|
||||
|
||||
try:
|
||||
with open(settings["bot"]["active_memory"], 'r') as f:
|
||||
with open(settings["bot"]["active_memory"], "r") as f:
|
||||
memory: List[str] = json.load(f)
|
||||
except FileNotFoundError:
|
||||
await send_message(ctx, f"{k.command_markov_memory_not_found()}")
|
||||
|
|
@ -214,7 +234,9 @@ async def retrain(ctx: commands.Context) -> None:
|
|||
|
||||
data_size: int = len(memory)
|
||||
|
||||
processing_message_ref: discord.Message | None = await send_message(ctx, f"{k.command_markov_retraining(data_size)}")
|
||||
processing_message_ref: discord.Message | None = await send_message(
|
||||
ctx, f"{k.command_markov_retraining(data_size)}"
|
||||
)
|
||||
if processing_message_ref is None:
|
||||
logger.error("Couldnt find message processing message!")
|
||||
|
||||
|
|
@ -225,7 +247,13 @@ async def retrain(ctx: commands.Context) -> None:
|
|||
|
||||
logger.debug(f"Completed retraining in {round(time.time() - start_time,3)}s")
|
||||
|
||||
await send_message(ctx, f"{k.command_markov_retrain_successful(data_size)}", edit=True, message_reference=processing_message_ref)
|
||||
await send_message(
|
||||
ctx,
|
||||
f"{k.command_markov_retrain_successful(data_size)}",
|
||||
edit=True,
|
||||
message_reference=processing_message_ref,
|
||||
)
|
||||
|
||||
|
||||
# Command: Generate a sentence using the Markov model
|
||||
@bot.hybrid_command(description=f"{k.command_desc_talk()}")
|
||||
|
|
@ -250,16 +278,16 @@ async def talk(ctx: commands.Context, sentence_size: int = 5) -> None:
|
|||
break
|
||||
|
||||
if response:
|
||||
cleaned_response: str = re.sub(r'[^\w\s]', '', response).lower()
|
||||
coherent_response: str = rephrase_for_coherence(cleaned_response)
|
||||
if random.random() < 0.9 and is_positive(coherent_response):
|
||||
cleaned_response: str = re.sub(r"[^\w\s]", "", response).lower()
|
||||
coherent_response: str = rephrase_for_coherence(cleaned_response)
|
||||
if random.random() < 0.9 and is_positive(coherent_response):
|
||||
gif_url: str = random.choice(positive_gifs)
|
||||
combined_message: str = f"{coherent_response}\n[jif]({gif_url})"
|
||||
else:
|
||||
combined_message: str = coherent_response
|
||||
logger.info(combined_message)
|
||||
|
||||
os.environ['gooberlatestgen'] = combined_message
|
||||
os.environ["gooberlatestgen"] = combined_message
|
||||
await send_message(ctx, combined_message)
|
||||
else:
|
||||
await send_message(ctx, f"{k.command_talk_generation_fail()}")
|
||||
|
|
@ -272,7 +300,11 @@ async def demotivator(ctx: commands.Context) -> None:
|
|||
temp_input: str | None = None
|
||||
|
||||
def get_random_asset_image() -> Optional[str]:
|
||||
files: List[str] = [f for f in os.listdir(assets_folder) if f.lower().endswith(('.png', '.jpg', '.jpeg', '.webp'))]
|
||||
files: List[str] = [
|
||||
f
|
||||
for f in os.listdir(assets_folder)
|
||||
if f.lower().endswith((".png", ".jpg", ".jpeg", ".webp"))
|
||||
]
|
||||
if not files:
|
||||
return None
|
||||
return os.path.join(assets_folder, random.choice(files))
|
||||
|
|
@ -315,79 +347,111 @@ async def demotivator(ctx: commands.Context) -> None:
|
|||
if temp_input and os.path.exists(temp_input):
|
||||
os.remove(temp_input)
|
||||
|
||||
bot.remove_command('help')
|
||||
|
||||
bot.remove_command("help")
|
||||
|
||||
|
||||
# Command: Show help information
|
||||
@bot.hybrid_command(description=f"{k.command_desc_help()}")
|
||||
async def help(ctx: commands.Context) -> None:
|
||||
embed: discord.Embed = discord.Embed(
|
||||
title=f"{k.command_help_embed_title()}",
|
||||
description=f"{k.command_help_embed_desc()}",
|
||||
color=Colour(0x000000)
|
||||
color=Colour(0x000000),
|
||||
)
|
||||
|
||||
command_categories: Dict[str, List[str]] = {
|
||||
f"{k.command_help_categories_general()}": ["mem", "talk", "about", "ping", "impact", "demotivator", "help"],
|
||||
f"{k.command_help_categories_admin()}": ["stats", "retrain", "setlanguage"]
|
||||
f"{k.command_help_categories_general()}": [
|
||||
"mem",
|
||||
"talk",
|
||||
"about",
|
||||
"ping",
|
||||
"impact",
|
||||
"demotivator",
|
||||
"help",
|
||||
],
|
||||
f"{k.command_help_categories_admin()}": ["stats", "retrain", "setlanguage"],
|
||||
}
|
||||
|
||||
custom_commands: List[str] = []
|
||||
for cog_name, cog in bot.cogs.items():
|
||||
for command in cog.get_commands():
|
||||
if command.name not in command_categories[f"{k.command_help_categories_general()}"] and command.name not in command_categories[f"{k.command_help_categories_admin()}"]:
|
||||
if (
|
||||
command.name
|
||||
not in command_categories[f"{k.command_help_categories_general()}"]
|
||||
and command.name
|
||||
not in command_categories[f"{k.command_help_categories_admin()}"]
|
||||
):
|
||||
custom_commands.append(command.name)
|
||||
|
||||
if custom_commands:
|
||||
embed.add_field(name=f"{k.command_help_categories_custom()}", value="\n".join([f"{settings["bot"]["prefix"]}{command}" for command in custom_commands]), inline=False)
|
||||
embed.add_field(
|
||||
name=f"{k.command_help_categories_custom()}",
|
||||
value="\n".join(
|
||||
[f"{settings["bot"]["prefix"]}{command}" for command in custom_commands]
|
||||
),
|
||||
inline=False,
|
||||
)
|
||||
|
||||
for category, commands_list in command_categories.items():
|
||||
commands_in_category: str = "\n".join([f"{settings["bot"]["prefix"]}{command}" for command in commands_list])
|
||||
commands_in_category: str = "\n".join(
|
||||
[f"{settings["bot"]["prefix"]}{command}" for command in commands_list]
|
||||
)
|
||||
embed.add_field(name=category, value=commands_in_category, inline=False)
|
||||
|
||||
await send_message(ctx, embed=embed)
|
||||
|
||||
|
||||
@requires_admin()
|
||||
@bot.hybrid_command(description=f"{k.command_desc_setlang()}")
|
||||
@app_commands.describe(locale="Choose your language")
|
||||
async def setlanguage(ctx: commands.Context, locale: str) -> None:
|
||||
if ctx.author.id not in settings["bot"]["owner_ids"]:
|
||||
await ctx.send(":thumbsdown:")
|
||||
return
|
||||
|
||||
await ctx.defer()
|
||||
k.change_language(locale)
|
||||
await ctx.send(":thumbsup:")
|
||||
|
||||
|
||||
# Event: Called on every message
|
||||
@bot.event
|
||||
async def on_message(message: discord.Message) -> None:
|
||||
global memory, markov_model
|
||||
EMOJIS = ["\U0001F604", "\U0001F44D", "\U0001F525", "\U0001F4AF", "\U0001F389", "\U0001F60E"] # originally was emojis but it would probably shit itself on systems without unicode so....
|
||||
EMOJIS = [
|
||||
"\U0001f604",
|
||||
"\U0001f44d",
|
||||
"\U0001f525",
|
||||
"\U0001f4af",
|
||||
"\U0001f389",
|
||||
"\U0001f60e",
|
||||
] # originally was emojis but it would probably shit itself on systems without unicode so....
|
||||
if message.author.bot:
|
||||
return
|
||||
|
||||
if str(message.author.id) in settings["bot"]["blacklisted_users"]:
|
||||
return
|
||||
|
||||
commands = [
|
||||
settings["bot"]["prefix"] + command.name for command in bot.tree.get_commands()
|
||||
]
|
||||
|
||||
commands = [settings["bot"]["prefix"] + command.name for command in bot.tree.get_commands()]
|
||||
|
||||
if message.content.startswith(tuple(commands)):
|
||||
logger.info(f"{k.command_ran(message.author.name, message.content)}")
|
||||
await bot.process_commands(message)
|
||||
return
|
||||
|
||||
if profanity.contains_profanity(message.content) and settings["bot"]["misc"]["block_profanity"]:
|
||||
if (
|
||||
profanity.contains_profanity(message.content)
|
||||
and settings["bot"]["misc"]["block_profanity"]
|
||||
):
|
||||
return
|
||||
|
||||
if message.content:
|
||||
if not settings["bot"]["user_training"]:
|
||||
return
|
||||
|
||||
|
||||
formatted_message: str = append_mentions_to_18digit_integer(message.content)
|
||||
cleaned_message: str = preprocess_message(formatted_message)
|
||||
if cleaned_message:
|
||||
memory.append(cleaned_message)
|
||||
|
||||
|
||||
|
||||
message_metadata: MessageMetadata = {
|
||||
"user_id": str(message.author.id),
|
||||
|
|
@ -397,7 +461,7 @@ async def on_message(message: discord.Message) -> None:
|
|||
"channel_id": str(message.channel.id),
|
||||
"channel_name": str(message.channel),
|
||||
"message": message.content,
|
||||
"timestamp": time.time()
|
||||
"timestamp": time.time(),
|
||||
}
|
||||
try:
|
||||
if isinstance(memory, list):
|
||||
|
|
@ -409,7 +473,9 @@ async def on_message(message: discord.Message) -> None:
|
|||
|
||||
save_memory(memory)
|
||||
|
||||
sentiment_score = is_positive(message.content) # doesnt work but im scared to change the logic now please ignore
|
||||
sentiment_score = is_positive(
|
||||
message.content
|
||||
) # doesnt work but im scared to change the logic now please ignore
|
||||
if sentiment_score > 0.8:
|
||||
if not settings["bot"]["react_to_messages"]:
|
||||
return
|
||||
|
|
@ -421,105 +487,133 @@ async def on_message(message: discord.Message) -> None:
|
|||
|
||||
await bot.process_commands(message)
|
||||
|
||||
|
||||
# Event: Called on every interaction (slash command, etc.)
|
||||
@bot.event
|
||||
async def on_interaction(interaction: discord.Interaction) -> None:
|
||||
logger.info(f"{k.command_ran_s(interaction.user.name)} {interaction.user.name}")
|
||||
|
||||
|
||||
# Global check: Block blacklisted users from running commands
|
||||
@bot.check
|
||||
async def block_blacklisted(ctx: commands.Context) -> bool:
|
||||
if str(ctx.author.id) in settings["bot"]["blacklisted_users"]:
|
||||
try:
|
||||
if isinstance(ctx, discord.Interaction):
|
||||
if not ctx.response.is_done():
|
||||
await ctx.response.send_message(k.blacklisted(), ephemeral=True)
|
||||
else:
|
||||
await ctx.followup.send(k.blacklisted(), ephemeral=True)
|
||||
if ctx.author.id not in settings["bot"]["blacklisted_users"]:
|
||||
return True
|
||||
|
||||
try:
|
||||
if isinstance(ctx, discord.Interaction):
|
||||
if not ctx.response.is_done():
|
||||
await ctx.response.send_message(k.blacklisted(), ephemeral=True)
|
||||
else:
|
||||
await ctx.send(k.blacklisted_user(), ephemeral=True)
|
||||
except:
|
||||
pass
|
||||
await ctx.followup.send(k.blacklisted(), ephemeral=True)
|
||||
else:
|
||||
await ctx.send(k.blacklisted_user(), ephemeral=True)
|
||||
except:
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
|
||||
# Command: Show bot latency
|
||||
@bot.hybrid_command(description=f"{k.command_desc_ping()}")
|
||||
async def ping(ctx: commands.Context) -> None:
|
||||
await ctx.defer()
|
||||
latency: int = round(bot.latency * 1000)
|
||||
|
||||
LOLembed: discord.Embed = discord.Embed(
|
||||
embed: discord.Embed = discord.Embed(
|
||||
title="Pong!!",
|
||||
description=(
|
||||
settings["bot"]["misc"]["ping_line"],
|
||||
f"`{k.command_ping_embed_desc()}: {latency}ms`\n"
|
||||
f"`{k.command_ping_embed_desc()}: {latency}ms`\n",
|
||||
),
|
||||
color=Colour(0x000000)
|
||||
color=Colour(0x000000),
|
||||
)
|
||||
embed.set_footer(
|
||||
text=f"{k.command_ping_footer()} {ctx.author.name}",
|
||||
icon_url=ctx.author.display_avatar.url,
|
||||
)
|
||||
LOLembed.set_footer(text=f"{k.command_ping_footer()} {ctx.author.name}", icon_url=ctx.author.display_avatar.url)
|
||||
|
||||
await ctx.send(embed=LOLembed)
|
||||
await ctx.send(embed=embed)
|
||||
|
||||
|
||||
# Command: Show about information
|
||||
@bot.hybrid_command(description=f"{k.command_about_desc()}")
|
||||
async def about(ctx: commands.Context) -> None:
|
||||
print("-----------------------------------\n\n")
|
||||
latest_version: str = str(check_for_update())
|
||||
print("-----------------------------------")
|
||||
embed: discord.Embed = discord.Embed(title=f"{k.command_about_embed_title()}", description="", color=Colour(0x000000))
|
||||
embed: discord.Embed = discord.Embed(
|
||||
title=f"{k.command_about_embed_title()}", description="", color=Colour(0x000000)
|
||||
)
|
||||
|
||||
embed.add_field(name=k.command_about_embed_field1(), value=f"{settings["name"]}", inline=False)
|
||||
embed.add_field(
|
||||
name=k.command_about_embed_field1(), value=f"{settings["name"]}", inline=False
|
||||
)
|
||||
|
||||
embed.add_field(
|
||||
name=k.command_about_embed_field2name(),
|
||||
value=k.command_about_embed_field2value(
|
||||
local_version=local_version, latest_version=latest_version
|
||||
),
|
||||
inline=False
|
||||
inline=False,
|
||||
)
|
||||
|
||||
embed.add_field(name="Github", value=f"https://github.com/gooberinc/goober")
|
||||
|
||||
|
||||
await send_message(ctx, embed=embed)
|
||||
|
||||
# Command: Show bot statistics (admin only)
|
||||
|
||||
@requires_admin()
|
||||
@bot.hybrid_command(description="stats")
|
||||
async def stats(ctx: commands.Context) -> None:
|
||||
if ctx.author.id not in settings["bot"]["owner_ids"]:
|
||||
return
|
||||
print("-----------------------------------\n\n")
|
||||
latest_version: str = str(check_for_update())
|
||||
print("-----------------------------------")
|
||||
memory_file: str = 'memory.json'
|
||||
memory_file: str = "memory.json"
|
||||
file_size: int = os.path.getsize(memory_file)
|
||||
|
||||
with open(memory_file, 'r') as file:
|
||||
|
||||
with open(memory_file, "r") as file:
|
||||
line_count: int = sum(1 for _ in file)
|
||||
|
||||
embed: discord.Embed = discord.Embed(title=f"{k.command_stats_embed_title()}", description=f"{k.command_stats_embed_desc()}", color=Colour(0x000000))
|
||||
embed.add_field(name=f"{k.command_stats_embed_field1name()}", value=f"{k.command_stats_embed_field1value(file_size=file_size, line_count=line_count)}", inline=False)
|
||||
embed.add_field(name=f"{k.command_stats_embed_field2name()}", value=f"{k.command_stats_embed_field2value(local_version=local_version, latest_version=latest_version)}", inline=False)
|
||||
embed.add_field(name=f"{k.command_stats_embed_field3name()}", value=f"{k.command_stats_embed_field3value(
|
||||
embed: discord.Embed = discord.Embed(
|
||||
title=f"{k.command_stats_embed_title()}",
|
||||
description=f"{k.command_stats_embed_desc()}",
|
||||
color=Colour(0x000000),
|
||||
)
|
||||
embed.add_field(
|
||||
name=f"{k.command_stats_embed_field1name()}",
|
||||
value=f"{k.command_stats_embed_field1value(file_size=file_size, line_count=line_count)}",
|
||||
inline=False,
|
||||
)
|
||||
embed.add_field(
|
||||
name=f"{k.command_stats_embed_field2name()}",
|
||||
value=f"{k.command_stats_embed_field2value(local_version=local_version, latest_version=latest_version)}",
|
||||
inline=False,
|
||||
)
|
||||
embed.add_field(
|
||||
name=f"{k.command_stats_embed_field3name()}",
|
||||
value=f"{k.command_stats_embed_field3value(
|
||||
NAME=settings["name"], PREFIX=settings["bot"]["prefix"], ownerid=settings["bot"]["owner_ids"][0],
|
||||
PING_LINE=settings["bot"]["misc"]["ping_line"], showmemenabled=settings["bot"]["allow_show_mem_command"],
|
||||
USERTRAIN_ENABLED=settings["bot"]["user_training"], song=settings["bot"]["misc"]["active_song"],
|
||||
splashtext=splash_text
|
||||
)}", inline=False)
|
||||
)}",
|
||||
inline=False,
|
||||
)
|
||||
|
||||
await send_message(ctx, embed=embed)
|
||||
|
||||
|
||||
# Command: Upload memory.json to litterbox.catbox.moe and return the link
|
||||
@bot.hybrid_command()
|
||||
async def mem(ctx: commands.Context) -> None:
|
||||
if not settings["bot"]["allow_show_mem_command"]:
|
||||
return
|
||||
|
||||
command: str = """curl -F "reqtype=fileupload" -F "time=1h" -F "fileToUpload=@memory.json" https://litterbox.catbox.moe/resources/internals/api.php"""
|
||||
memorylitter: subprocess.CompletedProcess = subprocess.run(command, shell=True, capture_output=True, text=True)
|
||||
|
||||
command: str = (
|
||||
"""curl -F "reqtype=fileupload" -F "time=1h" -F "fileToUpload=@memory.json" https://litterbox.catbox.moe/resources/internals/api.php"""
|
||||
)
|
||||
memorylitter: subprocess.CompletedProcess = subprocess.run(
|
||||
command, shell=True, capture_output=True, text=True
|
||||
)
|
||||
logger.debug(memorylitter)
|
||||
await send_message(ctx, memorylitter.stdout.strip())
|
||||
|
||||
|
||||
# Helper: Improve sentence coherence (simple capitalization fix)
|
||||
def improve_sentence_coherence(sentence: str) -> str:
|
||||
# Capitalizes "i" to "I" in the sentence
|
||||
|
|
@ -535,7 +629,7 @@ class OnMyWatch:
|
|||
|
||||
def run(self):
|
||||
event_handler = Handler()
|
||||
self.observer.schedule(event_handler, self.watchDirectory, recursive = True)
|
||||
self.observer.schedule(event_handler, self.watchDirectory, recursive=True)
|
||||
self.observer.start()
|
||||
try:
|
||||
while True:
|
||||
|
|
@ -552,10 +646,9 @@ class Handler(FileSystemEventHandler):
|
|||
if event.is_directory:
|
||||
return None
|
||||
|
||||
elif event.event_type == 'modified':
|
||||
elif event.event_type == "modified":
|
||||
build_keys()
|
||||
|
||||
|
||||
|
||||
# Start the bot
|
||||
bot.run(os.environ.get("DISCORD_BOT_TOKEN", ""))
|
||||
bot.run(os.environ.get("DISCORD_BOT_TOKEN", ""))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue