Added send_formatted_message function and cleaned up some help messages

GeoffreyBot/geoffrey.py

@@ -8,6 +8,7 @@ import time
 import traceback
 import sys
 from GeoffreyBot.geoffrey_api import HandledError
+from GeoffreyBot.GeoffreyApiHelper import format_message
 
 logger = logging.getLogger('GeoffreyBot')
 
@@ -135,6 +136,15 @@ class GeoffreyBot(commands.Bot):
 
         return requests.get(url=url.format(command), params=kwargs).json()
 
+    @staticmethod
+    async def send_formatted_message(ctx, msg_format, *args, ping_user=False):
+        if ping_user:
+            msg_format = "%s %s" % (ctx.message.author, msg_format)
+
+        msg = format_message(msg_format, *args)
+
+        ctx.send(msg)
+
     @staticmethod
     async def send_list(ctx, send_list):
         msg = ""

GeoffreyBot/geoffrey_api.py

@@ -199,7 +199,7 @@ class GeoffreyCommands(commands.Cog):
     @commands.command(pass_context=True)
     async def add_resident(self, ctx, new_resident_name, *args):
         """
-        {}add_resident <New Residents's Name> <Town Name>
+        {}add_resident <New Residents's MC Username> <Town Name>
         """
         errors = {
             "ResidentNotFoundError": "ain't no one in this darn database named **{}** you goob".format(
@@ -281,7 +281,7 @@ class GeoffreyCommands(commands.Cog):
     @commands.command(pass_context=True)
     async def add_tunnel(self, ctx, tunnel_direction, tunnel_number: int, *args):
         """
-        {}add_tunnel <Tunnel Direction> <X/Z Tunnel Number> <Location Name>
+        {}add_tunnel <Tunnel Direction> <X or Z Tunnel Number> <Location Name>
             The Name parameter is optional if you only have one location
         """