From 85d0b8ba74977ff7c2195562dd5b2911aa97aa81 Mon Sep 17 00:00:00 2001
From: Phxntxm <danielman0@yahoo.com>
Date: Fri, 4 Aug 2017 13:58:57 -0500
Subject: [PATCH] Check to ensure that the battle/hug message being added is in
 a valid format

---
 cogs/admin.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/cogs/admin.py b/cogs/admin.py
index 58834fb..65a287e 100644
--- a/cogs/admin.py
+++ b/cogs/admin.py
@@ -42,8 +42,18 @@ class Administration:
 
         EXAMPLE: !battles add {winner} has beaten {loser}
         RESULT: Player1 has beaten Player2"""
+        # Try to simulate the message, to ensure they haven't provided an invalid phrase
+        try:
+            message.format(loser="player1", winner="player2")
+        except:
+            await ctx.send("That is an invalid format! The winner needs to be labeled with {winner} and the loser with {loser}")
+            return
+
+        # Now simply load the current messages
         msgs = self.bot.db.load('server_settings', key=ctx.message.guild.id, pluck='battles') or []
+        # Append this one
         msgs.append("*{}*".format(message))
+        # And save it
         update = {
             'server_id': str(ctx.message.guild.id),
             'battles': msgs
@@ -153,6 +163,13 @@ class Administration:
 
         EXAMPLE: !hugs add new hug message that says I hugged {user}
         RESULT: *new hug message that says I hugged UserName*"""
+        # Try to simulate the message, to ensure they haven't provided an invalid phrase
+        try:
+            message.format(loser="player1", winner="player2")
+        except:
+            await ctx.send("That is an invalid format! The user being hugged needs to be labeled with {user}")
+            return
+
         msgs = self.bot.db.load('server_settings', key=ctx.message.guild.id, pluck='hugs') or []
         msgs.append("*{}*".format(message))
         update = {