some cleanup on main
All checks were successful
Garfbot CI/CD Deployment / Deploy (push) Successful in 20s

This commit is contained in:
2025-06-04 02:33:37 -05:00
parent 0cb5f8fa38
commit d707398c26

View File

@ -25,6 +25,7 @@ garfbot = discord.Client(intents=intents)
garf_respond = GarfbotRespond() garf_respond = GarfbotRespond()
@garfbot.event @garfbot.event
async def on_ready(): async def on_ready():
try: try:
@ -34,33 +35,40 @@ async def on_ready():
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
@garfbot.event @garfbot.event
async def on_message(message): async def on_message(message):
content = message.content
content_lower = content.lower()
user = message.author.name
guild = message.guild.name if message.guild else "Direct Message"
guild_id = message.guild.id
# Chats & pics
if message.author == garfbot.user: if message.author == garfbot.user:
return return
if message.content.lower().startswith("hey garfield") or isinstance(message.channel, discord.DMChannel): if content_lower.startswith("hey garfield") or isinstance(message.channel, discord.DMChannel):
user = message.author.name question = content[12:] if content_lower.startswith("hey garfield") else message.content
server = message.guild.name if message.guild else "Direct Message"
question = message.content[12:] if message.content.lower().startswith("hey garfield") else message.content
answer = await generate_chat(question) answer = await generate_chat(question)
logger.info(f"Chat Request - User: {user}, Server: {server}, Prompt: {question}") logger.info(f"Chat Request - User: {user}, Server: {guild}, Prompt: {question}")
await message.channel.send(answer) await message.channel.send(answer)
if message.content.lower().startswith('garfpic '): if content_lower.startswith('garfpic '):
user = message.author.name prompt = content[8:]
server = message.guild.name if message.guild else "Direct Message" logger.info(f"Image Request - User: {user}, Server: {guild}, Prompt: {prompt}")
prompt = message.content[8:]
logger.info(f"Image Request - User: {user}, Server: {server}, Prompt: {prompt}")
await message.channel.send(f"`Please wait... image generation queued: {prompt}`") await message.channel.send(f"`Please wait... image generation queued: {prompt}`")
await garfpic(message, prompt) await garfpic(message, prompt)
if message.content.lower().startswith('garfwiki '): # Wikipedia
if content_lower.startswith('garfwiki '):
search_term = message.content[9:] search_term = message.content[9:]
summary = await wikisum(search_term) summary = await wikisum(search_term)
await message.channel.send(summary) await message.channel.send(summary)
if message.content.lower().startswith('garfqr '): # QR codes
if content_lower.startswith('garfqr '):
text = message.content[7:] text = message.content[7:]
if len(text) > 1000: if len(text) > 1000:
await message.channel.send("❌ Text too long! Maximum 1000 characters.") await message.channel.send("❌ Text too long! Maximum 1000 characters.")
@ -73,13 +81,13 @@ async def on_message(message):
logger.error(e) logger.error(e)
await message.channel.send(e) await message.channel.send(e)
if message.content.lower().startswith("garfping "): # IP utils
query = message.content.split()
target = query[-1]
if content_lower.startswith("garfping "):
try: try:
query = message.content.split() logger.info(f"Ping Request - User: {user}, Server: {guild}, Target: {target}")
user = message.author.name
server = message.guild.name if message.guild else "Direct Message"
target = query[-1]
logger.info(f"Ping Request - User: {user}, Server: {server}, Target: {target}")
if is_private(target): if is_private(target):
rejection = await generate_chat("Hey Garfield, explain to me why I am dumb for trying to hack your private computer network.") rejection = await generate_chat("Hey Garfield, explain to me why I am dumb for trying to hack your private computer network.")
await message.channel.send(rejection) await message.channel.send(rejection)
@ -89,13 +97,9 @@ async def on_message(message):
except Exception as e: except Exception as e:
await message.channel.send(f"`GarfBot Error: {str(e)}`") await message.channel.send(f"`GarfBot Error: {str(e)}`")
if message.content.lower().startswith("garfdns "): if content_lower.startswith("garfdns "):
try: try:
query = message.content.split() logger.info(f"NSLookup Request - User: {user}, Server: {guild}, Target: {target}")
user = message.author.name
server = message.guild.name if message.guild else "Direct Message"
target = query[-1]
logger.info(f"NSLookup Request - User: {user}, Server: {server}, Target: {target}")
if is_private(target): if is_private(target):
rejection = await generate_chat("Hey Garfield, explain to me why I am dumb for trying to hack your private computer network.") rejection = await generate_chat("Hey Garfield, explain to me why I am dumb for trying to hack your private computer network.")
await message.channel.send(rejection) await message.channel.send(rejection)
@ -105,13 +109,9 @@ async def on_message(message):
except Exception as e: except Exception as e:
await message.channel.send(f"`GarfBot Error: {str(e)}`") await message.channel.send(f"`GarfBot Error: {str(e)}`")
if message.content.lower().startswith("garfhack "): if content_lower.startswith("garfhack "):
try: try:
query = message.content.split() logger.info(f"Nmap Request - User: {user}, Server: {guild}, Target: {target}")
user = message.author.name
server = message.guild.name if message.guild else "Direct Message"
target = query[-1]
logger.info(f"Nmap Request - User: {user}, Server: {server}, Target: {target}")
if is_private(target): if is_private(target):
rejection = await generate_chat("Hey Garfield, explain to me why I am dumb for trying to hack your private computer network.") rejection = await generate_chat("Hey Garfield, explain to me why I am dumb for trying to hack your private computer network.")
await message.channel.send(rejection) await message.channel.send(rejection)
@ -123,7 +123,7 @@ async def on_message(message):
await message.channel.send(f"`GarfBot Error: {str(e)}`") await message.channel.send(f"`GarfBot Error: {str(e)}`")
# Kroger Shopping # Kroger Shopping
if message.content.lower().startswith("garfshop "): if content_lower.startswith("garfshop "):
try: try:
kroken = kroger_token() kroken = kroger_token()
kroger_query = message.content.split() kroger_query = message.content.split()
@ -150,12 +150,9 @@ async def on_message(message):
# Auto-responses # Auto-responses
if message.guild: if message.guild:
guild_id = message.guild.id
content = message.content
content_lower = content.lower()
responses = garf_respond.get_responses(guild_id) responses = garf_respond.get_responses(guild_id)
if message.content.lower().startswith('garfbot response '): if content_lower.startswith('garfbot response '):
await garf_respond.garfbot_response(message, content) await garf_respond.garfbot_response(message, content)
return return
@ -164,7 +161,7 @@ async def on_message(message):
await message.channel.send(response) await message.channel.send(response)
break break
# Run Garfbot
async def garfbot_connect(): async def garfbot_connect():
while True: while True:
try: try: