Clean up moderation messages

Author: hoffmabc

market/moderation.py

@@ -129,8 +129,12 @@ def process_dispute(contract, db, message_listener, notification_listener, testn
 
     # Send SMTP notification
     notification = SMTPNotification(db)
-    notification.send("[OpenBazaar] Dispute Opened: #%s" % order_id,
-                      "A dispute has been opened by %s for Order #%s: \"%s\"" % (guid, order_id, title))
+    guid = guid.encode("hex")
+    notification.send("[OpenBazaar] Dispute Opened",
+                      "A dispute has been opened.\n\n"
+                      "Order: %s\n"
+                      "Opened By: %s\n"
+                      "Title: %s" % (order_id, guid, title))
 
 
 def close_dispute(resolution_json, db, message_listener, notification_listener, testnet):
@@ -197,5 +201,9 @@ def close_dispute(resolution_json, db, message_listener, notification_listener,
 
     # Send SMTP notification
     notification = SMTPNotification(db)
-    notification.send("[OpenBazaar] Dispute Closed: #%s" % order_id,
-                      "A dispute has been closed by %s for Order #%s: \"%s\"" % (moderator_guid, order_id, title))
+    guid = moderator_guid.encode("hex")
+    notification.send("[OpenBazaar] Dispute Closed",
+                      "A dispute has been closed.\n\n"
+                      "Order: %s\n"
+                      "Closed By: %s\n"
+                      "Title: %s" % (order_id, guid, title))