From e1707e789c8e9a09a2e7a90ce35f84ab0ece5dcc Mon Sep 17 00:00:00 2001
From: crate <crateimage@gmail.com>
Date: Sat, 7 Jun 2025 13:07:26 -0500
Subject: [PATCH] move help and update dockerfile

---
 Dockerfile         |  2 +-
 garfmain.py        | 58 ++------------------------------------------
 garfpy/__init__.py |  1 +
 garfpy/help.py     | 60 ++++++++++++++++++++++++++++++++++++++++++++++
 garfpy/weather.py  |  1 -
 5 files changed, 64 insertions(+), 58 deletions(-)
 create mode 100644 garfpy/help.py

diff --git a/Dockerfile b/Dockerfile
index a658fbf..e76b8cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.11.10-alpine
+FROM python:alpine
 WORKDIR /usr/src/app
 
 RUN apk update && \
diff --git a/garfmain.py b/garfmain.py
index 7cab5d3..feea18d 100644
--- a/garfmain.py
+++ b/garfmain.py
@@ -3,6 +3,7 @@ import asyncio
 import discord
 
 from garfpy import (
+    help,
     logger,
     IPUtils,
     aod_message,
@@ -117,62 +118,7 @@ async def on_message(message):
 
     # GarfBot help
     elif lower.strip() == "garfbot help":
-        embed = discord.Embed(title="**Need help?**", color=0x4D4D4D)
-        embed.add_field(
-            name="hey garfield `prompt`", value="*Responds with text.*", inline=True
-        )
-        embed.add_field(
-            name="garfpic `prompt`", value="*Responds with an image.*", inline=True
-        )
-        embed.add_field(
-            name="garfping `target`",
-            value="*Responds with iputils-ping result from target.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfdns `target`",
-            value="*Responds with dns lookup result from target.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfhack `target`",
-            value="*Responds with nmap scan result from target.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfwiki `query`",
-            value="*Garfbot looks up a wikipedia article and will summarize it for you.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfshop `item` `zip`",
-            value="*Responds with 10 grocery items from the nearest Kroger location, cheapest first.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfqr `text`",
-            value="*Create a QR code for any string up to 1000 characters.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfbot response `add` `trigger` `response`",
-            value='*Add a GarfBot auto response for your server. Use "quotes" if you like.*',
-            inline=True,
-        )
-        embed.add_field(
-            name="garfbot response `remove` `trigger`",
-            value="*Remove a GarfBot auto response for your server.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfbot response `list`",
-            value="*List current GarfBot auto responses for your server.*",
-            inline=True,
-        )
-        embed.add_field(
-            name="garfbot help", value="*Show a list of these commands.*", inline=True
-        )
-        await message.channel.send(embed=embed)
+        await help(message)
 
     # Army of Dawn Server only!!
     elif message.guild and message.guild.id == 719605634772893757:
diff --git a/garfpy/__init__.py b/garfpy/__init__.py
index 16147aa..3fe66a0 100644
--- a/garfpy/__init__.py
+++ b/garfpy/__init__.py
@@ -1,6 +1,7 @@
 # garfpy/__init__.py
 
 from .log import logger
+from .help import help
 from .kroger import Kroger
 from .kroger import Kroger
 from .garfai import GarfAI
diff --git a/garfpy/help.py b/garfpy/help.py
new file mode 100644
index 0000000..cf42377
--- /dev/null
+++ b/garfpy/help.py
@@ -0,0 +1,60 @@
+import discord
+
+
+async def help(message):
+    embed = discord.Embed(title="**Need help?**", color=0x4D4D4D)
+    embed.add_field(
+        name="hey garfield `prompt`", value="*Responds with text.*", inline=True
+    )
+    embed.add_field(
+        name="garfpic `prompt`", value="*Responds with an image.*", inline=True
+    )
+    embed.add_field(
+        name="garfping `target`",
+        value="*Responds with iputils-ping result from target.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfdns `target`",
+        value="*Responds with dns lookup result from target.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfhack `target`",
+        value="*Responds with nmap scan result from target.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfwiki `query`",
+        value="*Garfbot looks up a wikipedia article and will summarize it for you.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfshop `item` `zip`",
+        value="*Responds with 10 grocery items from the nearest Kroger location, cheapest first.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfqr `text`",
+        value="*Create a QR code for any string up to 1000 characters.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfbot response `add` `trigger` `response`",
+        value='*Add a GarfBot auto response for your server. Use "quotes" if you like.*',
+        inline=True,
+    )
+    embed.add_field(
+        name="garfbot response `remove` `trigger`",
+        value="*Remove a GarfBot auto response for your server.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfbot response `list`",
+        value="*List current GarfBot auto responses for your server.*",
+        inline=True,
+    )
+    embed.add_field(
+        name="garfbot help", value="*Show a list of these commands.*", inline=True
+    )
+    await message.channel.send(embed=embed)
diff --git a/garfpy/weather.py b/garfpy/weather.py
index b152b7b..0ae585d 100644
--- a/garfpy/weather.py
+++ b/garfpy/weather.py
@@ -93,7 +93,6 @@ class WeatherAPI:
             return {"q": f"{city},{state},{country.upper()}"}
 
         else:
-            # Check if last part looks like country code
             if len(parts[-1]) == 2:
                 city_parts = parts[:-1]
                 country = parts[-1]