Merge pull request #24 from diggyk/master

Email fixes

hermes/models.py

@@ -1016,6 +1016,28 @@ def create(
                 quest.description
             )
         )
+
+        msg = "QUEST {} STARTED:\n\n\t\"{}\"\n\n".format(
+            quest.id,
+            textwrap.fill(
+                quest.description,
+                width=60, subsequent_indent="\t "
+            )
+        )
+
+        msg += (
+            "There are {} labors in the Quest.  "
+            "They were started with the event \"{} {}.\""
+        ).format(
+            len(quest.labors),
+            creation_event_type.category,
+            creation_event_type.state,
+        )
+
+        email_message(
+            quest.creator, "Quest {} started".format(quest.id),
+            msg
+        )
         return quest
 
     def check_for_victory(self):

hermes/util.py

@@ -59,18 +59,22 @@ def email_message(recipients, subject, message):
         recipients = recipients.split(",")
     if isinstance(settings.email_always_copy, basestring):
         extra_recipients = settings.email_always_copy.split(",")
+    else:
+        extra_recipients = [settings.email_always_copy]
 
     msg = MIMEText(message)
     msg["Subject"] = subject
-    msg["From"] = "hermes@localhost"
+    msg["From"] = settings.email_sender_address
     msg["To"] = ", ".join(recipients)
     if extra_recipients:
         msg["Cc"] = ", ".join(extra_recipients)
 
     try:
         smtp = smtplib.SMTP("localhost")
         smtp.sendmail(
-            settings.email_sender_address, recipients, msg.as_string()
+            settings.email_sender_address,
+            recipients + extra_recipients,
+            msg.as_string()
         )
         smtp.quit()
     except Exception as exc:

hermes/version.py

@@ -1 +1 @@
-__version__ = "0.2.0"
+__version__ = "0.2.1"